07b149ec51
Root cause: - The new added description TextView is too large - sud_layout_description was add in sud_layout_content instead of sud_layout_header. Solution: - Set string lockpassword_choose_your_pattern_description to GlifLayout as it's description.(Header description) Bug: 233666752 Fixes 239892091 Test: manual in setup flow, check choose lock pattern layouts showing expectedly on both phone & tablet Test: make RunSettingsRoboTests Change-Id: Iabe503066434f8983dffb88d1c93f2bbf773b860
83 lines
3.3 KiB
XML
83 lines
3.3 KiB
XML
<?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: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_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="50dip"
|
|
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>
|