Merge "Encrypt inplace settings." into honeycomb

2011-01-20 15:50:55 -08:00
parent 39281d0163 3e8b76319d
commit a13e9c877c
4 changed files with 25 additions and 13 deletions
--- 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);