Merge "2/ Define pattern view size by UX deck" (60a724fe) · Commits · e / os / android_packages_apps_Settings

res/layout-land/choose_lock_pattern_common.xml

0 → 100644

+81 −0

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

		<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
		<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:icon="@drawable/ic_lock">

		<!-- takes up all space above button bar at bottom -->
		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		style="@style/SudContentFrame"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical"
		android:paddingLeft="0dp"
		android:paddingRight="0dp">

		<TextView
		android:id="@+id/headerText"
		style="@style/SudDescription.Glif"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minLines="2"
		android:gravity="center"
		android:paddingStart="?attr/sudMarginStart"
		android:paddingEnd="?attr/sudMarginEnd"
		android:fontFamily="@*android:string/config_headlineFontFamily" />

		<com.google.android.setupdesign.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"/>

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

		<TextView android:id="@+id/footerText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:minHeight="24dp"
		android:textSize="14sp"
		android:visibility="gone"/>

		<Button
		android:id="@+id/screen_lock_options"
		style="@style/SudGlifButton.Tertiary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/setup_lock_settings_options_button_label"
		android:visibility="gone"/>
		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

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

res/layout-land/confirm_lock_pattern_base.xml

0 → 100644

+95 −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.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:icon="@drawable/ic_enterprise">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:paddingBottom="24dp">

		<Button
		android:id="@+id/cancelButton"
		style="@style/SudGlifButton.Secondary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_marginBottom="80dp"
		android:text="@string/cancel" />

		<Button
		android:id="@+id/forgotButton"
		style="@style/SudGlifButton.Secondary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_gravity="center"
		android:visibility="gone" />

		</LinearLayout>

		<LinearLayout
		style="@style/SudContentFrame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:gravity="center"
		android:paddingLeft="0dp"
		android:paddingRight="0dp">

		<com.google.android.setupdesign.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center" />

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

		<TextView
		style="@style/TextAppearance.ErrorText"
		android:accessibilityLiveRegion="polite"
		android:id="@+id/errorText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:paddingStart="?attr/sudMarginStart"
		android:paddingEnd="?attr/sudMarginEnd"
		android:layout_marginTop="12dp"
		android:gravity="center_vertical"/>

		</LinearLayout>

		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
		</com.google.android.setupdesign.GlifLayout>

res/layout-land/confirm_lock_pattern_normal_base.xml

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2017 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:icon="@drawable/ic_lock">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<LinearLayout
		style="@style/SudContentFrame"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:gravity="center"
		android:paddingLeft="0dp"
		android:paddingRight="0dp">

		<com.google.android.setupdesign.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center" />

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

		<TextView
		style="@style/TextAppearance.ErrorText"
		android:accessibilityLiveRegion="polite"
		android:id="@+id/errorText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:gravity="center_vertical"/>

		<Button
		android:id="@+id/cancelButton"
		style="@style/SudGlifButton.Secondary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:layout_marginBottom="80dp"
		android:text="@string/cancel" />

		</LinearLayout>

		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

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

res/layout/choose_lock_pattern_common.xml

+3 −4

Original line number	Diff line number	Diff line
		@@ -51,13 +51,12 @@
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:minHeight="@dimen/choose_lockscreen_min_height"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_width="@dimen/biometric_auth_pattern_view_size"
		android:layout_height="@dimen/biometric_auth_pattern_view_size"
		android:layout_gravity="center"/>

		</com.google.android.setupdesign.view.FillContentLayout>
		@@ -66,7 +65,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:minHeight="50dip"
		android:minHeight="24dp"
		android:textSize="14sp"
		android:visibility="gone"/>

res/layout/confirm_lock_pattern_base.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -67,13 +67,12 @@
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:minHeight="@dimen/choose_lockscreen_min_height"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_width="@dimen/biometric_auth_pattern_view_size"
		android:layout_height="@dimen/biometric_auth_pattern_view_size"
		android:layout_gravity="center" />

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