aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes Ifa66cfb7,Ied7867fb into udc-qpr-dev am: 93e088dc1c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24327089

Change-Id: Ie11aada0b4ff2b3f0762332feab5ff46de8207d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-07 17:18:18 +00:00
committed by Automerger Merge Worker
parent ec83f680bc 93e088dc1c
commit 8c0fafca72
6 changed files with 107 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/res/values-sw720dp/dimens.xml
View File

@@ -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>

6
quickstep/res/values/dimens.xml
View File

@@ -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>

87
quickstep/src/com/android/launcher3/taskbar/TaskbarThresholdUtils.java Normal file
View File

@@ -0,0 +1,87 @@
/*
* 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);
}
}

7
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@@ -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

4
quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java
View File

@@ -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 =

4
src/com/android/launcher3/config/FeatureFlags.java
View File

@@ -277,6 +277,10 @@ public final class FeatureFlags {
"ENABLE_BACK_SWIPE_HOME_ANIMATION", ENABLED,
"Enables home animation to icon when user swipes back.");
public static final BooleanFlag ENABLE_DYNAMIC_TASKBAR_THRESHOLDS = getDebugFlag(294252473,
"ENABLE_DYNAMIC_TASKBAR_THRESHOLDS", DISABLED,
"Enables taskbar thresholds that scale based on screen size.");
// TODO(Block 21): Clean up flags
public static final BooleanFlag ENABLE_APP_ICON_FOR_INLINE_SHORTCUTS = getDebugFlag(270395087,
"ENABLE_APP_ICON_IN_INLINE_SHORTCUTS", DISABLED, "Show app icon for inline shortcut");