am 6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev (7b251126) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DataUsageSummary.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -869,14 +869,14 @@ public class DataUsageSummary extends Fragment {

		private boolean getDataRoaming() {
		final ContentResolver resolver = getActivity().getContentResolver();
		return Settings.Secure.getInt(resolver, Settings.Secure.DATA_ROAMING, 0) != 0;
		return Settings.Global.getInt(resolver, Settings.Global.DATA_ROAMING, 0) != 0;
		}

		private void setDataRoaming(boolean enabled) {
		// TODO: teach telephony DataConnectionTracker to watch and apply
		// updates when changed.
		final ContentResolver resolver = getActivity().getContentResolver();
		Settings.Secure.putInt(resolver, Settings.Secure.DATA_ROAMING, enabled ? 1 : 0);
		Settings.Global.putInt(resolver, Settings.Global.DATA_ROAMING, enabled ? 1 : 0);
		mMenuDataRoaming.setChecked(enabled);
		}

		@@ -1899,7 +1899,7 @@ public class DataUsageSummary extends Fragment {

		/**
		* Dialog to request user confirmation before setting
		* {@link android.provider.Settings.Secure#DATA_ROAMING}.
		* {@link android.provider.Settings.Global#DATA_ROAMING}.
		*/
		public static class ConfirmDataRoamingFragment extends DialogFragment {
		public static void show(DataUsageSummary parent) {

src/com/android/settings/DevelopmentSettings.java

+18 −18

Original line number	Diff line number	Diff line
		@@ -316,8 +316,8 @@ public class DevelopmentSettings extends PreferenceFragment
		}

		final ContentResolver cr = getActivity().getContentResolver();
		mLastEnabledState = Settings.Secure.getInt(cr,
		Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
		mLastEnabledState = Settings.Global.getInt(cr,
		Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
		mEnabledSwitch.setChecked(mLastEnabledState);
		setPrefsEnabledState(mLastEnabledState);

		@@ -326,8 +326,8 @@ public class DevelopmentSettings extends PreferenceFragment
		// settings that are enabled. This is an invalid state. Switch
		// to debug settings being enabled, so the user knows there is
		// stuff enabled and can turn it all off if they want.
		Settings.Secure.putInt(getActivity().getContentResolver(),
		Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 1);
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
		mLastEnabledState = true;
		setPrefsEnabledState(mLastEnabledState);
		}
		@@ -342,12 +342,12 @@ public class DevelopmentSettings extends PreferenceFragment
		final Context context = getActivity();
		final ContentResolver cr = context.getContentResolver();
		mHaveDebugSettings = false;
		updateCheckBox(mEnableAdb, Settings.Secure.getInt(cr,
		Settings.Secure.ADB_ENABLED, 0) != 0);
		updateCheckBox(mEnableAdb, Settings.Global.getInt(cr,
		Settings.Global.ADB_ENABLED, 0) != 0);
		updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
		Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
		updateCheckBox(mKeepScreenOn, Settings.System.getInt(cr,
		Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
		updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr,
		Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
		updateCheckBox(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
		updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
		Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
		@@ -815,8 +815,8 @@ public class DevelopmentSettings extends PreferenceFragment
		mEnableDialog.setOnDismissListener(this);
		} else {
		resetDangerousOptions();
		Settings.Secure.putInt(getActivity().getContentResolver(),
		Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0);
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
		mLastEnabledState = isChecked;
		setPrefsEnabledState(mLastEnabledState);
		}
		@@ -857,16 +857,16 @@ public class DevelopmentSettings extends PreferenceFragment
		.show();
		mAdbDialog.setOnDismissListener(this);
		} else {
		Settings.Secure.putInt(getActivity().getContentResolver(),
		Settings.Secure.ADB_ENABLED, 0);
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.ADB_ENABLED, 0);
		}
		} else if (preference == mBugreportInPower) {
		Settings.Secure.putInt(getActivity().getContentResolver(),
		Settings.Secure.BUGREPORT_IN_POWER_MENU,
		mBugreportInPower.isChecked() ? 1 : 0);
		} else if (preference == mKeepScreenOn) {
		Settings.System.putInt(getActivity().getContentResolver(),
		Settings.System.STAY_ON_WHILE_PLUGGED_IN,
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
		mKeepScreenOn.isChecked() ?
		(BatteryManager.BATTERY_PLUGGED_AC \| BatteryManager.BATTERY_PLUGGED_USB) : 0);
		} else if (preference == mEnforceReadExternal) {
		@@ -958,8 +958,8 @@ public class DevelopmentSettings extends PreferenceFragment
		if (dialog == mAdbDialog) {
		if (which == DialogInterface.BUTTON_POSITIVE) {
		mDialogClicked = true;
		Settings.Secure.putInt(getActivity().getContentResolver(),
		Settings.Secure.ADB_ENABLED, 1);
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.ADB_ENABLED, 1);
		} else {
		// Reset the toggle
		mEnableAdb.setChecked(false);
		@@ -967,8 +967,8 @@ public class DevelopmentSettings extends PreferenceFragment
		} else if (dialog == mEnableDialog) {
		if (which == DialogInterface.BUTTON_POSITIVE) {
		mDialogClicked = true;
		Settings.Secure.putInt(getActivity().getContentResolver(),
		Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 1);
		Settings.Global.putInt(getActivity().getContentResolver(),
		Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
		mLastEnabledState = true;
		setPrefsEnabledState(mLastEnabledState);
		} else {

src/com/android/settings/LocationSettings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class LocationSettings extends SettingsPreferenceFragment
		mAssistedGps.setEnabled(enabled);
		}
		} else if (preference == mAssistedGps) {
		Settings.Secure.putInt(cr, Settings.Secure.ASSISTED_GPS_ENABLED,
		Settings.Global.putInt(cr, Settings.Global.ASSISTED_GPS_ENABLED,
		mAssistedGps.isChecked() ? 1 : 0);
		} else {
		// If we didn't handle it, let preferences handle it.
		@@ -152,8 +152,8 @@ public class LocationSettings extends SettingsPreferenceFragment
		mNetwork.setChecked(networkEnabled);
		mLocationAccess.setChecked(gpsEnabled \|\| networkEnabled);
		if (mAssistedGps != null) {
		mAssistedGps.setChecked(Settings.Secure.getInt(res,
		Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
		mAssistedGps.setChecked(Settings.Global.getInt(res,
		Settings.Global.ASSISTED_GPS_ENABLED, 2) == 1);
		mAssistedGps.setEnabled(gpsEnabled);
		}
		}

src/com/android/settings/SecuritySettings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -229,13 +229,13 @@ public class SecuritySettings extends SettingsPreferenceFragment
		}

		private boolean isNonMarketAppsAllowed() {
		return Settings.Secure.getInt(getContentResolver(),
		Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
		return Settings.Global.getInt(getContentResolver(),
		Settings.Global.INSTALL_NON_MARKET_APPS, 0) > 0;
		}

		private void setNonMarketAppsAllowed(boolean enabled) {
		// Change the system setting
		Settings.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS,
		Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS,
		enabled ? 1 : 0);
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ public class WifiApEnabler {
		if (enable && ((wifiState == WifiManager.WIFI_STATE_ENABLING) \|\|
		(wifiState == WifiManager.WIFI_STATE_ENABLED))) {
		mWifiManager.setWifiEnabled(false);
		Settings.Secure.putInt(cr, Settings.Secure.WIFI_SAVED_STATE, 1);
		Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1);
		}

		if (mWifiManager.setWifiApEnabled(null, enable)) {
		@@ -133,13 +133,13 @@ public class WifiApEnabler {
		if (!enable) {
		int wifiSavedState = 0;
		try {
		wifiSavedState = Settings.Secure.getInt(cr, Settings.Secure.WIFI_SAVED_STATE);
		wifiSavedState = Settings.Global.getInt(cr, Settings.Global.WIFI_SAVED_STATE);
		} catch (Settings.SettingNotFoundException e) {
		;
		}
		if (wifiSavedState == 1) {
		mWifiManager.setWifiEnabled(true);
		Settings.Secure.putInt(cr, Settings.Secure.WIFI_SAVED_STATE, 0);
		Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 0);
		}
		}
		}