From 54e6b1e609867fb2764908334a19f89248e254c4 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Thu, 12 Mar 2015 12:24:39 +0300
Subject: [PATCH] Renamed isTablet flag & passed second correct boolean to
 core.

---
 android/res/values-sw600dp/attrs.xml                |  4 +++-
 android/res/values-sw720dp/attrs.xml                |  4 +++-
 android/res/values/attrs.xml                        |  2 +-
 android/src/com/mapswithme/maps/MWMActivity.java    |  8 ++++----
 android/src/com/mapswithme/maps/MWMApplication.java |  3 ++-
 android/src/com/mapswithme/util/UiUtils.java        | 10 ++++++++++
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/android/res/values-sw600dp/attrs.xml b/android/res/values-sw600dp/attrs.xml
index 50d1f0cb8e..62bb7bcc7a 100644
--- a/android/res/values-sw600dp/attrs.xml
+++ b/android/res/values-sw600dp/attrs.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <bool name="isTablet">true</bool>
+  <!-- 7 inch tablet -->
+  <bool name="isSmallTablet">true</bool>
+  <!-- 10 inch tablet -->
   <bool name="isBigTablet">false</bool>
 
 </resources>
\ No newline at end of file
diff --git a/android/res/values-sw720dp/attrs.xml b/android/res/values-sw720dp/attrs.xml
index d29b9b1f12..65d80a8af8 100644
--- a/android/res/values-sw720dp/attrs.xml
+++ b/android/res/values-sw720dp/attrs.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <bool name="isTablet">true</bool>
+  <!-- 7 inch tablet -->
+  <bool name="isSmallTablet">true</bool>
+  <!-- 10 inch tablet -->
   <bool name="isBigTablet">true</bool>
 
 </resources>
\ No newline at end of file
diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml
index 2133f3524c..0d859512a6 100644
--- a/android/res/values/attrs.xml
+++ b/android/res/values/attrs.xml
@@ -17,7 +17,7 @@
   </declare-styleable>
 
   <!-- 7 inch tablet -->
-  <bool name="isTablet">false</bool>
+  <bool name="isSmallTablet">false</bool>
   <!-- 10 inch tablet -->
   <bool name="isBigTablet">false</bool>
 
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index 09036818e5..c1213eea98 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -1343,8 +1343,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
 
   private boolean previewIntersectsBottomMenu()
   {
-    return !(getResources().getBoolean(R.bool.isBigTablet) ||
-        (getResources().getBoolean(R.bool.isTablet) && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE));
+    return !UiUtils.isBigTablet() ||
+        (UiUtils.isSmallTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
   }
 
   @Override
@@ -1357,8 +1357,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
 
   private boolean placePageIntersectsZoomButtons()
   {
-    return !(getResources().getBoolean(R.bool.isBigTablet) ||
-        (getResources().getBoolean(R.bool.isTablet) && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE));
+    return !UiUtils.isBigTablet() ||
+        (UiUtils.isSmallTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java
index bad6ae33a9..dc3a457743 100644
--- a/android/src/com/mapswithme/maps/MWMApplication.java
+++ b/android/src/com/mapswithme/maps/MWMApplication.java
@@ -17,6 +17,7 @@ import com.mapswithme.maps.background.WorkerService;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.FbUtil;
+import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.statistics.Statistics;
 
 import java.io.File;
@@ -107,7 +108,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
     // init native framework
     nativeInit(getApkPath(), extStoragePath, extTmpPath, getOBBGooglePath(),
         BuildConfig.FLAVOR, BuildConfig.BUILD_TYPE,
-        mIsYota, getResources().getBoolean(R.bool.isTablet));
+        mIsYota, UiUtils.isSmallTablet() || UiUtils.isBigTablet());
 
     ActiveCountryTree.addListener(this);
 
diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 4730c94e53..3a43797384 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -385,6 +385,16 @@ public final class UiUtils
     return rotation;
   }
 
+  public static boolean isSmallTablet()
+  {
+    return MWMApplication.get().getResources().getBoolean(R.bool.isSmallTablet);
+  }
+
+  public static boolean isBigTablet()
+  {
+    return MWMApplication.get().getResources().getBoolean(R.bool.isBigTablet);
+  }
+
   // utility class
   private UiUtils()
   {}