fix: enhance isTablet() on Android (#313)

react-native-device-info · Feb 27, 2018 · 8b7ddac · 8b7ddac
1 parent c7becf6
commit 8b7ddac
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java b/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
@@ -18,6 +18,7 @@
 import android.telephony.TelephonyManager;
 import android.text.format.Formatter;
 import android.app.ActivityManager;
+import android.util.DisplayMetrics;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -91,7 +92,19 @@ private Boolean isEmulator() {
 
   private Boolean isTablet() {
     int layout = getReactApplicationContext().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
-    return layout == Configuration.SCREENLAYOUT_SIZE_LARGE || layout == Configuration.SCREENLAYOUT_SIZE_XLARGE;
+    if (layout != Configuration.SCREENLAYOUT_SIZE_LARGE && layout != Configuration.SCREENLAYOUT_SIZE_XLARGE) {
+      return false;
+    }
+    DisplayMetrics metrics = new DisplayMetrics();
+    getCurrentActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+    if (metrics.densityDpi == DisplayMetrics.DENSITY_DEFAULT
+            || metrics.densityDpi == DisplayMetrics.DENSITY_HIGH
+            || metrics.densityDpi == DisplayMetrics.DENSITY_MEDIUM
+            || metrics.densityDpi == DisplayMetrics.DENSITY_TV
+            || metrics.densityDpi == DisplayMetrics.DENSITY_XHIGH) {
+      return true;
+    }
+    return false;
   }
 
   private float fontScale() {