diff options
Diffstat (limited to 'src')
5 files changed, 23 insertions, 20 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b00006f42..3f12abfd4 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -997,8 +997,8 @@ public class Launcher extends Activity // Don't update the predicted apps if the user is returning to launcher in the apps // view after launching an app, as they may be depending on the UI to be static to // switch to another app, otherwise, if it was - showAppsView(false /* animated */, false /* resetListToTop */, - !launchedFromApp /* updatePredictedApps */, false /* focusSearchBar */); + showAppsView(false /* animated */, !launchedFromApp /* updatePredictedApps */, + false /* focusSearchBar */); } else if (mOnResumeState == State.WIDGETS) { showWidgetsView(false, false); } @@ -2601,8 +2601,8 @@ public class Launcher extends Activity if (!isAppsViewVisible()) { getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.TAP, LauncherLogProto.ALL_APPS_BUTTON); - showAppsView(true /* animated */, false /* resetListToTop */, - true /* updatePredictedApps */, false /* focusSearchBar */); + showAppsView(true /* animated */, true /* updatePredictedApps */, + false /* focusSearchBar */); } } @@ -2611,7 +2611,7 @@ public class Launcher extends Activity if (!isAppsViewVisible()) { getUserEventDispatcher().logActionOnControl(LauncherLogProto.Action.LONGPRESS, LauncherLogProto.ALL_APPS_BUTTON); - showAppsView(true /* animated */, false /* resetListToTop */, + showAppsView(true /* animated */, true /* updatePredictedApps */, true /* focusSearchBar */); } } @@ -3356,12 +3356,9 @@ public class Launcher extends Activity /** * Shows the apps view. */ - public void showAppsView(boolean animated, boolean resetListToTop, boolean updatePredictedApps, + public void showAppsView(boolean animated, boolean updatePredictedApps, boolean focusSearchBar) { markAppsViewShown(); - if (resetListToTop) { - mAppsView.scrollToTop(); - } if (updatePredictedApps) { tryAndUpdatePredictedApps(); } @@ -3488,7 +3485,7 @@ public class Launcher extends Activity void exitSpringLoadedDragMode() { if (mState == State.APPS_SPRING_LOADED) { - showAppsView(true /* animated */, false /* resetListToTop */, + showAppsView(true /* animated */, false /* updatePredictedApps */, false /* focusSearchBar */); } else if (mState == State.WIDGETS_SPRING_LOADED) { showWidgetsView(true, false); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 4ed2467eb..3c057e6fd 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -230,6 +230,8 @@ public class Workspace extends PagedView public static final int QSB_ALPHA_INDEX_STATE_CHANGE = 0; public static final int QSB_ALPHA_INDEX_Y_TRANSLATION = 1; public static final int QSB_ALPHA_INDEX_PAGE_SCROLL = 2; + public static final int QSB_ALPHA_INDEX_OVERLAY_SCROLL = 3; + MultiStateAlphaController mQsbAlphaController; @@ -482,7 +484,7 @@ public class Workspace extends PagedView public void initParentViews(View parent) { super.initParentViews(parent); mPageIndicator.setAccessibilityDelegate(new OverviewAccessibilityDelegate()); - mQsbAlphaController = new MultiStateAlphaController(mLauncher.getQsbContainer(), 3); + mQsbAlphaController = new MultiStateAlphaController(mLauncher.getQsbContainer(), 4); } private int getDefaultPage() { @@ -1465,6 +1467,8 @@ public class Workspace extends PagedView setWorkspaceTranslationAndAlpha(Direction.X, transX, alpha); setHotseatTranslationAndAlpha(Direction.X, transX, alpha); onWorkspaceOverallScrollChanged(); + + mQsbAlphaController.setAlphaAtIndex(alpha, QSB_ALPHA_INDEX_OVERLAY_SCROLL); } /** diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 428f78401..d8601893e 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -348,9 +348,10 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc mAppsRecyclerView.preMeasureViews(mAdapter); mAdapter.setIconFocusListener(focusedItemDecorator.getFocusListener()); - // TODO(hyunyoungs): clean up setting the content and the reveal view. if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) { getRevealView().setVisibility(View.VISIBLE); + getContentView().setVisibility(View.VISIBLE); + getContentView().setBackground(null); } } diff --git a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java index 7746245c1..b965d744f 100644 --- a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java +++ b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java @@ -140,10 +140,11 @@ public abstract class AllAppsSearchBarController * Resets the search bar state. */ public void reset() { - mQuery = null; unfocusSearchField(); mCb.clearSearchResult(); mInput.setText(""); + // We need to reset this after we clear the input text + mQuery = null; hideKeyboard(); } diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index df209b56c..0e9cac856 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -12,7 +12,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.animation.AccelerateInterpolator; import android.view.animation.AnimationUtils; -import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import com.android.launcher3.DeviceProfile; @@ -225,7 +224,9 @@ public class AllAppsTransitionController implements TouchController, VerticalPul LauncherLogProto.Action.UP, LauncherLogProto.HOTSEAT); } - mLauncher.showAppsView(true, true, false, false); + mLauncher.showAppsView(true /* animated */, + false /* updatePredictedApps */, + false /* focusSearchBar */); } else { calculateDuration(velocity, Math.abs(mShiftRange - mAppsView.getTranslationY())); mLauncher.showWorkspace(true); @@ -243,7 +244,9 @@ public class AllAppsTransitionController implements TouchController, VerticalPul LauncherLogProto.Action.UP, LauncherLogProto.HOTSEAT); } - mLauncher.showAppsView(true, true, false, false); + mLauncher.showAppsView(true, /* animated */ + false /* updatePredictedApps */, + false /* focusSearchBar */); } } } @@ -260,15 +263,11 @@ public class AllAppsTransitionController implements TouchController, VerticalPul // Initialize values that should not change until #onDragEnd mStatusBarHeight = mLauncher.getDragLayer().getInsets().top; mHotseat.setVisibility(View.VISIBLE); - mHotseat.bringToFront(); if (!mLauncher.isAllAppsVisible()) { mLauncher.tryAndUpdatePredictedApps(); mHotseatBackgroundColor = mHotseat.getBackgroundDrawableColor(); mHotseat.setBackgroundTransparent(true /* transparent */); mAppsView.setVisibility(View.VISIBLE); - mAppsView.getContentView().setVisibility(View.VISIBLE); - mAppsView.getContentView().setBackground(null); - mAppsView.getRevealView().setVisibility(View.VISIBLE); mAppsView.setRevealDrawableColor(mHotseatBackgroundColor); } } @@ -525,6 +524,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mCaretAnimator.setDuration(mCaretAnimationDuration); mCaretAnimator.setInterpolator(mCaretInterpolator); mHotseat.addOnLayoutChangeListener(this); + mHotseat.bringToFront(); } @Override |