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

Commit 38dbf53d authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

feat: Use eSwitch for settings

parent 7d90f8a1

quickstep/res/xml/indexable_launcher_prefs.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



    <SwitchPreferenceCompat

    <SwitchPreference

        android:key="pref_add_icon_to_home"

        android:title="@string/auto_add_shortcuts_label"

        android:summary="@string/auto_add_shortcuts_description"

        android:defaultValue="true"  />



    <SwitchPreferenceCompat

    <SwitchPreference

        android:key="pref_allowRotation"

        android:title="@string/allow_rotation_title"

        android:summary="@string/allow_rotation_desc"

quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class SettingsChangeLogger implements 
            new DaggerSingletonObject<>(QuickstepBaseAppComponent::getSettingsChangeLogger);



    private static final String TAG = "SettingsChangeLogger";

    private static final String BOOLEAN_PREF = "SwitchPreferenceCompat";

    private static final String BOOLEAN_PREF = "SwitchPreference";



    private final Context mContext;

    private final ArrayMap<String, LoggablePref> mLoggablePrefs;

res/values-v31/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
        <item name="preferenceFragmentCompatStyle">@style/HomeSettings.FragmentCompatStyle</item>

        <item name="preferenceScreenStyle">@style/HomeSettings.PreferenceScreenStyle</item>

        <item name="preferenceStyle">@style/HomeSettings.PreferenceStyle</item>

        <item name="switchPreferenceCompatStyle">@style/HomeSettings.SwitchPreferenceStyle</item>

        <item name="switchPreferenceStyle">@style/HomeSettings.SwitchPreferenceStyle</item>

        <item name="android:fontFamily">google-sans-text</item>

    </style>
@@ -57,7 +57,7 @@ 
    </style>



    <style name="HomeSettings.SwitchPreferenceStyle"

            parent="@style/Preference.SwitchPreferenceCompat.Material">

            parent="@style/Preference.SwitchPreference.Material">

        <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>

    </style>

res/xml/launcher_preferences.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto">



    <SwitchPreferenceCompat

    <SwitchPreference

        android:defaultValue="false"

        android:key="pref_workspace_lock"

        android:persistent="true"
@@ -36,7 +36,7 @@ 
      LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_ENABLED(613)

      LAUNCHER_ADD_NEW_APPS_TO_HOME_SCREEN_DISABLED(614)

    -->

    <SwitchPreferenceCompat

    <SwitchPreference

        android:key="pref_add_icon_to_home"

        android:title="@string/auto_add_shortcuts_label"

        android:summary="@string/auto_add_shortcuts_description"
@@ -49,7 +49,7 @@ 
      LAUNCHER_HOME_SCREEN_ROTATION_ENABLED(615)

      LAUNCHER_HOME_SCREEN_ROTATION_DISABLED(616)

    -->

    <SwitchPreferenceCompat

    <SwitchPreference

        android:key="pref_allowRotation"

        android:title="@string/allow_rotation_title"

        android:summary="@string/allow_rotation_desc"
@@ -58,14 +58,14 @@ 
        launcher:logIdOn="615"

        launcher:logIdOff="616" />



    <SwitchPreferenceCompat

    <SwitchPreference

        android:defaultValue="@bool/default_single_mode"

        android:key="pref_single_layer"

        android:persistent="true"

        android:title="Enable single layer mode"

        launcher:isPreferenceVisible="false" />



    <SwitchPreferenceCompat

    <SwitchPreference

        android:defaultValue="true"

        android:key="pref_notif_count"

        android:persistent="true"

src/com/android/launcher3/settings/SettingsActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import androidx.preference.PreferenceFragmentCompat.OnPreferenceStartScreenCallb 
import androidx.preference.PreferenceGroup;

import androidx.preference.PreferenceGroup.PreferencePositionCallback;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreferenceCompat;

import androidx.preference.SwitchPreference;

import androidx.recyclerview.widget.RecyclerView;



import com.android.launcher3.BuildConfig;
@@ -349,7 +349,7 @@ public class SettingsActivity extends FragmentActivity 
                case BlissPrefs.PREF_SINGLE_LAYER_MODE:

                    boolean isSingleLayer = MultiModeController.isSingleLayerMode();

                    preference.setDefaultValue(isSingleLayer);

                    ((SwitchPreferenceCompat) preference).setChecked(isSingleLayer);

                    ((SwitchPreference) preference).setChecked(isSingleLayer);

                    return true;



                case ADD_ICON_PREFERENCE_KEY:
@@ -358,7 +358,7 @@ public class SettingsActivity extends FragmentActivity 
                case BlissPrefs.PREF_NOTIF_COUNT:

                    boolean showCount = MultiModeController.isNotifCountEnabled();

                    preference.setDefaultValue(showCount);

                    ((SwitchPreferenceCompat) preference).setChecked(showCount);

                    ((SwitchPreference) preference).setChecked(showCount);

                    return true;

            }

            return true;