diff options
| author | Jim Miller <jaggies@google.com> | 2014-08-15 01:01:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-13 23:16:37 +0000 |
| commit | bbce34d9be421effb055fbf1a945ec49dfeef02d (patch) | |
| tree | 6ac1002f24aa7c0fcfeb547cde37e06b921fb02a | |
| parent | ce8d39103f51eb418cad61ee3e0a80445307e46a (diff) | |
| parent | 75fe9e027c2f280664c2aaa0a78457fc37bd0e8b (diff) | |
| download | packages_apps_Settings-bbce34d9be421effb055fbf1a945ec49dfeef02d.zip packages_apps_Settings-bbce34d9be421effb055fbf1a945ec49dfeef02d.tar.gz packages_apps_Settings-bbce34d9be421effb055fbf1a945ec49dfeef02d.tar.bz2 | |
Merge "API review - move confirm credential constants from Intent" into lmp-dev
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/ConfirmDeviceCredentialActivity.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 63cb07c..6ff3639 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1109,7 +1109,11 @@ <!-- Lock screen settings --> <activity android:name="ConfirmDeviceCredentialActivity" android:exported="true"> - <!-- Use high-priority to prevent an installed activity from masquerading as this one. --> + <intent-filter> + <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <!-- TODO: Remove this once new API is being used --> <intent-filter android:priority="1000"> <action android:name="android.intent.action.CONFIRM_DEVICE_CREDENTIAL" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java index 6a5c486..6b2bfd2 100644 --- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java @@ -18,6 +18,7 @@ package com.android.settings; import android.app.Activity; +import android.app.KeyguardManager; import android.content.Intent; import android.os.Bundle; import android.util.Log; @@ -34,8 +35,8 @@ public class ConfirmDeviceCredentialActivity extends Activity { super.onCreate(savedInstanceState); Intent intent = getIntent(); - String title = intent.getStringExtra(Intent.EXTRA_TITLE); - String details = intent.getStringExtra(Intent.EXTRA_DETAILS); + String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE); + String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION); ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this); if (!helper.launchConfirmationActivity(0 /* request code */, title, details)) { |