PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d0a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3502129

Change-Id: I932bcbfd0f9b444ec87de09bfbf1eb57ebdfe803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2025-02-24 18:29:19 -08:00
committed by Automerger Merge Worker
parent 59781d008c 77f21a8d0a
commit 851c8a5ff6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_settings.xml
View File

@@ -114,11 +114,10 @@
android:summary="@string/oem_unlock_enable_summary" android:summary="@string/oem_unlock_enable_summary"
settings:useAdditionalSummary="true" /> settings:useAdditionalSummary="true" />
<SwitchPreference <SwitchPreferenceCompat
android:key="enable_16k_pages" android:key="enable_16k_pages"
android:title="@string/enable_16k_pages" android:title="@string/enable_16k_pages"
android:summary="@string/enable_16k_pages_summary" android:summary="@string/enable_16k_pages_summary"/>
settings:useAdditionalSummary="true" />
<Preference <Preference
android:key="running_apps" android:key="running_apps"

6
src/com/android/settings/development/Enable16kPagesPreferenceController.java
View File

@@ -39,7 +39,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreferenceCompat;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
@@ -139,7 +139,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
Settings.Global.ENABLE_16K_PAGES, Settings.Global.ENABLE_16K_PAGES,
defaultOptionValue /* default */); defaultOptionValue /* default */);
((SwitchPreference) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE); ((SwitchPreferenceCompat) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE);
} }
@Override @Override
@@ -150,7 +150,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Global.ENABLE_16K_PAGES, Settings.Global.ENABLE_16K_PAGES,
ENABLE_4K_PAGE_SIZE); ENABLE_4K_PAGE_SIZE);
((SwitchPreference) mPreference).setChecked(false); ((SwitchPreferenceCompat) mPreference).setChecked(false);
} }
@Override @Override