From 4e0fc628f0e53b3f77ea5474f7a273d7af61da4d Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 1 Apr 2015 14:20:16 -0700 Subject: [PATCH] [Fingerprint] Add fingerprint text in setup flow When running in Setup Wizard, the screen to choose screen lock will have an additional footer, telling the user that they can configure fingerprint in Settings after completing the setup flow. Bug: 19690335 Change-Id: Ie6268fb8738e6bbac8751d12b05c82092fe6193b --- .../setup_screen_lock_fingerprint_details.xml | 25 +++++++++++++++++++ res/values/strings.xml | 5 ++++ .../settings/SetupChooseLockGeneric.java | 8 ++++++ 3 files changed, 38 insertions(+) create mode 100644 res/layout/setup_screen_lock_fingerprint_details.xml diff --git a/res/layout/setup_screen_lock_fingerprint_details.xml b/res/layout/setup_screen_lock_fingerprint_details.xml new file mode 100644 index 00000000000..988468fc550 --- /dev/null +++ b/res/layout/setup_screen_lock_fingerprint_details.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 2c28beb9f54..a7d5bd4571a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1005,6 +1005,11 @@ Password + + Once you\'ve set up a screen lock, you can also set up your fingerprint in Settings > Security. + Turn off screen lock diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java index 10bac1569d6..a631caf120b 100644 --- a/src/com/android/settings/SetupChooseLockGeneric.java +++ b/src/com/android/settings/SetupChooseLockGeneric.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceFragment; +import android.hardware.fingerprint.FingerprintManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -82,6 +83,13 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric final View header = inflater.inflate(R.layout.setup_wizard_header, list, false); list.addHeaderView(header, null, false); } + final FingerprintManager fpm = (FingerprintManager) + getActivity().getSystemService(Context.FINGERPRINT_SERVICE); + if (fpm != null && fpm.isHardwareDetected()) { + final View footer = inflater.inflate( + R.layout.setup_screen_lock_fingerprint_details, list, false); + list.addFooterView(footer, null, false); + } return view; }