Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96328e98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove ENABLE_TASKBAR_REVISED_THRESHOLDS feature flag." into tm-qpr-dev

parents 71a7a13f 24bd17f2

quickstep/res/values/dimens.xml

+3 −7
Original line number Diff line number Diff line
@@ -297,15 +297,11 @@ 
    <!-- An additional touch slop to prevent x-axis movement during the swipe up to show taskbar -->

    <dimen name="transient_taskbar_clamped_offset_bound">16dp</dimen>

    <!-- Taskbar swipe up thresholds -->

    <dimen name="taskbar_nav_threshold">40dp</dimen>

    <dimen name="taskbar_app_window_threshold">150dp</dimen>

    <dimen name="taskbar_home_overview_threshold">225dp</dimen>

    <dimen name="taskbar_nav_threshold">30dp</dimen>

    <dimen name="taskbar_app_window_threshold">100dp</dimen>

    <dimen name="taskbar_home_overview_threshold">180dp</dimen>

    <dimen name="taskbar_catch_up_threshold">300dp</dimen>



    <dimen name="taskbar_nav_threshold_v2">30dp</dimen>

    <dimen name="taskbar_app_window_threshold_v2">100dp</dimen>

    <dimen name="taskbar_home_overview_threshold_v2">180dp</dimen>



    <!--  Taskbar 3 button spacing  -->

    <dimen name="taskbar_button_space_inbetween">24dp</dimen>

    <dimen name="taskbar_button_space_inbetween_phone">40dp</dimen>

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+3 −9
Original line number Diff line number Diff line
@@ -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);

    }

quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java

+1 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.quickstep.inputconsumers; 
import static android.view.MotionEvent.INVALID_POINTER_ID;



import static com.android.launcher3.Utilities.squaredHypot;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_REVISED_THRESHOLDS;

import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING;



import android.content.Context;
@@ -74,9 +73,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { 


        Resources res = context.getResources();

        mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area);

        int taskbarNavThreshold = res.getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get()

                ? R.dimen.taskbar_nav_threshold_v2

                : R.dimen.taskbar_nav_threshold);

        int taskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold);

        int screenHeight = taskbarActivityContext.getDeviceProfile().heightPx;

        mTaskbarNavThresholdY = screenHeight - taskbarNavThreshold;

        mIsTaskbarAllAppsOpen =

src/com/android/launcher3/config/FeatureFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -338,10 +338,6 @@ public final class FeatureFlags { 
            "ENABLE_DOWNLOAD_APP_UX_V3", false, "Updates the download app UX"

            + " to have better visuals, improve contrast, and color");



    public static final BooleanFlag ENABLE_TASKBAR_REVISED_THRESHOLDS = getDebugFlag(

            "ENABLE_TASKBAR_REVISED_THRESHOLDS", true,

            "Uses revised thresholds for transient taskbar.");



    public static final BooleanFlag FORCE_PERSISTENT_TASKBAR = getDebugFlag(

            "FORCE_PERSISTENT_TASKBAR", false, "Forces taskbar to be persistent, even in gesture"

                    + " nav mode and when transient taskbar is enabled.");