From 019be1b687b659672e36386c42682dba33f530dd Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Sat, 28 Oct 2023 20:04:13 +0800 Subject: [PATCH] Migrate ShortcutPreference to SwitchCompat Settings use SwitchCompat instead of Switch in the future, for new Material 3 UI. Bug: 306658427 Test: manual - on Accessibility pages Change-Id: Idf87eb6fcf1a57bd98a6fd0eca3c8c325127ce17 --- res/layout/accessibility_shortcut_secondary_action.xml | 2 +- .../android/settings/accessibility/ShortcutPreference.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/layout/accessibility_shortcut_secondary_action.xml b/res/layout/accessibility_shortcut_secondary_action.xml index b3b81fe5593..80defdb669b 100644 --- a/res/layout/accessibility_shortcut_secondary_action.xml +++ b/res/layout/accessibility_shortcut_secondary_action.xml @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="end|center_vertical" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingHorizontal="?android:attr/listPreferredItemPaddingEnd" android:minWidth="58dp" android:orientation="vertical" /> diff --git a/src/com/android/settings/accessibility/ShortcutPreference.java b/src/com/android/settings/accessibility/ShortcutPreference.java index 4b6868e0871..a04f8f45fed 100644 --- a/src/com/android/settings/accessibility/ShortcutPreference.java +++ b/src/com/android/settings/accessibility/ShortcutPreference.java @@ -62,7 +62,7 @@ public class ShortcutPreference extends Preference { ShortcutPreference(Context context, AttributeSet attrs) { super(context, attrs); setLayoutResource(R.layout.accessibility_shortcut_secondary_action); - setWidgetLayoutResource(com.android.settingslib.R.layout.preference_widget_primary_switch); + setWidgetLayoutResource(androidx.preference.R.layout.preference_widget_switch_compat); setIconSpaceReserved(false); // Treat onSettingsClicked as this preference's click. setOnPreferenceClickListener(preference -> { @@ -89,7 +89,7 @@ public class ShortcutPreference extends Preference { } CompoundButton switchWidget = - holder.itemView.findViewById(com.android.settingslib.R.id.switchWidget); + holder.itemView.findViewById(androidx.preference.R.id.switchWidget); if (switchWidget != null) { // Consumes move events to ignore drag actions. switchWidget.setOnTouchListener((v, event) -> {