am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev (9d0fbd72) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DevelopmentSettings.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -489,10 +489,10 @@ public class DevelopmentSettings extends PreferenceFragment
		}

		private void updateDebuggerOptions() {
		mDebugApp = Settings.System.getString(
		getActivity().getContentResolver(), Settings.System.DEBUG_APP);
		updateCheckBox(mWaitForDebugger, Settings.System.getInt(
		getActivity().getContentResolver(), Settings.System.WAIT_FOR_DEBUGGER, 0) != 0);
		mDebugApp = Settings.Global.getString(
		getActivity().getContentResolver(), Settings.Global.DEBUG_APP);
		updateCheckBox(mWaitForDebugger, Settings.Global.getInt(
		getActivity().getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0);
		if (mDebugApp != null && mDebugApp.length() > 0) {
		String label;
		try {
		@@ -727,14 +727,14 @@ public class DevelopmentSettings extends PreferenceFragment
		}

		private void updateCpuUsageOptions() {
		updateCheckBox(mShowCpuUsage, Settings.System.getInt(getActivity().getContentResolver(),
		Settings.System.SHOW_PROCESSES, 0) != 0);
		updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
		Settings.Global.SHOW_PROCESSES, 0) != 0);
		}

		private void writeCpuUsageOptions() {
		boolean value = mShowCpuUsage.isChecked();
		Settings.System.putInt(getActivity().getContentResolver(),
		Settings.System.SHOW_PROCESSES, value ? 1 : 0);
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.SHOW_PROCESSES, value ? 1 : 0);
		Intent service = (new Intent())
		.setClassName("com.android.systemui", "com.android.systemui.LoadAverageService");
		if (value) {
		@@ -753,8 +753,8 @@ public class DevelopmentSettings extends PreferenceFragment
		}

		private void updateImmediatelyDestroyActivitiesOptions() {
		updateCheckBox(mImmediatelyDestroyActivities, Settings.System.getInt(
		getActivity().getContentResolver(), Settings.System.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
		updateCheckBox(mImmediatelyDestroyActivities, Settings.Global.getInt(
		getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
		}

		private void updateAnimationScaleValue(int which, ListPreference pref) {

src/com/android/settings/SoundSettings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements
		getActivity().sendBroadcast(i);
		}
		} else if (preference == mDockSounds) {
		Settings.System.putInt(getContentResolver(), Settings.System.DOCK_SOUNDS_ENABLED,
		Settings.Global.putInt(getContentResolver(), Settings.Global.DOCK_SOUNDS_ENABLED,
		mDockSounds.isChecked() ? 1 : 0);
		}
		return true;
		@@ -354,8 +354,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements

		mDockSounds = (CheckBoxPreference) findPreference(KEY_DOCK_SOUNDS);
		mDockSounds.setPersistent(false);
		mDockSounds.setChecked(Settings.System.getInt(resolver,
		Settings.System.DOCK_SOUNDS_ENABLED, 0) != 0);
		mDockSounds.setChecked(Settings.Global.getInt(resolver,
		Settings.Global.DOCK_SOUNDS_ENABLED, 0) != 0);
		} else {
		getPreferenceScreen().removePreference(findPreference(KEY_DOCK_CATEGORY));
		getPreferenceScreen().removePreference(findPreference(KEY_AUDIO_SETTINGS));

src/com/android/settings/bluetooth/BluetoothEnabler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeLis
		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
		// Show toast message if Bluetooth is not allowed in airplane mode
		if (isChecked &&
		!WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_BLUETOOTH)) {
		!WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_BLUETOOTH)) {
		Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
		// Reset switch to off
		buttonView.setChecked(false);

src/com/android/settings/wifi/WifiEnabler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener {
		return;
		}
		// Show toast message if Wi-Fi is not allowed in airplane mode
		if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_WIFI)) {
		if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_WIFI)) {
		Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
		// Reset switch to off. No infinite check/listenenr loop.
		buttonView.setChecked(false);