diff options
author | Winson Chung <winsonc@google.com> | 2015-06-03 19:03:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 19:03:13 +0000 |
commit | f4fe7fc5449bbfcfa7e95c7f9040c81d833a1fdb (patch) | |
tree | e9d88c9d2cf090b2204599c5b0462b5cd67fb028 | |
parent | 5dd1487da69062a0f40743d7a8df042440b85e9a (diff) | |
parent | f8c6f885f032dad4e6b09e02ca97545783bccb70 (diff) | |
download | android_packages_apps_Trebuchet-f4fe7fc5449bbfcfa7e95c7f9040c81d833a1fdb.tar.gz android_packages_apps_Trebuchet-f4fe7fc5449bbfcfa7e95c7f9040c81d833a1fdb.tar.bz2 android_packages_apps_Trebuchet-f4fe7fc5449bbfcfa7e95c7f9040c81d833a1fdb.zip |
Merge "Fixing issue with hotseat being on the wrong side of the screen in RTL." into ub-launcher3-burnaby
-rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index bf9296f7d..1c917bf09 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -45,7 +45,7 @@ android:id="@+id/hotseat" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="end" /> + android:layout_gravity="right" /> <include android:id="@+id/search_drop_target_bar" diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index bee6cb093..82be409dd 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -405,7 +405,8 @@ public class DeviceProfile { View searchBar = launcher.getSearchBar(); lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams(); if (hasVerticalBarLayout) { - // Vertical search bar space + // Vertical search bar space -- The search bar is fixed in the layout to be on the left + // of the screen regardless of RTL lp.gravity = Gravity.LEFT; lp.width = searchBarSpaceHeightPx; @@ -438,8 +439,9 @@ public class DeviceProfile { View hotseat = launcher.findViewById(R.id.hotseat); lp = (FrameLayout.LayoutParams) hotseat.getLayoutParams(); if (hasVerticalBarLayout) { - // Vertical hotseat - lp.gravity = Gravity.END; + // Vertical hotseat -- The hotseat is fixed in the layout to be on the right of the + // screen regardless of RTL + lp.gravity = Gravity.RIGHT; lp.width = hotseatBarHeightPx; lp.height = LayoutParams.MATCH_PARENT; hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx); |