PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make lock pattern more usable on small screens"

Browse Source
This commit is contained in:
Maurice Lam
2017-05-16 02:08:52 +00:00
committed by Android (Google) Code Review
parent 5a44fe4dad 4853cce971
commit 470503e984
4 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
res/layout/choose_lock_pattern_common.xml
View File

@@ -22,6 +22,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:icon="@drawable/ic_lock" android:icon="@drawable/ic_lock"
android:layout="@layout/suw_glif_blank_template"
settings:suwFooter="@layout/choose_lock_pattern_common_footer" settings:suwFooter="@layout/choose_lock_pattern_common_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_pattern_header"> settings:suwHeaderText="@string/lockpassword_choose_your_pattern_header">
@@ -34,6 +35,26 @@
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/suw_layout_icon"
style="@style/LockPatternIconStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_lock" />
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<!-- takes up all space above button bar at bottom --> <!-- takes up all space above button bar at bottom -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -47,7 +68,6 @@
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:minLines="2" android:minLines="2"
android:gravity="center" android:gravity="center"
android:textSize="18sp" /> android:textSize="18sp" />
@@ -55,7 +75,7 @@
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="4" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>

102
res/layout/confirm_lock_pattern_internal_base.xml
View File

@@ -27,77 +27,61 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<ScrollView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="2"> android:orientation="vertical">
<LinearLayout <ImageView
android:id="@+id/suw_layout_icon"
style="@style/LockPatternIconStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_lock" />
<TextView
android:id="@+id/headerText"
style="@style/SuwGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content" />
android:orientation="vertical">
<ImageView <TextView
android:id="@+id/suw_layout_icon" style="@style/SuwDescription.Glif"
style="@style/SuwGlifIcon" android:id="@+id/detailsText"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_lock" /> android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides" />
<TextView </LinearLayout>
android:id="@+id/headerText"
style="@style/SuwGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/SuwDescription.Glif"
android:id="@+id/detailsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides" />
</LinearLayout>
</ScrollView>
<com.android.internal.widget.LockPatternView <com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern" android:id="@+id/lockPattern"
android:layout_width="312dp"
android:layout_height="0dp"
android:layout_weight="3"
android:layout_gravity="center_horizontal"/>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="4"
android:orientation="vertical"> android:layout_gravity="center_horizontal"/>
<TextView <TextView
style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText" style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
android:accessibilityLiveRegion="polite" android:accessibilityLiveRegion="polite"
android:id="@+id/errorText" android:id="@+id/errorText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_gravity="center_horizontal"
android:layout_gravity="center_horizontal" android:layout_marginTop="12dp"
android:layout_marginTop="12dp" android:layout_marginStart="12dp"
android:layout_marginStart="12dp" android:layout_marginEnd="12dp"
android:layout_marginEnd="12dp" android:gravity="center_vertical"/>
android:gravity="center_vertical"/>
<ImageView <ImageView
android:id="@+id/fingerprintIcon" android:id="@+id/fingerprintIcon"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_marginBottom="24dp"
android:layout_marginBottom="24dp" android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:contentDescription="@string/confirm_fingerprint_icon_content_description" android:visibility="gone"/>
android:visibility="gone"/>
</LinearLayout>
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"

23
res/values-sw400dp/styles.xml Executable file
View File

@@ -0,0 +1,23 @@
<?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.
-->
<resources>
<!-- Unhide the icon on bigger screens -->
<style name="LockPatternIconStyle" parent="SuwGlifIcon" />
</resources>

5
res/values/styles.xml
View File

@@ -449,4 +449,9 @@
<item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item> <item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
</style> </style>
<!-- Overridden in sw400dp -->
<style name="LockPatternIconStyle" parent="SuwGlifIcon">
<item name="android:visibility">gone</item>
</style>
</resources> </resources>