Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69c155e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d am: 851c8a5f 

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



Change-Id: I07dede53d57dd72366db3aea23e23f206f7b9a1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b2effb3 851c8a5f

res/xml/development_settings.xml

+2 −3
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import androidx.annotation.VisibleForTesting; 
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 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen 
                        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 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen 
                mContext.getContentResolver(),

                Settings.Global.ENABLE_16K_PAGES,

                ENABLE_4K_PAGE_SIZE);

        ((SwitchPreference) mPreference).setChecked(false);

        ((SwitchPreferenceCompat) mPreference).setChecked(false);

    }



    @Override