Fixes alignment for fingerprint animation during setup. (823cddc0) · Commits · e / os / android_packages_apps_Settings

res/layout-land/setup_fingerprint_enroll_find_sensor.xml

0 → 100644

+73 −0

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.android.setupwizardlib.SetupWizardLayout
		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"
		style="?attr/fingerprint_layout_theme">

		<LinearLayout
		style="@style/SuwContentFrame"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:clipToPadding="false"
		android:clipChildren="false"
		android:paddingBottom="0dp">

		<LinearLayout
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:orientation="vertical">

		<TextView
		style="@style/TextAppearance.FingerprintMessage"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>

		<Button
		style="@style/Button.FingerprintButton"
		android:id="@+id/next_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:layout_marginStart="-12dp"
		android:gravity="start\|center_vertical"
		android:text="@string/fingerprint_enroll_button_next" />
		</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.android.setupwizardlib.SetupWizardLayout>

res/layout/setup_fingerprint_enroll_find_sensor_base.xml

0 → 100644

+71 −0

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.android.setupwizardlib.SetupWizardLayout
		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"
		style="?attr/fingerprint_layout_theme">

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

		<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_horizontal\|bottom"/>

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

		<TextView
		style="@style/TextAppearance.FingerprintMessage"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/suw_description_margin_top"
		android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>

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

		<Button
		style="@style/Button.FingerprintButton"
		android:id="@+id/next_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginBottom="4dp"
		android:layout_marginEnd="-12dp"
		android:layout_gravity="end"
		android:gravity="end\|center_vertical"
		android:text="@string/fingerprint_enroll_button_next" />

		</LinearLayout>
		</FrameLayout>
		</com.android.setupwizardlib.SetupWizardLayout>

res/values-sw600dp/aliases.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,5 +20,6 @@
		<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
		<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
		<item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
		<item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
		</resources>

res/values/aliases.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,5 +22,6 @@
		<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
		<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
		<item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>
		<item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
		</resources>

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.fingerprint_enroll_find_sensor);
		setContentView(getContentView());
		setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
		if (savedInstanceState != null) {
		mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
		@@ -58,6 +58,10 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
		R.id.fingerprint_sensor_location_animation);
		}

		protected int getContentView() {
		return R.layout.fingerprint_enroll_find_sensor;
		}

		@Override
		protected void onStart() {
		super.onStart();