diff options
| author | Jason parks <jparks@google.com> | 2011-01-17 09:59:54 -0600 |
|---|---|---|
| committer | Jason parks <jparks@google.com> | 2011-01-18 09:31:51 -0600 |
| commit | 3e8b76319d34e2e96819ec9e62d4f19ee7d4e2b4 (patch) | |
| tree | 2c4f4454f63fcc45b0b7649928b927b8c161e257 /src/com/android/settings | |
| parent | 12c665b2b68cf6e556d498ccab10617503e8beec (diff) | |
| download | packages_apps_settings-3e8b76319d34e2e96819ec9e62d4f19ee7d4e2b4.zip packages_apps_settings-3e8b76319d34e2e96819ec9e62d4f19ee7d4e2b4.tar.gz packages_apps_settings-3e8b76319d34e2e96819ec9e62d4f19ee7d4e2b4.tar.bz2 | |
Encrypt inplace settings.
Change-Id: I5b9cb94c987dedecf3bf31cb67a42e2f24866d3b
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/ConfirmLockPassword.java | 8 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index 5447ba8..16c465b 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -31,8 +31,8 @@ import android.text.InputType; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; @@ -138,7 +138,11 @@ public class ConfirmLockPassword extends PreferenceActivity { private void handleNext() { final String pin = mPasswordEntry.getText().toString(); if (mLockPatternUtils.checkPassword(pin)) { - getActivity().setResult(RESULT_OK); + + Intent intent = new Intent(); + intent.putExtra("password", pin); + + getActivity().setResult(RESULT_OK, intent); getActivity().finish(); } else { showError(R.string.lockpattern_need_to_unlock_wrong); diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index f8ed599..bcaab7f 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -406,8 +406,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); |