summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-08-03 15:33:25 -0700
committerMaurice Lam <yukl@google.com>2015-08-03 23:12:09 +0000
commit87fadbe6d96e482fa8fc94f502afa10a522285a4 (patch)
treeb311e7061bcf38506ae79c9b6659f61fd44a4a5f /src/com/android/settings
parentc493f0421773fba528494d98e396c34f6815fe7b (diff)
downloadpackages_apps_Settings-87fadbe6d96e482fa8fc94f502afa10a522285a4.zip
packages_apps_Settings-87fadbe6d96e482fa8fc94f502afa10a522285a4.tar.gz
packages_apps_Settings-87fadbe6d96e482fa8fc94f502afa10a522285a4.tar.bz2
[Fingerprint] Help text for backup screen lock
Show a help text saying "Choose your backup screen lock method" when asking the user for backup screen lock during fingerprint enrollment. A backup translation is specified, using the source string "Set up your backup screen lock method". Bug: 22879473 Change-Id: I9b9348141227103e695d1fc78601745cac0309a7
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/ChooseLockGeneric.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 70ef4d9..1015a45 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -38,7 +38,10 @@ import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
import android.util.EventLog;
import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
import android.view.accessibility.AccessibilityManager;
+import android.widget.ListView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
@@ -168,6 +171,18 @@ public class ChooseLockGeneric extends SettingsActivity {
}
@Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ if (mForFingerprint) {
+ final LayoutInflater inflater = LayoutInflater.from(getContext());
+ final ListView listView = getListView();
+ final View fingerprintHeader = inflater.inflate(
+ R.layout.choose_lock_generic_fingerprint_header, listView, false);
+ listView.addHeaderView(fingerprintHeader, null, false);
+ }
+ }
+
+ @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
Preference preference) {
final String key = preference.getKey();