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

src/com/android/deskclock/AlarmInitReceiver.java

+3 −12

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

	if (!prefs.getBoolean(PREF_VOLUME_DEF_DONE, false)) {		if (!prefs.getBoolean(PREF_VOLUME_DEF_DONE, false)) {
	// Fix the default		// Fix the default
	Log.v("AlarmInitReceiver - checking volume button default");		Log.v("AlarmInitReceiver - resetting volume button default");
	switchVolumeButtonDefault(prefs);		switchVolumeButtonDefault(prefs);
	}		}
	}		}
	@@ -73,17 +73,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
	private void switchVolumeButtonDefault(SharedPreferences prefs) {		private void switchVolumeButtonDefault(SharedPreferences prefs) {
	SharedPreferences.Editor editor = prefs.edit();		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,		editor.putString(SettingsActivity.KEY_VOLUME_BEHAVIOR,
	SettingsActivity.DEFAULT_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		// Make sure we do it only once
	editor.putBoolean(PREF_VOLUME_DEF_DONE, true);		editor.putBoolean(PREF_VOLUME_DEF_DONE, true);

src/com/android/deskclock/SettingsActivity.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -64,9 +64,7 @@ public class SettingsActivity extends PreferenceActivity
	static final String KEY_VOLUME_BUTTONS =		static final String KEY_VOLUME_BUTTONS =
	"volume_button_setting";		"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 DEFAULT_VOLUME_BEHAVIOR = "0";
	public static final String OLD_DEFAULT_VOLUME_BEHAVIOR = "1";

	private static CharSequence[][] mTimezones;		private static CharSequence[][] mTimezones;
	private long mTime;		private long mTime;