From 8f6e33714a051e832c8464c4ec5565eb68eef45a Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Tue, 21 May 2024 18:17:25 -0400 Subject: [PATCH] Use phone handlebar size for tiny taskbar. Flag: com.android.wm.shell.enable_tiny_taskbar Test: Manual Bug: 341784466 Change-Id: I8dbe04e221ada4d01f9525f62a257a1d983f86f0 --- .../launcher3/taskbar/StashedHandleViewController.java | 2 +- .../android/launcher3/taskbar/TaskbarBackgroundRenderer.kt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java index 8d4c34d690..252f2a81f0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java @@ -118,7 +118,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT mControllers = controllers; DeviceProfile deviceProfile = mActivity.getDeviceProfile(); Resources resources = mActivity.getResources(); - if (mActivity.isPhoneGestureNavMode()) { + if (mActivity.isPhoneGestureNavMode() || mActivity.isTinyTaskbar()) { mTaskbarSize = resources.getDimensionPixelSize(R.dimen.taskbar_phone_size); mStashedHandleWidth = resources.getDimensionPixelSize(R.dimen.taskbar_stashed_small_screen); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt index e290c3fa3d..bafd05924f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt @@ -97,8 +97,11 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { fun updateStashedHandleWidth(context: TaskbarActivityContext, res: Resources) { stashedHandleWidth = res.getDimensionPixelSize( - if (context.isPhoneMode) R.dimen.taskbar_stashed_small_screen - else R.dimen.taskbar_stashed_handle_width + if (context.isPhoneMode || context.isTinyTaskbar) { + R.dimen.taskbar_stashed_small_screen + } else { + R.dimen.taskbar_stashed_handle_width + } ) }