diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2015-10-26 07:48:14 +0100 |
|---|---|---|
| committer | jandegr <jandegr@users.noreply.github.com> | 2015-10-26 07:48:14 +0100 |
| commit | 41531649c37e6cebffe478e46b4e5b0a85ef4971 (patch) | |
| tree | 3f75e229084caece2caccc556d946b28b00d76b6 | |
| parent | 022b37cb504ea893f4fd7c91e59ab66d00612a88 (diff) | |
| parent | 56f34aa5b77836f698f935e0ce1c87c553a7d716 (diff) | |
| download | navit-R6315.tar.gz | |
Merge pull request #31 from navit-gps/jandegr-android-env-updateR6315
trac #1325 actionbar and titlebar
| -rw-r--r-- | ci/build_android.sh | 2 | ||||
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | navit/android/src/org/navitproject/navit/Navit.java | 17 |
3 files changed, 16 insertions, 5 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 18c199bc7..e9302535c 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -136,7 +136,7 @@ sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/n mkdir $CIRCLE_ARTIFACTS/android/ cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/ -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DANDROID_API_VERSION=19 $SOURCE_PATH +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=19 $SOURCE_PATH make || exit 1 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk || exit 1 diff --git a/circle.yml b/circle.yml index 6e10b8c12..0c9244dee 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ machine: ANDROID_HOME: /home/ubuntu/android ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk ANDROID_SDK_CDN: https://dl.google.com/android - ANDROID_SDK_FILE: android-sdk_r24.3.4-linux.tgz + ANDROID_SDK_FILE: android-sdk_r24.4.1-linux.tgz ANDROID_NDK_CDN: http://dl.google.com/android/ndk ANDROID_NDK_FILE: android-ndk-r10e-linux-x86_64.bin CMAKE_FILE: ../Toolchain/arm-eabi.cmake diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 38ce26ed2..90fcbe5eb 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -59,6 +59,7 @@ import android.util.Log; import android.view.Display;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.RelativeLayout;
@@ -243,6 +244,8 @@ public class Navit extends Activity public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
+ if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
+ this.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialogs = new NavitDialogs(this);
@@ -687,17 +690,25 @@ public class Navit extends Activity NavitDestroy();
}
- public void fullscreen(int fullscreen) {
- if(fullscreen != 0) {
+ public void fullscreen(int fullscreen)
+ {
+ if(fullscreen != 0)
+ {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
+ this.getActionBar().hide();
}
- else {
+ else
+ {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
+ this.getActionBar().show();
}
}
+
public void disableSuspend()
{
wl.acquire();
|