diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-04-06 17:47:18 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-04-13 14:59:26 -0700 |
| commit | 8a09b619aeb233e2aab1919301f162d8acf1f0f0 (patch) | |
| tree | aeec574a47f0f71ab9177b2e4ef7f912e87f61b6 /src/com/android/settings/DevelopmentSettings.java | |
| parent | b5aa73f46f812ba03518a6d1ac218e3af5975236 (diff) | |
| download | packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.zip packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.tar.gz packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.tar.bz2 | |
Update confirm device credentials to spec, add fingerprint
- New strings in the screen.
- New layout/style.
- Clean up internal API's around it.
- Add fingerprint support if launched from externally
- Separate theme if launched from externally
- If launched from above Keyguard, use SHOW_WHEN_LOCKED flag
Change-Id: Icdf9bf9e0506841f24e8aab5f0f1d1f4b688951f
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 5fafc92..5c7e0e9 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -1610,10 +1610,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private boolean showKeyguardConfirmation(Resources resources, int requestCode) { - return new ChooseLockSettingsHelper(getActivity(), this) - .launchConfirmationActivity(requestCode, - resources.getString(R.string.oem_unlock_enable_pin_prompt), - resources.getString(R.string.oem_unlock_enable_pin_description)); + return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity( + requestCode, resources.getString(R.string.oem_unlock_enable)); } @Override |