Resseting volume button to "do nothing" on upgrade (44e68f50) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmInitReceiver.java

+11 −21

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import com.android.deskclock.timer.TimerObj;

		public class AlarmInitReceiver extends BroadcastReceiver {

		// A flag that indicates that switching the volume button
		// A flag that indicates that switching the volume button default was done
		private static final String PREF_VOLUME_DEF_DONE = "vol_def_done";
		/**
		* Sets alarm on ACTION_BOOT_COMPLETED. Resets alarm on
		@@ -55,9 +55,12 @@ public class AlarmInitReceiver extends BroadcastReceiver {
		TimerObj.resetTimersInSharedPrefs(prefs);
		Utils.clearSwSharedPref(prefs);

		// switch volume button default from "Snooze" to "Do Nothing"
		if (!prefs.getBoolean(PREF_VOLUME_DEF_DONE, false)) {
		// Fix the default
		Log.v("AlarmInitReceiver - resetting volume button default");
		switchVolumeButtonDefault(prefs);
		}
		}
		Alarms.setNextAlert(context);
		result.finish();
		Log.v("AlarmInitReceiver finished");
		@@ -67,26 +70,13 @@ public class AlarmInitReceiver extends BroadcastReceiver {
		}

		private void switchVolumeButtonDefault(SharedPreferences prefs) {
		Log.v("AlarmInitReceiver - Reset volume button default value");
		boolean resetDone = prefs.getBoolean(PREF_VOLUME_DEF_DONE, false);
		SharedPreferences.Editor editor = prefs.edit();

		if (!resetDone) {
		// 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);
		editor.apply();
		}
		}
		}

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;