148eb471bf
- Using the SUW library API to enable the new style - Removing some obsolete layouts which are using in landscape mode - Verifying that these pages are using the new style Fix: 188438375 Test: visual verified 1) Register a screen lock 2) Navigate to Settings > Security > Screen lock 2) See and check if the Pattern/PIN/Password confirmation page is using the new style Change-Id: I076dbf36388fa3badf4da409bcda83a5b368f13c
79 lines
3.2 KiB
XML
79 lines
3.2 KiB
XML
<?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:layout_marginTop="12dp"
|
|
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>
|