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

Commit 93e088dc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifa66cfb7,Ied7867fb into udc-qpr-dev 

* changes:
  Add dynamic thresholds for taskbar based on screen size.
  Add ENABLE_DYNAMIC_TASKBAR_THRESHOLDS feature flag.
parents 99f30cb1 a625f587

quickstep/res/values-sw720dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -43,4 +43,7 @@ 
    <dimen name="taskbar_app_window_threshold">100dp</dimen>

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

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



    <!-- Taskbar swipe up threshold multipliers -->

    <item name="taskbar_nav_threshold_mult" format="float" type="dimen">3</item>

</resources>

quickstep/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -330,6 +330,12 @@ 
    <!-- Taskbar swipe down threshold -->

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



    <!-- Taskbar swipe up threshold multipliers -->

    <item name="taskbar_nav_threshold_mult" format="float" type="dimen">4.5</item>

    <item name="taskbar_app_window_threshold_mult" format="float" type="dimen">10</item>

    <item name="taskbar_home_overview_threshold_mult" format="float" type="dimen">18</item>

    <item name="taskbar_catch_up_threshold_mult" format="float" type="dimen">30</item>



    <!--  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/launcher3/taskbar/TaskbarThresholdUtils.java

0 → 100644
+87 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.taskbar;



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

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



import android.content.res.Resources;

import android.util.DisplayMetrics;



import androidx.core.content.res.ResourcesCompat;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.config.FeatureFlags;



/**

 * Utility class that contains the different taskbar thresholds logic.

 */

public class TaskbarThresholdUtils {



    // We divide the screen into this many parts, and use the result to scale the thresholds to

    // any size device. Note that this value was calculated arbitrarily by using two tablet devices

    // as data points.

    private static final float SCREEN_UNITS = 1 / 80f;



    private static int getThreshold(Resources r, DeviceProfile dp, int thresholdDimen,

            int multiplierDimen) {

        if (!FeatureFlags.ENABLE_DYNAMIC_TASKBAR_THRESHOLDS.get()) {

            return r.getDimensionPixelSize(thresholdDimen);

        }



        float landscapeScreenHeight = dp.isLandscape ? dp.heightPx : dp.widthPx;

        float screenPart = (landscapeScreenHeight * SCREEN_UNITS);

        float defaultDp = dpiFromPx(screenPart, DisplayMetrics.DENSITY_DEVICE_STABLE);

        float thisDp = dpToPx(defaultDp);

        float multiplier = ResourcesCompat.getFloat(r, multiplierDimen);

        float value = (thisDp) * multiplier;



        return Math.round(value);

    }



    /**

     * Returns the threshold that determines if we should show taskbar.

     */

    public static int getFromNavThreshold(Resources r, DeviceProfile dp) {

        return getThreshold(r, dp, R.dimen.taskbar_from_nav_threshold,

                R.dimen.taskbar_nav_threshold_mult);

    }



    /**

     * Returns the threshold that we start moving the app window.

     */

    public static int getAppWindowThreshold(Resources r, DeviceProfile dp) {

        return getThreshold(r, dp, R.dimen.taskbar_app_window_threshold,

                R.dimen.taskbar_app_window_threshold_mult);

    }



    /**

     * Returns the threshold for whether we land in home or overview.

     */

    public static int getHomeOverviewThreshold(Resources r, DeviceProfile dp) {

        return getThreshold(r, dp, R.dimen.taskbar_home_overview_threshold,

                R.dimen.taskbar_home_overview_threshold_mult);

    }



    /**

     * Returns the threshold that we use to allow swipe to catch up to finger.

     */

    public static int getCatchUpThreshold(Resources r, DeviceProfile dp) {

        return getThreshold(r, dp, R.dimen.taskbar_catch_up_threshold,

                R.dimen.taskbar_catch_up_threshold_mult);

    }

}

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

+4 −3
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ import com.android.launcher3.logging.StatsLogManager.StatsLogger; 
import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.BaseState;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.taskbar.TaskbarThresholdUtils;

import com.android.launcher3.taskbar.TaskbarUIController;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;
@@ -379,12 +380,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        mTaskbarAlreadyOpen = controller != null && !controller.isTaskbarStashed();

        mIsTaskbarAllAppsOpen = controller != null && controller.isTaskbarAllAppsOpen();

        mTaskbarAppWindowThreshold =

                res.getDimensionPixelSize(R.dimen.taskbar_app_window_threshold);

                TaskbarThresholdUtils.getAppWindowThreshold(res, mDp);

        boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen || mGestureState.isTrackpadGesture();

        mTaskbarHomeOverviewThreshold = swipeWillNotShowTaskbar

                ? 0

                : res.getDimensionPixelSize(R.dimen.taskbar_home_overview_threshold);

        mTaskbarCatchUpThreshold = res.getDimensionPixelSize(R.dimen.taskbar_catch_up_threshold);

                : TaskbarThresholdUtils.getHomeOverviewThreshold(res, mDp);

        mTaskbarCatchUpThreshold = TaskbarThresholdUtils.getCatchUpThreshold(res, mDp);

    }



    @Nullable

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

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.taskbar.TaskbarActivityContext;

import com.android.launcher3.taskbar.TaskbarThresholdUtils;

import com.android.launcher3.taskbar.TaskbarTranslationController.TransitionCallback;

import com.android.launcher3.taskbar.bubbles.BubbleControllers;

import com.android.launcher3.touch.OverScroll;
@@ -94,7 +95,8 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { 


        Resources res = context.getResources();

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

        mTaskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_from_nav_threshold);

        mTaskbarNavThreshold = TaskbarThresholdUtils.getFromNavThreshold(res,

                taskbarActivityContext.getDeviceProfile());

        mTaskbarNavThresholdY = taskbarActivityContext.getDeviceProfile().heightPx

                - mTaskbarNavThreshold;

        mIsTaskbarAllAppsOpen =