diff options
| author | Jason parks <jparks@google.com> | 2011-01-20 15:50:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-20 15:50:55 -0800 |
| commit | a13e9c877ce4928df0095f47b6117cc4b5403fb2 (patch) | |
| tree | a379b8ee5174ecfba91473b02bb9d68f512b81cf /src/com/android/settings/SecuritySettings.java | |
| parent | 39281d0163aa410391a128d1d2c8194c88e732fb (diff) | |
| parent | 3e8b76319d34e2e96819ec9e62d4f19ee7d4e2b4 (diff) | |
| download | packages_apps_settings-a13e9c877ce4928df0095f47b6117cc4b5403fb2.zip packages_apps_settings-a13e9c877ce4928df0095f47b6117cc4b5403fb2.tar.gz packages_apps_settings-a13e9c877ce4928df0095f47b6117cc4b5403fb2.tar.bz2 | |
Merge "Encrypt inplace settings." into honeycomb
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 649c012..5bb169e 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -372,8 +372,6 @@ public class SecuritySettings extends SettingsPreferenceFragment } else if (preference == mAssistedGps) { Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED, mAssistedGps.isChecked() ? 1 : 0); - } else if (KEY_ENCRYPTION.equals(key)) { - new Encryption().showPasswordDialog(); } else { // If we didn't handle it, let preferences handle it. return super.onPreferenceTreeClick(preferenceScreen, preference); |