diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-04 12:09:59 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-12-04 20:10:56 +0000 |
| commit | 42b3c06849331aa5ba1f07f8c58915190d386aac (patch) | |
| tree | 893ebde97f81467e17c06396c3f34161655733ef /src | |
| parent | 531a5c324e20b354a674851fd4808c105a80af3a (diff) | |
| download | android_packages_apps_Trebuchet-42b3c06849331aa5ba1f07f8c58915190d386aac.tar.gz android_packages_apps_Trebuchet-42b3c06849331aa5ba1f07f8c58915190d386aac.tar.bz2 android_packages_apps_Trebuchet-42b3c06849331aa5ba1f07f8c58915190d386aac.zip | |
Restoring Hotseat to the left-aligned in RTL. (Bug 11451335)
Change-Id: I5451b1281e3f346f51677040775ae7bf76e303d1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 9e1f1a7b1..b84dbafb2 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -73,6 +73,7 @@ public class DeviceProfile { boolean isLandscape; boolean isTablet; boolean isLargeTablet; + boolean isLayoutRtl; boolean transposeLayoutWithOrientation; int desiredWorkspaceLeftRightMarginPx; @@ -356,10 +357,11 @@ public class DeviceProfile { void updateFromConfiguration(Context context, Resources resources, int wPx, int hPx, int awPx, int ahPx) { - isLandscape = (resources.getConfiguration().orientation == - Configuration.ORIENTATION_LANDSCAPE); + Configuration configuration = resources.getConfiguration(); + 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); widthPx = wPx; heightPx = hPx; availableWidthPx = awPx; @@ -437,7 +439,13 @@ public class DeviceProfile { Rect bounds = new Rect(); if (orientation == CellLayout.LANDSCAPE && transposeLayoutWithOrientation) { - bounds.set(0, edgeMarginPx, searchBarSpaceHeightPx, availableHeightPx - edgeMarginPx); + if (isLayoutRtl) { + bounds.set(availableWidthPx - searchBarSpaceHeightPx, edgeMarginPx, + availableWidthPx, availableHeightPx - edgeMarginPx); + } else { + bounds.set(0, edgeMarginPx, searchBarSpaceHeightPx, + availableHeightPx - edgeMarginPx); + } } else { if (isTablet()) { // Pad the left and right of the workspace to ensure consistent spacing @@ -472,8 +480,13 @@ public class DeviceProfile { if (orientation == CellLayout.LANDSCAPE && transposeLayoutWithOrientation) { // Pad the left and right of the workspace with search/hotseat bar sizes - padding.set(searchBarBounds.right, edgeMarginPx, - hotseatBarHeightPx, edgeMarginPx); + if (isLayoutRtl) { + padding.set(hotseatBarHeightPx, edgeMarginPx, + searchBarBounds.width(), edgeMarginPx); + } else { + padding.set(searchBarBounds.width(), edgeMarginPx, + hotseatBarHeightPx, edgeMarginPx); + } } else { if (isTablet()) { // Pad the left and right of the workspace to ensure consistent spacing @@ -627,7 +640,7 @@ public class DeviceProfile { lp = (FrameLayout.LayoutParams) hotseat.getLayoutParams(); if (hasVerticalBarLayout) { // Vertical hotseat - lp.gravity = Gravity.RIGHT; + lp.gravity = Gravity.END; lp.width = hotseatBarHeightPx; lp.height = LayoutParams.MATCH_PARENT; hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx); |