Merge branch 'lineage-17.1' into v1-q (6c4a7867) · Commits · e / os / android_packages_apps_SetupWizard

AndroidManifest.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -49,6 +49,9 @@
		android:name="lineageos.permission.FINISH_SETUP"
		android:protectionLevel="signatureOrSystem" />

		<protected-broadcast android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
		android:permission="lineageos.permission.FINISH_SETUP"/>

		<protected-broadcast android:name="org.lineageos.setupwizard.SETUP_FINISHED"
		android:permission="lineageos.permission.FINISH_SETUP"/>

		@@ -231,7 +234,7 @@
		</intent-filter>
		</activity>

		<activity android:name=".FingerprintActivity"
		<activity android:name=".BiometricActivity"
		android:label="@string/activity_label_empty"
		android:excludeFromRecents="true"
		android:configChanges="mcc\|mnc"
		@@ -239,7 +242,7 @@
		android:exported="false"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS" />
		<action android:name="org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		@@ -275,7 +278,6 @@
		android:excludeFromRecents="true"
		android:configChanges="mcc\|mnc"
		android:immersive="true"
		android:exported="false"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP"/>

res/drawable/ic_face.xml

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?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>
		No newline at end of file

res/layout/setup_fingerprint.xml→res/layout/setup_biometric.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -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>

res/raw/lineage_wizard_script.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,11 +61,11 @@

		<!--
		<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>

res/raw/wizard_script.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,9 @@
		</WizardAction>
		<WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" />
		<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="oem_post_setup">
		<result wizard:action="restore" />
		</WizardAction>
		<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
		<result wizard:action="finish" />
		</WizardAction>
		<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">