diff options
author | Paul Lawrence <paullawrence@google.com> | 2014-08-11 14:05:33 -0700 |
---|---|---|
committer | Paul Lawrence <paullawrence@google.com> | 2014-08-11 15:00:00 -0700 |
commit | 4fd2e5f39836f0f6d5f3461eb6785a78f82b2350 (patch) | |
tree | 8d7bafc1a4a4529dd20dcc710f3afe2148cb0d53 | |
parent | d58f0bd64f1554a4c15b812bcd90fc52f00860b6 (diff) | |
download | packages_apps_Settings-4fd2e5f39836f0f6d5f3461eb6785a78f82b2350.zip packages_apps_Settings-4fd2e5f39836f0f6d5f3461eb6785a78f82b2350.tar.gz packages_apps_Settings-4fd2e5f39836f0f6d5f3461eb6785a78f82b2350.tar.bz2 |
Fix UI to mocks
Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
-rw-r--r-- | res/layout-sw600dp/crypt_keeper_pattern_entry.xml | 30 | ||||
-rw-r--r-- | res/layout/crypt_keeper_emergency_button.xml | 33 | ||||
-rw-r--r-- | res/layout/crypt_keeper_password_entry.xml | 33 | ||||
-rw-r--r-- | res/layout/crypt_keeper_pattern_entry.xml | 29 | ||||
-rw-r--r-- | res/layout/crypt_keeper_pin_entry.xml | 33 | ||||
-rw-r--r-- | res/layout/crypt_keeper_status.xml | 10 | ||||
-rwxr-xr-x | res/values-sw600dp-land/dimens.xml | 7 | ||||
-rwxr-xr-x | res/values-sw600dp/dimens.xml | 12 | ||||
-rwxr-xr-x | res/values/dimens.xml | 13 |
9 files changed, 111 insertions, 89 deletions
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml index 4685ebf..3937008 100644 --- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml +++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml @@ -18,26 +18,24 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin"> <include layout="@layout/crypt_keeper_status" /> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="0dip" - android:layout_weight="1" - android:layout_gravity="center_horizontal"> + <LinearLayout + android:layout_width="@dimen/crypt_keeper_pattern_size" + android:layout_height="@dimen/crypt_keeper_pattern_size" + android:orientation="horizontal" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/crypt_keeper_pattern_separator"> + + <include layout="@layout/crypt_keeper_pattern_field" /> + + </LinearLayout> - <!-- Password entry field --> - <LinearLayout - android:layout_height="@dimen/crypt_keeper_pattern_size" - android:layout_width="@dimen/crypt_keeper_pattern_size" - android:layout_centerVertical="true" - android:orientation="horizontal"> - <include layout="@layout/crypt_keeper_pattern_field" /> - </LinearLayout> + <include layout="@layout/crypt_keeper_emergency_button" /> - </RelativeLayout> </LinearLayout> diff --git a/res/layout/crypt_keeper_emergency_button.xml b/res/layout/crypt_keeper_emergency_button.xml new file mode 100644 index 0000000..d0004de --- /dev/null +++ b/res/layout/crypt_keeper_emergency_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 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. +*/ +--> + +<!-- Emergency call button. + Text is set by CryptKeeper.updateEmergencyCallButtonState() --> +<Button + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_gravity="center_horizontal" + android:textSize="14sp" + android:fontFamily="sans-serif" + android:textColor="#FFFFFF" + android:layout_weight="1" + android:gravity="bottom" + style="?android:attr/borderlessButtonStyle" /> diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml index 6e99527..a7fecba 100644 --- a/res/layout/crypt_keeper_password_entry.xml +++ b/res/layout/crypt_keeper_password_entry.xml @@ -20,36 +20,23 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginTop="@dimen/crypt_keeper_password_top_margin"> <include layout="@layout/crypt_keeper_status" /> <LinearLayout - android:layout_height="0dp" - android:layout_width="match_parent" - android:layout_weight="1" - android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin" - android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin" - android:orientation="vertical" - android:gravity="center_vertical"> + android:layout_width="@dimen/crypt_keeper_password_width" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginTop="16dip" + android:layout_gravity="center_horizontal" + android:background="@color/crypt_keeper_password_background"> - <LinearLayout - android:background="@color/crypt_keeper_password_background" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <include layout="@layout/crypt_keeper_password_field" /> - </LinearLayout> + <include layout="@layout/crypt_keeper_password_field" /> </LinearLayout> - <!-- Emergency call button. - Text is set by CryptKeeper.updateEmergencyCallButtonState() --> - <Button android:id="@+id/emergencyCallButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above" - style="?android:attr/borderlessButtonStyle" /> + <include layout="@layout/crypt_keeper_emergency_button" /> </LinearLayout> diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml index 80e318f..00d3d6e 100644 --- a/res/layout/crypt_keeper_pattern_entry.xml +++ b/res/layout/crypt_keeper_pattern_entry.xml @@ -20,35 +20,22 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin"> <include layout="@layout/crypt_keeper_status" /> <LinearLayout - android:layout_height="0dp" android:layout_width="match_parent" - android:layout_weight="1" - android:orientation="vertical" - android:gravity="center_vertical"> + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/crypt_keeper_pattern_margin" + android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin" + android:orientation="horizontal"> - <LinearLayout - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin" - android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin" - android:orientation="horizontal" > - <include layout="@layout/crypt_keeper_pattern_field" /> - </LinearLayout> + <include layout="@layout/crypt_keeper_pattern_field" /> </LinearLayout> - <!-- Emergency call button. - Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() --> - <Button android:id="@+id/emergencyCallButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above" - style="?android:attr/borderlessButtonStyle" /> + <include layout="@layout/crypt_keeper_emergency_button" /> </LinearLayout> diff --git a/res/layout/crypt_keeper_pin_entry.xml b/res/layout/crypt_keeper_pin_entry.xml index 0bcbec5..3926ab0 100644 --- a/res/layout/crypt_keeper_pin_entry.xml +++ b/res/layout/crypt_keeper_pin_entry.xml @@ -20,36 +20,23 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginTop="@dimen/crypt_keeper_password_top_margin"> <include layout="@layout/crypt_keeper_status" /> <LinearLayout - android:layout_height="0dp" - android:layout_width="match_parent" - android:layout_weight="1" - android:layout_marginStart="@dimen/crypt_keeper_edit_text_margin" - android:layout_marginEnd="@dimen/crypt_keeper_edit_text_margin" - android:orientation="vertical" - android:gravity="center_vertical"> + android:layout_width="@dimen/crypt_keeper_password_width" + android:layout_height="wrap_content" + android:layout_marginTop="16dip" + android:orientation="horizontal" + android:layout_gravity="center_horizontal" + android:background="@color/crypt_keeper_password_background"> - <LinearLayout - android:background="@color/crypt_keeper_password_background" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <include layout="@layout/crypt_keeper_pin_field" /> - </LinearLayout> + <include layout="@layout/crypt_keeper_pin_field" /> </LinearLayout> - <!-- Emergency call button. - Text is set by CryptKeeper.updateEmergencyCallButtonState() --> - <Button android:id="@+id/emergencyCallButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/crypt_keeper_emergency_call_space_above" - style="?android:attr/borderlessButtonStyle" /> + <include layout="@layout/crypt_keeper_emergency_button" /> </LinearLayout> diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index c366b57..bddff1a 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -31,11 +31,11 @@ android:id="@+id/status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="10dip" android:layout_marginStart="8dip" android:layout_marginEnd="8dip" - android:textSize="18sp" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="16sp" + android:fontFamily="sans-serif" + android:textColor="@android:color/white" android:text="@string/enter_password" android:layout_gravity="center_horizontal" android:gravity="center_horizontal" /> @@ -51,6 +51,8 @@ android:ellipsize="marquee" android:marqueeRepeatLimit ="marquee_forever" android:textSize="16sp" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:fontFamily="sans-serif" + android:textColor="#B3FFFFFF" + android:gravity="center_horizontal" /> </LinearLayout> diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index c0a79ad..eb37d0f 100755 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -20,4 +20,11 @@ <dimen name="screen_margin_bottom">48dip</dimen> <dimen name="appwidget_preview_height">80dip</dimen> <dimen name="keyguard_appwidget_picker_width">720dip</dimen> + + <!-- CryptKeeper top margin for password/pin screen --> + <dimen name="crypt_keeper_password_top_margin">116dip</dimen> + + <!-- CryptKeeper top margin for pattern screen --> + <dimen name="crypt_keeper_pattern_top_margin">128dip</dimen> + </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index e040167..e1bb33e 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -55,6 +55,18 @@ <dimen name="dashboard_tile_image_margin_start">8dp</dimen> <dimen name="dashboard_tile_image_margin_end">32dp</dimen> + <!-- CryptKeeper top margin for password/pin screen --> + <dimen name="crypt_keeper_password_top_margin">256dip</dimen> + + <!-- CryptKeeper top margin for pattern screen --> + <dimen name="crypt_keeper_pattern_top_margin">256dip</dimen> + + <!-- CryptKeeper separation between status and pattern --> + <dimen name="crypt_keeper_pattern_separator">100dip</dimen> + + <!-- CryptKeeper password/pin width --> + <dimen name="crypt_keeper_password_width">512dip</dimen> + <!-- SwitchBar margin start / end --> <dimen name="switchbar_margin_start">24dp</dimen> <dimen name="switchbar_margin_end">24dp</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cb87bf0..2b53f96 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -168,8 +168,14 @@ <dimen name="wifi_assistant_padding">25dp</dimen> <dimen name="wifi_assistant_text_padding">16dp</dimen> - <!-- CryptKeeper edit text margin --> - <dimen name="crypt_keeper_edit_text_margin">16dip</dimen> + <!-- CryptKeeper top margin for password/pin screen --> + <dimen name="crypt_keeper_password_top_margin">88dip</dimen> + + <!-- CryptKeeper top margin for pattern screen --> + <dimen name="crypt_keeper_pattern_top_margin">88dip</dimen> + + <!-- CryptKeeper password/pin width --> + <dimen name="crypt_keeper_password_width">280dip</dimen> <!-- CryptKeeper emergency call button dimensions --> <dimen name="crypt_keeper_emergency_call_space_above">16dip</dimen> @@ -177,6 +183,9 @@ <!-- CryptKeeper edit text ime icon padding --> <dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen> + <!-- CryptKeeper pattern margin on phone --> + <dimen name="crypt_keeper_pattern_margin">8dip</dimen> + <!-- CryptKeeper pattern size for tablet --> <dimen name="crypt_keeper_pattern_size">354dip</dimen> |