commit 77f21a8d0ac725b94bf0aa0ede4c01555e50993e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Feb 24 18:12:06 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 24 18:12:06 2025 -0800
tree e489f6e2d200ed79daa96166bc4a06f34bb71c10
parent b384fe708b474a8329bd6b90e413c8eae756a7fa
parent 602cec999b5ac2efa723c9320dd9c4d3b27a185d

Merge "Use SwitchPreferenceCompat for UI consistency" into main

res/xml/development_settings.xml

diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 2beb96d..294f902 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -114,11 +114,10 @@
             android:summary="@string/oem_unlock_enable_summary"
             settings:useAdditionalSummary="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="enable_16k_pages"
             android:title="@string/enable_16k_pages"
-            android:summary="@string/enable_16k_pages_summary"
-            settings:useAdditionalSummary="true" />
+            android:summary="@string/enable_16k_pages_summary"/>
 
         <Preference
             android:key="running_apps"

src/com/android/settings/development/Enable16kPagesPreferenceController.java

diff --git a/src/com/android/settings/development/Enable16kPagesPreferenceController.java b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
index b782788..d8ad55f 100644
--- a/src/com/android/settings/development/Enable16kPagesPreferenceController.java
+++ b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
@@ -39,7 +39,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -139,7 +139,7 @@
                         Settings.Global.ENABLE_16K_PAGES,
                         defaultOptionValue /* default */);
 
-        ((SwitchPreference) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE);
+        ((SwitchPreferenceCompat) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE);
     }
 
     @Override
@@ -150,7 +150,7 @@
                 mContext.getContentResolver(),
                 Settings.Global.ENABLE_16K_PAGES,
                 ENABLE_4K_PAGE_SIZE);
-        ((SwitchPreference) mPreference).setChecked(false);
+        ((SwitchPreferenceCompat) mPreference).setChecked(false);
     }
 
     @Override