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

Commit 942b3a39 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Refactoring SharedPreferences to common location. 

Bug: 25860525
Change-Id: Ia015e1d9f5318aa366a35a2699da12d1669e7df5
parent 360ee7df

src/com/android/deskclock/AlarmClockFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ public abstract class AlarmClockFragment extends DeskClockFragment implements 
    }



    private Uri getDefaultRingtoneUri() {

        final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());

        final SharedPreferences sp = Utils.getDefaultSharedPreferences(getActivity());

        final String ringtoneUriString = sp.getString(PREF_KEY_DEFAULT_ALARM_RINGTONE_URI, null);



        final Uri ringtoneUri;
@@ -498,7 +498,7 @@ public abstract class AlarmClockFragment extends DeskClockFragment implements 
    }



    private void setDefaultRingtoneUri(Uri uri) {

        final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());

        final SharedPreferences sp = Utils.getDefaultSharedPreferences(getActivity());

        if (uri == null) {

            sp.edit().remove(PREF_KEY_DEFAULT_ALARM_RINGTONE_URI).apply();

        } else {

src/com/android/deskclock/AlarmInitReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class AlarmInitReceiver extends BroadcastReceiver { 
                    if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {

                        // Clear stopwatch and timers data

                        final SharedPreferences prefs =

                                PreferenceManager.getDefaultSharedPreferences(context);

                                Utils.getDefaultSharedPreferences(context);

                        LogUtils.v("AlarmInitReceiver - Reset timers and clear stopwatch data");

                        TimerObj.resetTimersInSharedPrefs(prefs);

                        Utils.clearSwSharedPref(prefs);

src/com/android/deskclock/ClockFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen 
        }

        mList.setAdapter(mAdapter);



        mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());

        mPrefs = Utils.getDefaultSharedPreferences(getActivity());

        mDefaultClockStyle = getActivity().getResources().getString(R.string.default_clock_style);

        return v;

    }

src/com/android/deskclock/DeskClock.java

+3 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public class DeskClock extends BaseActivity 
        stopwatchIntent.setAction(Stopwatches.KILL_NOTIF);

        startService(stopwatchIntent);



        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

        SharedPreferences prefs = Utils.getDefaultSharedPreferences(this);

        SharedPreferences.Editor editor = prefs.edit();

        editor.putBoolean(Timers.NOTIF_APP_OPEN, true);

        editor.apply();
@@ -254,7 +254,7 @@ public class DeskClock extends BaseActivity 
        intent.setAction(Stopwatches.SHOW_NOTIF);

        startService(intent);



        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

        SharedPreferences prefs = Utils.getDefaultSharedPreferences(this);

        SharedPreferences.Editor editor = prefs.edit();

        editor.putBoolean(Timers.NOTIF_APP_OPEN, false);

        editor.apply();
@@ -355,7 +355,7 @@ public class DeskClock extends BaseActivity 
     * Insert the local time zone as the Home Time Zone if one is not set

     */

    private void setHomeTimeZone() {

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

        SharedPreferences prefs = Utils.getDefaultSharedPreferences(this);

        String homeTimeZone = prefs.getString(SettingsActivity.KEY_HOME_TZ, "");

        if (!homeTimeZone.isEmpty()) {

            return;

src/com/android/deskclock/DeskClockBackupAgent.java

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class DeskClockBackupAgent extends BackupAgent { 
    @Override

    public void onRestoreFinished() {

        // Write a preference to indicate a data restore has been completed.

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);

        final SharedPreferences prefs = Utils.getDefaultSharedPreferences(this);

        prefs.edit().putBoolean(KEY_RESTORE_FINISHED, true).apply();



        // If device boot is not yet completed, use ACTION_BOOT_COMPLETED to trigger completion of
@@ -119,7 +119,7 @@ public class DeskClockBackupAgent extends BackupAgent { 
     */

    public static boolean processRestoredData(Context context) {

        // If the preference indicates data was not recently restored, there is nothing to do.

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        final SharedPreferences prefs = Utils.getDefaultSharedPreferences(context);

        if (!prefs.getBoolean(KEY_RESTORE_FINISHED, false)) {

            return false;

        }