Remove ENABLE_TASKBAR_REVISED_THRESHOLDS feature flag.
Test: manual Fixes: 268056334 Change-Id: Iab0eb1ca76b49f0acb96f50274cb2c81d9f213a5
This commit is contained in:
@@ -27,7 +27,6 @@ import static com.android.launcher3.PagedView.INVALID_PAGE;
|
||||
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
|
||||
import static com.android.launcher3.anim.Interpolators.DEACCEL;
|
||||
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
|
||||
import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_REVISED_THRESHOLDS;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
|
||||
@@ -367,17 +366,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
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
|
||||
: R.dimen.taskbar_app_window_threshold);
|
||||
mTaskbarAppWindowThreshold =
|
||||
res.getDimensionPixelSize(R.dimen.taskbar_app_window_threshold);
|
||||
boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen;
|
||||
mTaskbarHomeOverviewThreshold = swipeWillNotShowTaskbar
|
||||
? 0
|
||||
: res.getDimensionPixelSize(
|
||||
ENABLE_TASKBAR_REVISED_THRESHOLDS.get()
|
||||
? R.dimen.taskbar_home_overview_threshold_v2
|
||||
: R.dimen.taskbar_home_overview_threshold);
|
||||
: res.getDimensionPixelSize(R.dimen.taskbar_home_overview_threshold);
|
||||
mTaskbarCatchUpThreshold = res.getDimensionPixelSize(R.dimen.taskbar_catch_up_threshold);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user