diff options
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 14 |
2 files changed, 9 insertions, 8 deletions
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/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 |