commit c1763b24fc7ea6d23087197d6091c56916a51e17
author Tony Wickham <twickham@google.com> Fri Oct 23 12:23:15 2015 -0700
committer Tony Wickham <twickham@google.com> Fri Oct 23 12:29:44 2015 -0700
tree 214405a78a438d8990b40b4b849d49ce955786a5
parent 92adb669da53646cc59fba3d71c6d12ffabdbb16
parent 52040c2d51d9c4d1bfaeda8e067deb7655099840

resolve merge conflicts of 52040c2d51 to ub-launcher3-master.

Change-Id: Ie3cf72ef11b43e2c681d6d614c668062c7e7b74c

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 4ee8a51..feb5f92 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -104,7 +104,6 @@
     private int searchBarSpaceWidthPx;
     private int searchBarSpaceHeightNormalPx, searchBarSpaceHeightTallPx;
     private int searchBarSpaceHeightPx; // One of the above.
-    private int searchBarHeight = LauncherCallbacks.SEARCH_BAR_HEIGHT_NORMAL;
 
     public DeviceProfile(Context context, InvariantDeviceProfile inv,
             Point minSize, Point maxSize,
@@ -408,13 +407,8 @@
         return visibleChildren;
     }
 
-    public void layout(Launcher launcher) {
-        FrameLayout.LayoutParams lp;
-        boolean hasVerticalBarLayout = isVerticalBarLayout();
-        final boolean isLayoutRtl = Utilities.isRtl(launcher.getResources());
-
-        // Layout the search bar space
-        searchBarHeight = launcher.getSearchBarHeight();
+    // TODO(twickham): b/25154513
+    public void setSearchBarHeight(int searchBarHeight) {
         if (searchBarHeight == LauncherCallbacks.SEARCH_BAR_HEIGHT_TALL) {
             hotseatBarHeightPx = hotseatBarHeightShortPx;
             searchBarSpaceHeightPx = searchBarSpaceHeightTallPx;
@@ -422,6 +416,14 @@
             hotseatBarHeightPx = hotseatBarHeightNormalPx;
             searchBarSpaceHeightPx = searchBarSpaceHeightNormalPx;
         }
+    }
+
+    public void layout(Launcher launcher) {
+        FrameLayout.LayoutParams lp;
+        boolean hasVerticalBarLayout = isVerticalBarLayout();
+        final boolean isLayoutRtl = Utilities.isRtl(launcher.getResources());
+
+        // Layout the search bar space
         View searchBar = launcher.getSearchDropTargetBar();
         lp = getDropTargetBarLayoutParams(hasVerticalBarLayout, searchBar, Gravity.TOP);
         searchBar.setLayoutParams(lp);
@@ -542,7 +544,7 @@
             // Vertical drop target bar space -- The drop target bar is fixed in the layout to be on
             //                                   the left of the screen regardless of RTL
             lp.gravity = Gravity.LEFT;
-            lp.width = searchBarSpaceHeightPx;
+            lp.width = searchBarSpaceHeightNormalPx;
 
             LinearLayout targets = (LinearLayout) dropTargetBar.findViewById(R.id.drag_target_bar);
             targets.setOrientation(LinearLayout.VERTICAL);