diff options
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 11 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/SearchDropTargetBar.java | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index d65b4759a..8bba13c9d 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -766,11 +766,9 @@ public class DeviceProfile { (visibleChildCount-1) * overviewModeBarSpacerWidthPx; } - public void layout(Launcher launcher) { + public void layoutSearchBar(Launcher launcher) { // Update search bar for live settings searchBarVisible = isSearchBarEnabled(launcher); - searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ? - searchBarSpaceHeightPx - getSearchBarTopOffset() : 3 * edgeMarginPx); FrameLayout.LayoutParams lp; Resources res = launcher.getResources(); boolean hasVerticalBarLayout = isVerticalBarLayout(); @@ -818,10 +816,15 @@ public class DeviceProfile { vglp.height = LayoutParams.MATCH_PARENT; qsbBar.setLayoutParams(vglp); } + } + public void layout(Launcher launcher) { + layoutSearchBar(launcher); + Resources res = launcher.getResources(); + boolean hasVerticalBarLayout = isVerticalBarLayout(); // Layout the workspace PagedView workspace = (PagedView) launcher.findViewById(R.id.workspace); - lp = (FrameLayout.LayoutParams) workspace.getLayoutParams(); + FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) workspace.getLayoutParams(); lp.gravity = Gravity.CENTER; int orientation = isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT; Rect padding = getWorkspacePadding(orientation); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1603200ef..1dafd1245 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -5247,10 +5247,7 @@ public class Launcher extends Activity mQsb = null; } mSearchDropTargetBar.setQsbSearchBar(getQsbBar()); - if (mDragController.isDragging()) { - mDragController.cancelDrag(); - } - updateDynamicGrid(false); + mGrid.layoutSearchBar(this); } /** diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index b58964b03..38daadd8a 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -80,8 +80,16 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D } public void setQsbSearchBar(View qsb) { + float alpha = 1f; + int visibility = View.VISIBLE; + if (mQSBSearchBar != null) { + alpha = mQSBSearchBar.getAlpha(); + visibility = mQSBSearchBar.getVisibility(); + } mQSBSearchBar = qsb; if (mQSBSearchBar != null) { + mQSBSearchBar.setAlpha(alpha); + mQSBSearchBar.setVisibility(visibility); if (mEnableDropDownDropTargets) { mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0, -mBarHeight); |