summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockPassword.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-10-13 18:15:17 -0700
committerJim Miller <jaggies@google.com>2014-10-14 18:40:30 -0700
commit46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a (patch)
tree2bea20cdff429e942f679ea0616942b569b7a7b8 /src/com/android/settings/ChooseLockPassword.java
parent94dce7618584b4ca51bf17937cbd6cb0c22aaaea (diff)
downloadpackages_apps_Settings-46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a.zip
packages_apps_Settings-46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a.tar.gz
packages_apps_Settings-46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a.tar.bz2
Add a checkbox option to 'require password to decrypt'
Fixes bug 17881324 Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
Diffstat (limited to 'src/com/android/settings/ChooseLockPassword.java')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index d04f6ac..0a703cf 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -24,11 +24,13 @@ import com.android.settings.notification.RedactionInterstitial;
import android.app.Activity;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
import android.content.Intent;
import android.inputmethodservice.KeyboardView;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.provider.Settings;
import android.text.Editable;
import android.text.InputType;
import android.text.Selection;