From b28f9c0a765126fe4aebb28849cfd0267094d2b5 Mon Sep 17 00:00:00 2001 From: d34d Date: Tue, 7 Jul 2015 17:30:20 -0700 Subject: [PATCH] Enroll fingerprint via SetupWizard [2/2] Change-Id: Ieabfb0f3b789b02ddd1e17aba1eadfda52b21384 --- res/drawable/ic_check_mark.xml | 26 ++++ res/layout/setup_fingerprint.xml | 90 +++++++++++++ res/values/colors.xml | 1 + res/values/strings.xml | 9 ++ .../setupwizard/SetupWizardApp.java | 5 + .../setupwizard/cmstats/SetupStats.java | 1 + .../setupwizard/setup/CMSetupWizardData.java | 3 + .../setup/FingerprintSetupPage.java | 123 ++++++++++++++++++ .../setupwizard/util/SetupWizardUtils.java | 6 + 9 files changed, 264 insertions(+) create mode 100644 res/drawable/ic_check_mark.xml create mode 100644 res/layout/setup_fingerprint.xml create mode 100644 src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java diff --git a/res/drawable/ic_check_mark.xml b/res/drawable/ic_check_mark.xml new file mode 100644 index 0000000..a47cb4b --- /dev/null +++ b/res/drawable/ic_check_mark.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/setup_fingerprint.xml b/res/layout/setup_fingerprint.xml new file mode 100644 index 0000000..6af8519 --- /dev/null +++ b/res/layout/setup_fingerprint.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 57bf650..7943291 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -29,4 +29,5 @@ @color/primary @color/primary_dark #e4e7e8 + #356bc4 diff --git a/res/values/strings.xml b/res/values/strings.xml index 2607b9b..d42c2ea 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -85,4 +85,13 @@ Require your Cyanogen OS account password in order to use your device even after a factory reset. To turn this feature off/on, please go to Settings > Security Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost + + + Select backup screen lock type + How would you like to lock your screen? + Fingerprint setup + To use your fingerprint sensor to unlock your screen or confirm purchases, you\'ll need to: + Setup a backup screen lock method + Add your fingerprint + Setup screen lock diff --git a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java index 33b005a..81b7818 100644 --- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java +++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java @@ -40,6 +40,8 @@ public class SetupWizardApp extends Application { public static final String ACTION_SETUP_WIFI = "com.android.net.wifi.SETUP_WIFI_NETWORK"; public static final String ACTION_VIEW_LEGAL = "cyanogenmod.intent.action.LEGALESE"; + public static final String ACTION_SETUP_FINGERPRINT = "com.android.settings.SETUP_FINGERPRINT"; + public static final String EXTRA_FIRST_RUN = "firstRun"; public static final String EXTRA_ALLOW_SKIP = "allowSkip"; public static final String EXTRA_AUTO_FINISH = "wifi_auto_finish_on_connect"; @@ -49,6 +51,8 @@ public class SetupWizardApp extends Application { public static final String EXTRA_MATERIAL_LIGHT = "material_light"; public static final String EXTRA_CKSOP = "cksOp"; public static final String EXTRA_LOGIN_FOR_KILL_SWITCH = "authCks"; + public static final String EXTRA_TITLE = "title"; + public static final String EXTRA_DETAILS = "details"; public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled"; @@ -65,6 +69,7 @@ public class SetupWizardApp extends Application { public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4; public static final int REQUEST_CODE_SETUP_BLUETOOTH= 5; public static final int REQUEST_CODE_UNLOCK = 6; + public static final int REQUEST_CODE_SETUP_FINGERPRINT = 7; public static final int RADIO_READY_TIMEOUT = 10 * 1000; diff --git a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java index ea881f9..6eb527f 100644 --- a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java +++ b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java @@ -156,6 +156,7 @@ public class SetupStats { public static final String VALUE = "value"; public static final String SLOT = "slot"; public static final String TOTAL_TIME = "total_time"; + public static final String FINGERPRINT_SETUP = "fingerprint_setup"; } } diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index fd557c1..d8fbabc 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -50,6 +50,9 @@ public class CMSetupWizardData extends AbstractSetupData { pages.add(new BluetoothSetupPage(mContext, this)); } pages.add(new WelcomePage(mContext, this)); + if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) { + pages.add(new FingerprintSetupPage(mContext, this)); + } pages.add(new WifiSetupPage(mContext, this)); if (SetupWizardUtils.hasTelephony(mContext)) { pages.add(new SimCardMissingPage(mContext, this) diff --git a/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java new file mode 100644 index 0000000..0f76582 --- /dev/null +++ b/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2013 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cyanogenmod.setupwizard.setup; + +import android.app.Activity; +import android.app.ActivityOptions; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; +import com.android.internal.widget.LockPatternUtils; +import com.cyanogenmod.setupwizard.R; +import com.cyanogenmod.setupwizard.SetupWizardApp; +import com.cyanogenmod.setupwizard.cmstats.SetupStats; +import com.cyanogenmod.setupwizard.ui.SetupPageFragment; + +public class FingerprintSetupPage extends SetupPage { + + private static final String TAG = "FingerprintSetupPage"; + + public FingerprintSetupPage(Context context, SetupDataCallbacks callbacks) { + super(context, callbacks); + } + + @Override + public Fragment getFragment(FragmentManager fragmentManager, int action) { + Fragment fragment = fragmentManager.findFragmentByTag(getKey()); + if (fragment == null) { + Bundle args = new Bundle(); + args.putString(Page.KEY_PAGE_ARGUMENT, getKey()); + args.putInt(Page.KEY_PAGE_ACTION, action); + fragment = new FingerprintSetupFragment(); + fragment.setArguments(args); + } + return fragment; + } + + @Override + public int getNextButtonTitleResId() { + return R.string.skip; + } + + @Override + public String getKey() { + return TAG; + } + + @Override + public int getTitleResId() { + return R.string.fingerprint_setup_title; + } + + @Override + public boolean onActivityResult(int requestCode, int resultCode, Intent data) { + if (SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT == requestCode) { + if (resultCode == Activity.RESULT_OK) { + getCallbacks().onNextPage(); + } + } + return true; + } + + public static class FingerprintSetupFragment extends SetupPageFragment { + + private TextView mSetupFingerprint; + + @Override + protected void initializePage() { + mSetupFingerprint = (TextView) mRootView.findViewById(R.id.setup_fingerprint); + mSetupFingerprint.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + launchFingerprintSetup(); + } + }); + } + + @Override + protected int getLayoutResource() { + return R.layout.setup_fingerprint; + } + + private void launchFingerprintSetup() { + Intent intent = new Intent(SetupWizardApp.ACTION_SETUP_FINGERPRINT); + intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); + intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true); + intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); + intent.putExtra(SetupWizardApp.EXTRA_THEME, SetupWizardApp.EXTRA_MATERIAL_LIGHT); + intent.putExtra(SetupWizardApp.EXTRA_AUTO_FINISH, false); + intent.putExtra(LockPatternUtils.LOCKSCREEN_FINGERPRINT_FALLBACK, true); + intent.putExtra(SetupWizardApp.EXTRA_TITLE, + getString(R.string.settings_fingerprint_setup_title)); + intent.putExtra(SetupWizardApp.EXTRA_DETAILS, + getString(R.string.settings_fingerprint_setup_details)); + ActivityOptions options = + ActivityOptions.makeCustomAnimation(getActivity(), + android.R.anim.fade_in, + android.R.anim.fade_out); + SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD, + SetupStats.Action.EXTERNAL_PAGE_LAUNCH, + SetupStats.Label.PAGE, SetupStats.Label.FINGERPRINT_SETUP); + startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT, + options.toBundle()); + } + } +} diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index e16379d..c802335 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -36,6 +36,7 @@ import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.os.IKillSwitchService; +import com.android.internal.widget.LockPatternUtils; import com.cyanogenmod.setupwizard.SetupWizardApp; import com.google.android.gms.common.ConnectionResult; @@ -267,6 +268,11 @@ public class SetupWizardUtils { return packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK); } + public static boolean hasFingerprint(Context context) { + LockPatternUtils lockPatternUtils = new LockPatternUtils(context); + return lockPatternUtils.isFingerprintInstalled(context); + } + public static final ComponentName mTvwifisettingsActivity = new ComponentName("com.android.tv.settings", "com.android.tv.settings.connectivity.setup.WifiSetupActivity");