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

Commit 4e3120ea authored by x10f's avatar x10f Committed by Steve Kondik
Browse files

Settings : date and Time - Checkbox --> Switches 

Changes Date & Time Settings from checkboxes to on/off switches, as
recommended: http://developer.android.com/design/building-blocks/switches.html
This also adds some more design consistency.

Change-Id: I1e7848ae46859161f45a3a952e5a8d06ad52a023
parent 92bf7de3

res/xml/date_time_prefs.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 
        android:title="@string/date_and_time"

        settings:keywords="@string/keywords_date_and_time">



    <CheckBoxPreference android:key="auto_time"

    <SwitchPreference android:key="auto_time"

        android:title="@string/date_time_auto"

        android:summaryOn="@string/date_time_auto_summaryOn"

        android:summaryOff="@string/date_time_auto_summaryOff"

        />



    <CheckBoxPreference android:key="auto_zone"

    <SwitchPreference android:key="auto_zone"

        android:title="@string/zone_auto"

        android:summaryOn="@string/zone_auto_summaryOn"

        android:summaryOff="@string/zone_auto_summaryOff"
@@ -48,7 +48,7 @@ 
        android:summary="GMT-8:00"

        />



    <CheckBoxPreference android:key="24 hour"

    <SwitchPreference android:key="24 hour"

        android:title="@string/date_time_24hour"

        />

src/com/android/settings/DateTimeSettings.java

+7 −7
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ import android.content.IntentFilter; 
import android.content.SharedPreferences;

import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

import android.os.Bundle;

import android.preference.CheckBoxPreference;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.PreferenceScreen;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.preference.SwitchPreference;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;
@@ -69,10 +69,10 @@ public class DateTimeSettings extends SettingsPreferenceFragment 
    // have we been launched from the setup wizard?

    protected static final String EXTRA_IS_FIRST_RUN = "firstRun";



    private CheckBoxPreference mAutoTimePref;

    private SwitchPreference mAutoTimePref;

    private Preference mTimePref;

    private Preference mTime24Pref;

    private CheckBoxPreference mAutoTimeZonePref;

    private SwitchPreference mAutoTimeZonePref;

    private Preference mTimeZone;

    private Preference mDatePref;

    private ListPreference mDateFormat;
@@ -90,7 +90,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment 
        boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME);

        boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE);



        mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME);

        mAutoTimePref = (SwitchPreference) findPreference(KEY_AUTO_TIME);



        DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context

                .DEVICE_POLICY_SERVICE);
@@ -108,7 +108,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment 
        mDummyDate = Calendar.getInstance();



        mAutoTimePref.setChecked(autoTimeEnabled);

        mAutoTimeZonePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME_ZONE);

        mAutoTimeZonePref = (SwitchPreference) findPreference(KEY_AUTO_TIME_ZONE);

        // Override auto-timezone if it's a wifi-only device or if we're still in setup wizard.

        // TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location.

        if (Utils.isWifiOnly(getActivity()) || isFirstRun) {
@@ -168,7 +168,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment 
        getPreferenceScreen().getSharedPreferences()

                .registerOnSharedPreferenceChangeListener(this);



        ((CheckBoxPreference)mTime24Pref).setChecked(is24Hour());

        ((SwitchPreference)mTime24Pref).setChecked(is24Hour());



        // Register for time ticks and other reasons for time change

        IntentFilter filter = new IntentFilter();
@@ -318,7 +318,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment 
            removeDialog(DIALOG_TIMEPICKER);

            showDialog(DIALOG_TIMEPICKER);

        } else if (preference == mTime24Pref) {

            final boolean is24Hour = ((CheckBoxPreference)mTime24Pref).isChecked();

            final boolean is24Hour = ((SwitchPreference)mTime24Pref).isChecked();

            set24Hour(is24Hour);

            updateTimeAndDateDisplay(getActivity());

            timeUpdated(is24Hour);