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

Commit 296e428c authored by Michael W's avatar Michael W
Browse files

DeskClock: Convert ListPreferences to SimpleMenuPreferences 

This matches the style of the rest of the selection settings

Change-Id: I8ca41e4e8bd6fc970fb218b4ffaba3f768e50375
parent 5ddac958

res/xml/screensaver_settings.xml

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

    android:title="@string/app_label">



    <ListPreference

    <com.android.deskclock.settings.SimpleMenuPreference

        android:defaultValue="@string/default_clock_style"

        android:dialogTitle="@string/clock_style"

        android:entries="@array/clock_style_entries"
@@ -27,7 +27,7 @@ 
        android:title="@string/clock_style"

        app:iconSpaceReserved="false" />



    <ListPreference

    <com.android.deskclock.settings.SimpleMenuPreference

        android:defaultValue="@string/default_clock_color"

        android:entries="@array/clock_color_entries"

        android:entryValues="@array/clock_color_values"
@@ -70,7 +70,7 @@ 
            android:dependency="screensaver_night_mode"

            app:iconSpaceReserved="false" />



        <ListPreference

        <com.android.deskclock.settings.SimpleMenuPreference

            android:defaultValue="@string/default_clock_color"

            android:entries="@array/clock_color_entries"

            android:entryValues="@array/clock_color_values"

src/com/android/deskclock/settings/ScreensaverSettingsActivity.java

+5 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.Bundle; 
import android.text.format.DateFormat;

import android.view.MenuItem;



import androidx.preference.ListPreference;

import androidx.preference.Preference;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.SeekBarPreference;
@@ -96,14 +95,14 @@ public final class ScreensaverSettingsActivity extends CollapsingToolbarBaseActi 
        public boolean onPreferenceChange(Preference pref, Object newValue) {

            switch (pref.getKey()) {

                case KEY_CLOCK_STYLE:

                    final ListPreference clockStylePref = (ListPreference) pref;

                    final SimpleMenuPreference clockStylePref = (SimpleMenuPreference) pref;

                    final int clockStyleindex = clockStylePref.findIndexOfValue((String) newValue);

                    clockStylePref.setSummary(clockStylePref.getEntries()[clockStyleindex]);

                    setVisibility(newValue.equals(CLOCK_STYLE_DIGITAL));

                    break;

                case KEY_NIGHT_MODE_COLOR:

                case KEY_CLOCK_COLOR:

                    final ListPreference clockColorPref = (ListPreference) pref;

                    final SimpleMenuPreference clockColorPref = (SimpleMenuPreference) pref;

                    final int clockColorindex = clockColorPref.findIndexOfValue((String) newValue);

                    clockColorPref.setSummary(clockColorPref.getEntries()[clockColorindex]);

                    break;
@@ -118,9 +117,9 @@ public final class ScreensaverSettingsActivity extends CollapsingToolbarBaseActi 
        }



        private void refresh() {

            final ListPreference clockStylePref = findPreference(KEY_CLOCK_STYLE);

            final ListPreference clockColorPref = findPreference(KEY_CLOCK_COLOR);

            final ListPreference nightModeColorPref = findPreference(KEY_NIGHT_MODE_COLOR);

            final SimpleMenuPreference clockStylePref = findPreference(KEY_CLOCK_STYLE);

            final SimpleMenuPreference clockColorPref = findPreference(KEY_CLOCK_COLOR);

            final SimpleMenuPreference nightModeColorPref = findPreference(KEY_NIGHT_MODE_COLOR);

            final SwitchPreferenceCompat nightModePref = findPreference(KEY_NIGHT_MODE);

            final SwitchPreferenceCompat nightModeDndPref = findPreference(KEY_NIGHT_MODE_DND);

            final SwitchPreferenceCompat showAmPmPref = findPreference(KEY_SHOW_AMPM);