| commit | c2730034e3abe76d643aa6eaa162ae85c51b460d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jan 25 01:53:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 01:53:53 2023 +0000 |
| tree | 8cf026a26961f9a50ed2e2edbadf0f031a7dfcde | |
| parent | ae7ba53468740ef5e733d27f87ead954b416f860 [diff] | |
| parent | ec4562f47278f0610d03378e1e70e4d702844f3e [diff] |
Merge "UX polish: preview size, toolbar color." into tm-qpr-dev am: ec4562f472 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21063820 Change-Id: I3e6fa1ad17979fd876ed75a9393478be345a1e53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/layout/fragment_lock_screen_quick_affordances.xml b/res/layout/fragment_lock_screen_quick_affordances.xml index 714d4fa..b167b5f 100644 --- a/res/layout/fragment_lock_screen_quick_affordances.xml +++ b/res/layout/fragment_lock_screen_quick_affordances.xml
@@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:paddingTop="36dp" + android:paddingTop="20dp" android:paddingBottom="40dp"> <include
diff --git a/res/layout/picker_fragment_tab.xml b/res/layout/picker_fragment_tab.xml index cd04758..2e6e8fa 100644 --- a/res/layout/picker_fragment_tab.xml +++ b/res/layout/picker_fragment_tab.xml
@@ -25,8 +25,10 @@ android:paddingVertical="8dp" android:paddingHorizontal="16dp" android:minWidth="48dp" - android:minHeight="48dp" + android:minHeight="36dp" android:gravity="center" android:background="@drawable/picker_fragment_tab_background" android:text="Placeholder for stable size calculation, please do not remove." + android:maxLines="1" + android:ellipsize="end" tools:ignore="HardcodedText" />
diff --git a/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt b/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt index 8d8a517..f956598 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt
@@ -81,4 +81,8 @@ override fun getDefaultTitle(): CharSequence { return requireContext().getString(R.string.keyguard_quick_affordance_title) } + + override fun getToolbarColorId(): Int { + return android.R.color.transparent + } }