Merge "Update FingerprintEnrollFindSensor for landscape" into sc-dev (0b29ebd4) · Commits · e / os / android_packages_apps_Settings

res/layout-land/fingerprint_enroll_find_sensor.xml

deleted100644 → 0

+0 −108

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

		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout="@layout/sud_glif_blank_template"
		style="?attr/fingerprint_layout_theme">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:clipToPadding="false"
		android:clipChildren="false">

		<LinearLayout
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">

		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:fillViewport="true">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipChildren="false"
		android:clipToPadding="false">

		<ImageView
		android:id="@+id/sud_layout_icon"
		style="@style/SudGlifIcon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="?attr/sudGlifHeaderGravity"
		android:layout_marginStart="0dp"
		android:layout_marginEnd="0dp"
		android:src="@drawable/ic_fingerprint_header" />

		<TextView
		android:id="@+id/suc_layout_title"
		style="@style/SudGlifHeaderTitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="0dp"
		android:layout_marginEnd="0dp" />

		<TextView
		android:id="@+id/sud_layout_description"
		style="@style/SudDescription.Glif"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>

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

		</LinearLayout>

		</ScrollView>

		</LinearLayout>

		<FrameLayout
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="match_parent">

		<include
		layout="@layout/fingerprint_enroll_find_sensor_graphic"
		android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
		android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
		android:layout_gravity="center"/>

		</FrameLayout>

		</LinearLayout>

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

res/layout/fingerprint_enroll_find_sensor_base.xml

+0 −17

Original line number	Diff line number	Diff line
		@@ -29,23 +29,6 @@
		android:clipToPadding="false"
		android:clipChildren="false">

		<LinearLayout
		style="@style/SudContentFrame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">

		<TextView
		style="@style/SudDescription.Glif"
		android:id="@+id/sud_layout_description"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/sud_description_glif_margin_top"
		android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
		</LinearLayout>

		<Space
		android:layout_width="wrap_content"
		android:layout_height="0dp"

res/layout/udfps_enroll_find_sensor_layout.xml

+0 −25

Original line number	Diff line number	Diff line
		@@ -20,29 +20,4 @@
		style="?attr/fingerprint_layout_theme"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">

		<LinearLayout
		style="@style/SudContentFrame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:clipToPadding="false"
		android:clipChildren="false">

		<TextView
		style="@style/SudDescription.Glif"
		android:id="@+id/sud_layout_description"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/sud_description_glif_margin_top"
		android:text="@string/security_settings_udfps_enroll_find_sensor_message"/>
		</LinearLayout>
		</LinearLayout>
		</com.google.android.setupdesign.GlifLayout>

res/values/strings.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -945,10 +945,12 @@
		<string name="cancel_lock_screen_dialog_button_label">Cancel</string>
		<!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
		<string name="security_settings_fingerprint_enroll_find_sensor_title">Touch the sensor</string>
		<!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=60] -->
		<string name="security_settings_udfps_enroll_find_sensor_title">Touch & hold the fingerprint icon</string>
		<!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
		<string name="security_settings_fingerprint_enroll_find_sensor_message">It\u2019s on the back of your phone. Use your index finger.</string>
		<!-- Message shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=NONE]-->
		<string name="security_settings_udfps_enroll_find_sensor_message">It\u2019s on the screen. Look for the fingerprint with a glowing circle.</string>
		<string name="security_settings_udfps_enroll_find_sensor_message">The fingerprint sensor is on your screen. Move your finger across the screen to find it.</string>
		<!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
		<string name="security_settings_fingerprint_enroll_find_sensor_content_description">Illustration with device and fingerprint sensor location</string>
		<!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,13 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
		.build()
		);

		if (mCanAssumeUdfps) {
		setHeaderText(R.string.security_settings_udfps_enroll_find_sensor_title);
		setDescriptionText(R.string.security_settings_udfps_enroll_find_sensor_message);
		} else {
		setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
		setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message);
		}

		// This is an entry point for SetNewPasswordController, e.g.
		// adb shell am start -a android.app.action.SET_NEW_PASSWORD