Merge branch 'release/3.2' into feature/notifications-redesign

Conflicts: WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java
wordpress-mobile · Sep 9, 2014 · fdf89f9 · fdf89f9
2 parents fd177a4 + e3795fe
commit fdf89f9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java
@@ -52,6 +52,10 @@ public static int pxToDp(Context context, int px) {
         return (int) ((px/displayMetrics.density)+0.5);
     }
 
+    /**
+     * Deprecated method, returns true on some phones.
+     */
+    @Deprecated
     public static boolean isTablet(Context context) {
         // http://stackoverflow.com/a/8427523/1673548
         if (context == null)