Merge "Polish all apps taskbar unstash behavior for transient and persistent." into tm-qpr-dev am: 8216a26bfe am: 71f9faded9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20713695 Change-Id: I8917a9a3f4ceb856cf1fecf8699e61fb5a0bf459 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -317,7 +317,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
private final int mTaskbarAppWindowThreshold;
|
||||
private final int mTaskbarHomeOverviewThreshold;
|
||||
private final int mTaskbarCatchUpThreshold;
|
||||
private boolean mTaskbarAlreadyOpen;
|
||||
private final boolean mTaskbarAlreadyOpen;
|
||||
private final boolean mIsTaskbarAllAppsOpen;
|
||||
private final boolean mIsTransientTaskbar;
|
||||
// May be set to false when mIsTransientTaskbar is true.
|
||||
private boolean mCanSlowSwipeGoHome = true;
|
||||
@@ -358,6 +359,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
&& DisplayController.isTransientTaskbar(mActivity);
|
||||
TaskbarUIController controller = mActivityInterface.getTaskbarController();
|
||||
mTaskbarAlreadyOpen = controller != null && !controller.isTaskbarStashed();
|
||||
mIsTaskbarAllAppsOpen = controller != null && controller.isTaskbarAllAppsOpen();
|
||||
mTaskbarAppWindowThreshold = res
|
||||
.getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get()
|
||||
? R.dimen.taskbar_app_window_threshold_v2
|
||||
@@ -2261,7 +2263,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
return displacement;
|
||||
}
|
||||
|
||||
if (mTaskbarAlreadyOpen) {
|
||||
if (mTaskbarAlreadyOpen || mIsTaskbarAllAppsOpen) {
|
||||
return displacement;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user