Skip to content

Commit 012532e

Browse files
committed
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
2 parents c54c2be + 907b86c commit 012532e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ public static int pxToDp(Context context, int px) {
5252
return (int) ((px/displayMetrics.density)+0.5);
5353
}
5454

55+
/**
56+
* Deprecated method, returns true on some phones.
57+
*/
58+
@Deprecated
5559
public static boolean isTablet(Context context) {
5660
// http://stackoverflow.com/a/8427523/1673548
5761
if (context == null)

0 commit comments

Comments
 (0)