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

Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2015-07-28 19:50:47 +00:00
committed by Android (Google) Code Review
parent 4d9f5c91ae 9b456e5f9d
commit 74af384cae
8 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -61,7 +61,10 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent"> android:layout_height="match_parent">
<include layout="@layout/fingerprint_enroll_enrolling_content"/> <include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView <TextView
style="@style/TextAppearance.FingerprintErrorText" style="@style/TextAppearance.FingerprintErrorText"

4
res/layout-land/fingerprint_enroll_finish.xml
View File

@@ -79,8 +79,8 @@
<ImageView <ImageView
android:id="@+id/fingerprint_in_app_indicator" android:id="@+id/fingerprint_in_app_indicator"
android:layout_width="120dp" android:layout_width="@dimen/fingerprint_in_app_indicator_size"
android:layout_height="120dp" android:layout_height="@dimen/fingerprint_in_app_indicator_size"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:contentDescription="@android:string/fingerprint_icon_content_description" android:contentDescription="@android:string/fingerprint_icon_content_description"
android:src="@drawable/fp_app_indicator" /> android:src="@drawable/fp_app_indicator" />

4
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -57,8 +57,8 @@
<include layout="@layout/fingerprint_enroll_enrolling_content" <include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="36dp" android:layout_gravity="center_horizontal"
android:layout_gravity="center_horizontal"/> android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/>
<TextView <TextView
style="@style/TextAppearance.FingerprintErrorText" style="@style/TextAppearance.FingerprintErrorText"

9
res/layout/fingerprint_enroll_enrolling_content.xml
View File

@@ -19,13 +19,12 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:layout_gravity="center_horizontal"> android:layout_gravity="center_horizontal">
<ImageView <ImageView
android:id="@+id/fingerprint_animator" android:id="@+id/fingerprint_animator"
android:layout_width="88dp" android:layout_width="@dimen/fingerprint_animation_size"
android:layout_height="88dp" android:layout_height="@dimen/fingerprint_animation_size"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:background="@drawable/fp_illustration_enrollment" android:background="@drawable/fp_illustration_enrollment"
android:backgroundTint="@color/fingerprint_indicator_background_resting" android:backgroundTint="@color/fingerprint_indicator_background_resting"
@@ -33,8 +32,8 @@
<ProgressBar <ProgressBar
android:id="@+id/fingerprint_progress_bar" android:id="@+id/fingerprint_progress_bar"
android:layout_width="192dp" android:layout_width="@dimen/fingerprint_progress_bar_size"
android:layout_height="192dp" android:layout_height="@dimen/fingerprint_progress_bar_size"
android:layout_centerInParent="true" android:layout_centerInParent="true"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:max="10000" android:max="10000"

6
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -37,9 +37,13 @@
android:layout_marginTop="@dimen/suw_description_margin_top" android:layout_marginTop="@dimen/suw_description_margin_top"
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/> android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
<View
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_weight="1"/>
<include <include
layout="@layout/fingerprint_enroll_find_sensor_graphic" layout="@layout/fingerprint_enroll_find_sensor_graphic"
android:layout_marginTop="32dp"
android:layout_width="@dimen/fingerprint_find_sensor_graphic_size" android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
android:layout_height="@dimen/fingerprint_find_sensor_graphic_size" android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
android:layout_gravity="center_horizontal"/> android:layout_gravity="center_horizontal"/>

10
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -37,11 +37,15 @@
android:layout_marginTop="@dimen/suw_description_margin_top" android:layout_marginTop="@dimen/suw_description_margin_top"
android:text="@string/security_settings_fingerprint_enroll_finish_message"/> android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
<View
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/fingerprint_in_app_indicator" android:id="@+id/fingerprint_in_app_indicator"
android:layout_width="120dp" android:layout_width="@dimen/fingerprint_in_app_indicator_size"
android:layout_height="120dp" android:layout_height="@dimen/fingerprint_in_app_indicator_size"
android:layout_marginTop="56dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:contentDescription="@android:string/fingerprint_icon_content_description" android:contentDescription="@android:string/fingerprint_icon_content_description"
android:src="@drawable/fp_app_indicator" /> android:src="@drawable/fp_app_indicator" />

24
res/values-sw400dp/dimens.xml Executable file
View File

@@ -0,0 +1,24 @@
<?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
-->
<resources>
<dimen name="fingerprint_ring_radius">106dp</dimen>
<dimen name="fingerprint_animation_size">100dp</dimen>
<dimen name="fingerprint_progress_bar_size">220dp</dimen>
<dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen>
<dimen name="fingerprint_in_app_indicator_size">176dp</dimen>
</resources>

4
res/values/dimens.xml
View File

@@ -233,6 +233,10 @@
<dimen name="fingerprint_decor_padding_top">0dp</dimen> <dimen name="fingerprint_decor_padding_top">0dp</dimen>
<dimen name="fingerprint_error_text_appear_distance">16dp</dimen> <dimen name="fingerprint_error_text_appear_distance">16dp</dimen>
<dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen> <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen>
<dimen name="fingerprint_animation_size">88dp</dimen>
<dimen name="fingerprint_progress_bar_size">192dp</dimen>
<dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen>
<dimen name="fingerprint_in_app_indicator_size">120dp</dimen>
<dimen name="confirm_credentials_security_method_margin">48dp</dimen> <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
<dimen name="fab_size">56dp</dimen> <dimen name="fab_size">56dp</dimen>