From 0e64dbe1498183bf5a4c52066d247dfae7ee22ec Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Tue, 23 Apr 2024 10:48:23 +0100 Subject: [PATCH] Make TaskMenuViewWithArrow width wrap content with a minimum width - Also add a end padding for the text - http://screen/3yTa8tmJfJuVf2t Fix: 331555315 Test: OverviewMenuImageTest Flag: NONE Change-Id: Ic9bc2799cd25f87d2ec6c7ce83d50d060513a292 --- quickstep/res/layout/task_menu_with_arrow.xml | 1 + .../android/quickstep/views/TaskMenuViewWithArrow.kt | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/quickstep/res/layout/task_menu_with_arrow.xml b/quickstep/res/layout/task_menu_with_arrow.xml index c9108a5abd..88e5cf72cb 100644 --- a/quickstep/res/layout/task_menu_with_arrow.xml +++ b/quickstep/res/layout/task_menu_with_arrow.xml @@ -18,6 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:minWidth="@dimen/task_menu_width_grid" android:animateLayoutChanges="true" android:background="@drawable/task_menu_bg" android:orientation="vertical" diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt index 1db04a86c4..3b75d9e2da 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt +++ b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt @@ -83,7 +83,7 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T private var alignedOptionIndex: Int = 0 private val extraSpaceForRowAlignment: Int get() = optionMeasuredHeight * alignedOptionIndex - private val menuWidth = context.resources.getDimensionPixelSize(R.dimen.task_menu_width_grid) + private val menuPaddingEnd = context.resources.getDimensionPixelSize(R.dimen.task_card_margin) private lateinit var taskView: TaskView private lateinit var optionLayout: LinearLayout @@ -213,7 +213,13 @@ class TaskMenuViewWithArrow : ArrowPopup where T : RecentsViewContainer, T menuOptionView.requireViewById(R.id.text) ) val lp = menuOptionView.layoutParams as LayoutParams - lp.width = menuWidth + lp.width = LayoutParams.MATCH_PARENT + menuOptionView.setPaddingRelative( + menuOptionView.paddingStart, + menuOptionView.paddingTop, + menuPaddingEnd, + menuOptionView.paddingBottom + ) menuOptionView.setOnClickListener { view: View? -> menuOption.onClick(view) } optionLayout.addView(menuOptionView) }