PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch fingerprint setup to biometric setup instead

Browse Source 
* Generic, handles both face and fingerprint
* Works the same as before for fingerprint
* Works the same as fingerprint for face
* What else could one ask for?

Change-Id: I9ddd7b46548c8107239fdec457bbaae6b12876e6
This commit is contained in:
Chirayu Desai
2020-05-28 00:26:19 +05:30
committed by Alessandro Astone
parent 799d3cb3b3
commit 103ac80d23
10 changed files with 116 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/drawable/ic_face.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 The Android Open Source 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
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/black"
android:pathData="M10.25,13c0,0.69-0.56,1.25-1.25,1.25S7.75,13.69,7.75,13S8.31,11.75,9,11.75S10.25,12.31,10.25,13z M15,11.75 c-0.69,0-1.25,0.56-1.25,1.25s0.56,1.25,1.25,1.25s1.25-0.56,1.25-1.25S15.69,11.75,15,11.75z M22,12c0,5.52-4.48,10-10,10 S2,17.52,2,12S6.48,2,12,2S22,6.48,22,12z M20,12c0-0.78-0.12-1.53-0.33-2.24C18.97,9.91,18.25,10,17.5,10 c-3.13,0-5.92-1.44-7.76-3.69c-1.05,2.56-3.14,4.57-5.74,5.55C4.01,11.9,4,11.95,4,12c0,4.41,3.59,8,8,8S20,16.41,20,12z" />
<path
android:pathData="M0,0h24v24H0V0z" />
</vector>

16
res/layout/setup_fingerprint.xml → res/layout/setup_biometric.xml
View File

@@ -39,14 +39,14 @@
style="@style/PageContent">
<TextView
android:id="@+id/setup_biometric_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/PageSummaryText"
android:textSize="16sp"
android:paddingLeft="@dimen/content_margin_left"
android:layout_marginBottom="@dimen/summary_margin_bottom"
android:paddingRight="@dimen/location_text_margin_right"
android:text="@string/fingerprint_setup_summary" />
android:paddingRight="@dimen/location_text_margin_right"/>
<TextView
android:layout_width="match_parent"
@@ -59,9 +59,10 @@
android:gravity="center_vertical"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/fingerprint_setup_backup_lock_method"/>
android:text="@string/biometric_setup_backup_lock_method"/>
<TextView
android:id="@+id/setup_add_biometric"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
@@ -71,11 +72,10 @@
android:drawablePadding="24dp"
android:gravity="center_vertical"
android:textSize="16sp"
android:textStyle="bold"
android:text="@string/fingerprint_setup_add_fingerprint"/>
android:textStyle="bold"/>
<TextView
android:id="@+id/setup_fingerprint"
android:id="@+id/setup_biometric"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/content_margin_left"
@@ -83,8 +83,8 @@
android:gravity="center_vertical"
android:textSize="16sp"
android:textAllCaps="true"
android:textColor="@color/fingerprint_setup_text_color"
android:text="@string/fingerprint_setup_screen_lock_setup"/>
android:textColor="@color/biometric_setup_text_color"
android:text="@string/biometric_setup_screen_lock_setup"/>
</LinearLayout>
</ScrollView>

4
res/raw/lineage_wizard_script.xml
View File

@@ -58,10 +58,10 @@
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
<result wizard:action="fingerprint_settings" />
<result wizard:action="biometric_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS;end" id="fingerprint_settings">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
<result wizard:action="lockscreen_settings" />
</WizardAction>

2
res/values/colors.xml
View File

@@ -31,5 +31,5 @@
<color name="header_bg">@color/primary</color>
<color name="header_condensed_bg">@color/primary</color>
<color name="button_bar_background">@color/primary</color>
<color name="fingerprint_setup_text_color">#167C80</color>
<color name="biometric_setup_text_color">#167C80</color>
</resources>

13
res/values/strings.xml
View File

@@ -80,14 +80,17 @@
<string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
<string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string>
<!-- Fingerprint setup -->
<string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
<string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
<!-- Biometric setup -->
<string name="settings_biometric_setup_title">Select backup screen lock type</string>
<string name="settings_biometric_setup_details">How would you like to lock your screen?</string>
<string name="fingerprint_setup_title">Fingerprint setup</string>
<string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
<string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
<string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
<string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
<string name="face_setup_title">Face setup</string>
<string name="face_setup_summary">To use your face to unlock your screen, you\'ll need to:</string>
<string name="face_setup_add_face">Add your face</string>
<string name="biometric_setup_backup_lock_method">Setup a secondary unlock method</string>
<string name="biometric_setup_screen_lock_setup">Setup screen lock</string>
<string name="sim_locale_changed">%1$s SIM detected</string>
<!-- secure lock screen -->