diff --git a/ChangeLog b/ChangeLog index e284eae81..b4a0108bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * Quick access to book info in Android 3/4 (by tap on book title in action bar) * TOC item name is shown in navigation window * Versions for Honeycomb (Android 3.0) and Ice Cream Sandwich (Android 4.0) are megred into the same APK +* Kindle menu issue has been fixed ===== 1.2.6 (Dec 19, 2011) ===== * Android 3.*, 4.*: bottom buttons are hidden during book reading diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index ed349bb16..3be3be4c9 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -154,7 +154,7 @@ public final class FBReader extends ZLAndroidActivity { @Override public boolean onPrepareOptionsMenu(Menu menu) { final ZLAndroidLibrary zlibrary = (ZLAndroidLibrary)ZLibrary.Instance(); - if (!zlibrary.ShowStatusBarOption.getValue()) { + if (!zlibrary.isKindleFire() && !zlibrary.ShowStatusBarOption.getValue()) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); } return super.onPrepareOptionsMenu(menu); @@ -164,7 +164,7 @@ public final class FBReader extends ZLAndroidActivity { public void onOptionsMenuClosed(Menu menu) { super.onOptionsMenuClosed(menu); final ZLAndroidLibrary zlibrary = (ZLAndroidLibrary)ZLibrary.Instance(); - if (!zlibrary.ShowStatusBarOption.getValue()) { + if (!zlibrary.isKindleFire() && !zlibrary.ShowStatusBarOption.getValue()) { getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); } } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index 9a2b54c3a..504c6fcdf 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -56,6 +56,17 @@ public final class ZLAndroidLibrary extends ZLibrary { "PD_Novel".equals(Build.MODEL); } + private Boolean myIsKindleFire = null; + public boolean isKindleFire() { + if (myIsKindleFire == null) { + final String KINDLE_MODEL_REGEXP = ".*kindle(\\s+)fire.*"; + myIsKindleFire = + Build.MODEL != null && + Build.MODEL.toLowerCase().matches(KINDLE_MODEL_REGEXP); + } + return myIsKindleFire; + } + private ZLAndroidActivity myActivity; private final Application myApplication; private ZLAndroidWidget myWidget;