diff options
| author | Tom Stamm <stammt@google.com> | 2014-02-15 00:26:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-15 00:26:11 +0000 |
| commit | a0010b81ad0e179a8336f84da84f7aed3dd54cb5 (patch) | |
| tree | 200fcd460daeaf329781b0e68525084c54698c46 | |
| parent | 76fd2e70bd28668a09edd1e7bb30348b6536b5ad (diff) | |
| parent | 279b0385d04427d039c10bc22df2a2aaafd99a4a (diff) | |
| download | android_packages_apps_Trebuchet-a0010b81ad0e179a8336f84da84f7aed3dd54cb5.tar.gz android_packages_apps_Trebuchet-a0010b81ad0e179a8336f84da84f7aed3dd54cb5.tar.bz2 android_packages_apps_Trebuchet-a0010b81ad0e179a8336f84da84f7aed3dd54cb5.zip | |
am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr
* commit '279b0385d04427d039c10bc22df2a2aaafd99a4a':
Ensure we don't call getLayoutDirection() for devices not running JB MR1+. (Bug 12906355)
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 6 |
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; |