summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stamm <stammt@google.com>2014-02-05 16:04:27 -0700
committerTom Stamm <stammt@google.com>2014-02-05 16:04:27 -0700
commit279b0385d04427d039c10bc22df2a2aaafd99a4a (patch)
tree8aa3d476209144b7cacf092f5244a010e9e1a5c2
parent8fa85d2025902d15f40edff3255d99422685d9de (diff)
parent6033ceb438d2d8e6c8406e2b61ae515e6156965c (diff)
downloadandroid_packages_apps_Trebuchet-279b0385d04427d039c10bc22df2a2aaafd99a4a.tar.gz
android_packages_apps_Trebuchet-279b0385d04427d039c10bc22df2a2aaafd99a4a.tar.bz2
android_packages_apps_Trebuchet-279b0385d04427d039c10bc22df2a2aaafd99a4a.zip
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kr
-rw-r--r--src/com/android/launcher3/DeviceProfile.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 7ca4f811c..e67ec197a 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -371,7 +371,11 @@ public class DeviceProfile {
isLandscape = (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE);
isTablet = resources.getBoolean(R.bool.is_tablet);
isLargeTablet = resources.getBoolean(R.bool.is_large_tablet);
- isLayoutRtl = (configuration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL);
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ isLayoutRtl = (configuration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL);
+ } else {
+ isLayoutRtl = false;
+ }
widthPx = wPx;
heightPx = hPx;
availableWidthPx = awPx;