diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-04 00:25:21 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-04 00:25:21 +0000 |
commit | 5ec34339ba1343e8df281dec908f4197667e9131 (patch) | |
tree | 3f27c3a22f722f67bebc5148c76c0452f052def6 | |
parent | 544070c082ced52b47b0c601a3adda8f38396424 (diff) | |
parent | 39688d2d61bb241b38fb43ca414471f571540722 (diff) | |
download | Launcher3-5ec34339ba1343e8df281dec908f4197667e9131.tar.gz |
Snap for 9451646 from 39688d2d61bb241b38fb43ca414471f571540722 to tm-qpr2-release
Change-Id: I2cabe51b91f584e366b12bdee1ced7335623c891
-rw-r--r-- | quickstep/res/layout/taskbar_all_apps_button.xml | 6 | ||||
-rw-r--r-- | quickstep/res/values-sw720dp/dimens.xml | 1 | ||||
-rw-r--r-- | quickstep/res/values/dimens.xml | 7 | ||||
-rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/TaskbarView.java | 11 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 9 |
6 files changed, 18 insertions, 19 deletions
diff --git a/quickstep/res/layout/taskbar_all_apps_button.xml b/quickstep/res/layout/taskbar_all_apps_button.xml index 79d087a8ef..6b665e5623 100644 --- a/quickstep/res/layout/taskbar_all_apps_button.xml +++ b/quickstep/res/layout/taskbar_all_apps_button.xml @@ -13,10 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> + +<!-- Note: The actual size will match the taskbar icon sizes in TaskbarView#onLayout(). --> <com.android.launcher3.views.IconButtonView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/taskbar_icon_touch_size" - android:layout_height="@dimen/taskbar_icon_touch_size" + android:layout_width="@dimen/taskbar_icon_min_touch_size" + android:layout_height="@dimen/taskbar_icon_min_touch_size" android:contentDescription="@string/all_apps_button_label" android:backgroundTint="@android:color/transparent" android:icon="@drawable/ic_all_apps_button" diff --git a/quickstep/res/values-sw720dp/dimens.xml b/quickstep/res/values-sw720dp/dimens.xml index 28f7c5d0de..d27561ab1d 100644 --- a/quickstep/res/values-sw720dp/dimens.xml +++ b/quickstep/res/values-sw720dp/dimens.xml @@ -40,4 +40,5 @@ <!-- Transient taskbar --> <dimen name="transient_taskbar_size">76dp</dimen> + <dimen name="transient_taskbar_icon_size">52dp</dimen> </resources> diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 403d6bd486..2eb4abc3fb 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -255,7 +255,10 @@ <!-- Taskbar --> <dimen name="taskbar_size">@*android:dimen/taskbar_frame_height</dimen> <dimen name="taskbar_ime_size">48dp</dimen> - <dimen name="taskbar_icon_touch_size">48dp</dimen> + <dimen name="taskbar_icon_size">44dp</dimen> + <dimen name="taskbar_icon_min_touch_size">48dp</dimen> + <!-- Note that this applies to both sides of all icons, so visible space is double this. --> + <dimen name="taskbar_icon_spacing">12dp</dimen> <dimen name="taskbar_icon_drag_icon_size">54dp</dimen> <dimen name="taskbar_folder_margin">16dp</dimen> <dimen name="taskbar_contextual_button_padding">16dp</dimen> @@ -282,11 +285,11 @@ <!-- Transient taskbar --> <dimen name="transient_taskbar_size">72dp</dimen> + <dimen name="transient_taskbar_icon_size">48dp</dimen> <dimen name="transient_taskbar_margin">24dp</dimen> <dimen name="transient_taskbar_shadow_blur">40dp</dimen> <dimen name="transient_taskbar_key_shadow_distance">10dp</dimen> <dimen name="transient_taskbar_stashed_size">32dp</dimen> - <dimen name="transient_taskbar_icon_spacing">10dp</dimen> <!-- 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 --> diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index 2433a3497a..2fcd64b5e6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -101,16 +101,15 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar super(context, attrs, defStyleAttr, defStyleRes); mActivityContext = ActivityContext.lookupContext(context); mIconLayoutBounds = mActivityContext.getTransientTaskbarBounds(); - mIsRtl = Utilities.isRtl(getResources()); - Resources resources = getResources(); - mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size); + mIsRtl = Utilities.isRtl(resources); - int actualMargin = DisplayController.isTransientTaskbar(mActivityContext) - ? resources.getDimensionPixelSize(R.dimen.transient_taskbar_icon_spacing) - : resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing); + int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing); int actualIconSize = mActivityContext.getDeviceProfile().iconSizePx; + mIconTouchSize = Math.max(actualIconSize, + resources.getDimensionPixelSize(R.dimen.taskbar_icon_min_touch_size)); + // We layout the icons to be of mIconTouchSize in width and height mItemMarginLeftRight = actualMargin - (mIconTouchSize - actualIconSize) / 2; mItemPadding = (mIconTouchSize - actualIconSize) / 2; diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 40e49f1545..09b2d6f83f 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -46,7 +46,4 @@ <!-- Folder spaces --> <dimen name="folder_footer_horiz_padding">24dp</dimen> - - <!-- Transient taskbar --> - <dimen name="transient_taskbar_icon_size">57dp</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b57eb02292..4d2e1b7c6d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -365,8 +365,8 @@ <dimen name="min_hotseat_icon_space">18dp</dimen> <dimen name="max_hotseat_icon_space">50dp</dimen> <dimen name="min_hotseat_qsb_width">0dp</dimen> - <dimen name="taskbar_icon_size">44dp</dimen> - <dimen name="transient_taskbar_icon_size">50dp</dimen> + <dimen name="taskbar_icon_size">0dp</dimen> + <dimen name="transient_taskbar_icon_size">0dp</dimen> <!-- Transient taskbar (placeholders to compile in Launcher3 without Quickstep) --> <dimen name="transient_taskbar_size">0dp</dimen> <dimen name="transient_taskbar_margin">0dp</dimen> @@ -374,10 +374,7 @@ <dimen name="transient_taskbar_key_shadow_distance">0dp</dimen> <dimen name="transient_taskbar_stashed_size">0dp</dimen> <dimen name="transient_taskbar_clamped_offset_bound">0dp</dimen> - <!-- Note that this applies to both sides of all icons, so visible space is double this. --> - <dimen name="transient_taskbar_icon_spacing">0dp</dimen> - <!-- Note that this applies to both sides of all icons, so visible space is double this. --> - <dimen name="taskbar_icon_spacing">8dp</dimen> + <dimen name="taskbar_icon_spacing">0dp</dimen> <dimen name="taskbar_nav_buttons_size">0dp</dimen> <dimen name="taskbar_contextual_button_margin">0dp</dimen> <dimen name="taskbar_hotseat_nav_spacing">0dp</dimen> |