diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-26 22:08:16 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-09-27 16:22:55 -0700 |
| commit | 5246e7f76d5fe62f7ffd99e889d90116b37b7f35 (patch) | |
| tree | 166e03aaa4704827f87ecd42fd99d09875da0885 /src/com/android/settings/ApplicationSettings.java | |
| parent | 48af3cdbd934b79ebbcd4639bb63621e93ca9ec2 (diff) | |
| download | packages_apps_Settings-5246e7f76d5fe62f7ffd99e889d90116b37b7f35.tar.gz packages_apps_Settings-5246e7f76d5fe62f7ffd99e889d90116b37b7f35.tar.bz2 packages_apps_Settings-5246e7f76d5fe62f7ffd99e889d90116b37b7f35.zip | |
Follow more Secure settings to Global.
Bug: 7232014, 7231331, 7231198
Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
Diffstat (limited to 'src/com/android/settings/ApplicationSettings.java')
| -rw-r--r-- | src/com/android/settings/ApplicationSettings.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java index 27fc3ec97..6a170499b 100644 --- a/src/com/android/settings/ApplicationSettings.java +++ b/src/com/android/settings/ApplicationSettings.java @@ -60,8 +60,8 @@ public class ApplicationSettings extends SettingsPreferenceFragment { mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION); // Is app default install location set? - boolean userSetInstLocation = (Settings.System.getInt(getContentResolver(), - Settings.Secure.SET_INSTALL_LOCATION, 0) != 0); + boolean userSetInstLocation = (Settings.Global.getInt(getContentResolver(), + Settings.Global.SET_INSTALL_LOCATION, 0) != 0); if (!userSetInstLocation) { getPreferenceScreen().removePreference(mInstallLocation); } else { @@ -78,18 +78,18 @@ public class ApplicationSettings extends SettingsPreferenceFragment { protected void handleUpdateAppInstallLocation(final String value) { if(APP_INSTALL_DEVICE_ID.equals(value)) { - Settings.System.putInt(getContentResolver(), - Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE); + Settings.Global.putInt(getContentResolver(), + Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE); } else if (APP_INSTALL_SDCARD_ID.equals(value)) { - Settings.System.putInt(getContentResolver(), - Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD); + Settings.Global.putInt(getContentResolver(), + Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD); } else if (APP_INSTALL_AUTO_ID.equals(value)) { - Settings.System.putInt(getContentResolver(), - Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO); + Settings.Global.putInt(getContentResolver(), + Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO); } else { // Should not happen, default to prompt... - Settings.System.putInt(getContentResolver(), - Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO); + Settings.Global.putInt(getContentResolver(), + Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO); } mInstallLocation.setValue(value); } @@ -121,8 +121,8 @@ public class ApplicationSettings extends SettingsPreferenceFragment { } private String getAppInstallLocation() { - int selectedLocation = Settings.System.getInt(getContentResolver(), - Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO); + int selectedLocation = Settings.Global.getInt(getContentResolver(), + Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO); if (selectedLocation == APP_INSTALL_DEVICE) { return APP_INSTALL_DEVICE_ID; } else if (selectedLocation == APP_INSTALL_SDCARD) { |