Merge "Add accessibility for Face" (ed889a37) · Commits · e / os / android_packages_apps_Settings

res/layout/face_enroll_accessibility_toggle.xml

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingEnd="16dp"
		android:paddingStart="16dp">

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/title"/>

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<View
		android:layout_width="1dp"
		android:layout_height="match_parent"
		android:background="?android:attr/listDivider" />

		<Switch
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/toggle"
		android:checked="true"/>

		</LinearLayout>

res/layout/face_enroll_introduction.xml

+36 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		xmlns:FaceEnrollAccessibilitySwitch="http://schemas.android.com/apk/res/com.android.settings"
		style="?attr/face_layout_theme"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		@@ -59,6 +60,41 @@

		</com.google.android.setupdesign.view.FillContentLayout>

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center">
		<Button
		android:id="@+id/accessibility_button"
		style="@style/SuwGlifButton.Secondary"
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_face_enroll_introduction_accessibility" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:id="@+id/accessibility_layout"
		android:orientation="vertical"
		android:visibility="invisible">

		<com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle
		android:id="@+id/toggle_diversity"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>

		<com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle
		android:id="@+id/toggle_vision"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_vision"/>

		</LinearLayout>
		</FrameLayout>

		</LinearLayout>

		</com.google.android.setupdesign.GlifLayout>

res/values/attrs.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,11 @@
		<attr name="thickness" format="dimension" />
		</declare-styleable>

		<!-- For Face enroll accessibility toggle -->
		<declare-styleable name="FaceEnrollAccessibilityToggle">
		<attr name="messageText" format="reference" />
		</declare-styleable>

		<!-- For TwoStatesButtonPreference -->
		<declare-styleable name="TwoStateButtonPreference">
		<attr name="textOn" format="reference" />

res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -877,6 +877,12 @@
		<string name="security_settings_face_preference_summary_none">Tap to set up face authentication</string>
		<!-- Title shown for menu item that launches face settings or enrollment. [CHAR LIMIT=32] -->
		<string name="security_settings_face_preference_title">Face authentication</string>
		<!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->
		<string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>
		<!-- Message shown for a toggle which when disabled, allows the user to enroll using a simpler flow for accessibility [CHAR LIMIT=NONE] -->
		<string name="security_settings_face_enroll_introduction_accessibility_diversity"></string>
		<!-- Message shown for a toggle which when disabled, allows the user to enroll using a simpler flow for accessibility [CHAR LIMIT=NONE] -->
		<string name="security_settings_face_enroll_introduction_accessibility_vision"></string>
		<!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
		<string name="security_settings_face_enroll_introduction_cancel">Cancel</string>
		<!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->

src/com/android/settings/biometrics/BiometricEnrollBase.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -40,8 +40,10 @@ import com.google.android.setupdesign.GlifLayout;
		*/
		public abstract class BiometricEnrollBase extends InstrumentedActivity
		implements View.OnClickListener {
		public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";

		public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
		public static final String EXTRA_KEY_REQUIRE_VISION = "accessibility_vision";
		public static final String EXTRA_KEY_REQUIRE_DIVERSITY = "accessibility_diversity";

		/**
		* Used by the choose fingerprint wizard to indicate the wizard is