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

Commit 39291f60 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android Git Automerger
Browse files

am 81a0690f: Resseting volume button to "do nothing" on upgrade 

# Via Isaac Katzenelson
* commit '81a0690f':
  Resseting volume button to "do nothing" on upgrade
parents c272aa58 81a0690f

src/com/android/deskclock/AlarmInitReceiver.java

+3 −12
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class AlarmInitReceiver extends BroadcastReceiver { 


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

                        // Fix the default

                        Log.v("AlarmInitReceiver - checking volume button default");

                        Log.v("AlarmInitReceiver - resetting volume button default");

                        switchVolumeButtonDefault(prefs);

                    }

                }
@@ -73,17 +73,8 @@ public class AlarmInitReceiver extends BroadcastReceiver { 
    private void switchVolumeButtonDefault(SharedPreferences prefs) {

        SharedPreferences.Editor editor = prefs.edit();



        // Get the volume button behavior setting

        final String vol = prefs.getString(SettingsActivity.KEY_VOLUME_BEHAVIOR,

	        SettingsActivity.DEFAULT_VOLUME_BEHAVIOR);

        // If the setting is "Snooze", change it to "Do Nothing"

        if (SettingsActivity.OLD_DEFAULT_VOLUME_BEHAVIOR.equals(vol)) {

        editor.putString(SettingsActivity.KEY_VOLUME_BEHAVIOR,

            SettingsActivity.DEFAULT_VOLUME_BEHAVIOR);

            Log.v("AlarmInitReceiver - Reset volume button default");

        } else {

            Log.v("AlarmInitReceiver - No need to reset volume button default");

        }



        // Make sure we do it only once

        editor.putBoolean(PREF_VOLUME_DEF_DONE, true);

src/com/android/deskclock/SettingsActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ public class SettingsActivity extends PreferenceActivity 
    static final String KEY_VOLUME_BUTTONS =

            "volume_button_setting";



    // Old and new default preferences, needed to switch the default on upgrade

    public static final String DEFAULT_VOLUME_BEHAVIOR = "0";

    public static final String OLD_DEFAULT_VOLUME_BEHAVIOR = "1";



    private static CharSequence[][] mTimezones;

    private long mTime;