diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-27 23:48:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-27 23:48:21 +0000 |
commit | d23cfce087df09a81e7f06f29615b3b79e2e830c (patch) | |
tree | c50e175beaf1947bdec26b6627a4dfad51045b09 /src/com/android/launcher3 | |
parent | 8167dc2dcffbf4f68724bc1db2f5cfc1caf6a848 (diff) | |
parent | d9cc780fade7a078d127c7e5b8209d414a46f0a5 (diff) | |
download | android_packages_apps_Trebuchet-d23cfce087df09a81e7f06f29615b3b79e2e830c.tar.gz android_packages_apps_Trebuchet-d23cfce087df09a81e7f06f29615b3b79e2e830c.tar.bz2 android_packages_apps_Trebuchet-d23cfce087df09a81e7f06f29615b3b79e2e830c.zip |
Merge "Making QSB alingment match with that of recents" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 3dadd1a70..deb807501 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -733,7 +733,6 @@ public class DeviceProfile { public void layout(Launcher launcher) { FrameLayout.LayoutParams lp; - Resources res = launcher.getResources(); boolean hasVerticalBarLayout = isVerticalBarLayout(); // Layout the search bar space @@ -741,17 +740,22 @@ public class DeviceProfile { lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams(); if (hasVerticalBarLayout) { // Vertical search bar space - lp.gravity = Gravity.TOP | Gravity.LEFT; + lp.gravity = Gravity.LEFT; lp.width = searchBarSpaceHeightPx; - lp.height = LayoutParams.WRAP_CONTENT; LinearLayout targets = (LinearLayout) searchBar.findViewById(R.id.drag_target_bar); targets.setOrientation(LinearLayout.VERTICAL); + FrameLayout.LayoutParams targetsLp = (FrameLayout.LayoutParams) targets.getLayoutParams(); + targetsLp.gravity = Gravity.TOP; + targetsLp.height = LayoutParams.WRAP_CONTENT; + } else { // Horizontal search bar space - lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL; - lp.width = searchBarSpaceWidthPx; + lp.gravity = Gravity.TOP; lp.height = searchBarSpaceHeightPx; + + LinearLayout targets = (LinearLayout) searchBar.findViewById(R.id.drag_target_bar); + targets.getLayoutParams().width = searchBarSpaceWidthPx; } searchBar.setLayoutParams(lp); |