diff options
Diffstat (limited to 'res/layout')
-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 |
5 files changed, 67 insertions, 71 deletions
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> |