diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-07-11 07:34:44 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-07-16 08:07:35 -0700 |
| commit | 89c7570dd42ce6945ce8e092892a22ec79c30c82 (patch) | |
| tree | 14e07f7f9782c4a5a4e3c845358450efe33178c1 /res/layout | |
| parent | 6f877156e0345dc6a70b513e38cd5a32a97783b9 (diff) | |
| download | packages_apps_Settings-89c7570dd42ce6945ce8e092892a22ec79c30c82.zip packages_apps_Settings-89c7570dd42ce6945ce8e092892a22ec79c30c82.tar.gz packages_apps_Settings-89c7570dd42ce6945ce8e092892a22ec79c30c82.tar.bz2 | |
Make crypt dialogs material
White on black material theme
Center text
Remove fade to black task
Fix emergency call button
Note - does not implement all requirements of frames in the defect. More
to follow.
Bug: 15328359
Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/crypt_keeper_password_entry.xml | 7 | ||||
| -rw-r--r-- | res/layout/crypt_keeper_password_field.xml | 1 | ||||
| -rw-r--r-- | res/layout/crypt_keeper_pattern_entry.xml | 3 | ||||
| -rw-r--r-- | res/layout/crypt_keeper_pin_entry.xml | 3 | ||||
| -rw-r--r-- | res/layout/crypt_keeper_pin_field.xml | 1 |
5 files changed, 7 insertions, 8 deletions
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml index b26f542..ecbfefd 100644 --- a/res/layout/crypt_keeper_password_entry.xml +++ b/res/layout/crypt_keeper_password_entry.xml @@ -33,17 +33,16 @@ > <include layout="@layout/crypt_keeper_password_field" /> </LinearLayout> - <!-- Emergency call button. - Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() --> + 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" android:layout_marginTop="16dip" - style="@*android:style/Widget.Button.Transparent" + style="?android:attr/borderlessButtonStyle" android:textSize="14sp" android:drawablePadding="6dip" - /> + /> </LinearLayout> diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml index 97afe6a..9a2a24d 100644 --- a/res/layout/crypt_keeper_password_field.xml +++ b/res/layout/crypt_keeper_password_field.xml @@ -28,6 +28,7 @@ android:inputType="textPassword" android:imeOptions="flagForceAscii|actionDone" android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_horizontal" /> <ImageView android:id="@+id/switch_ime_button" diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml index a59d36f..2538809 100644 --- a/res/layout/crypt_keeper_pattern_entry.xml +++ b/res/layout/crypt_keeper_pattern_entry.xml @@ -41,8 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="16dip" - style="@*android:style/Widget.Button.Transparent" - android:textSize="14sp" + style="?android:attr/borderlessButtonStyle" android:drawablePadding="6dip" /> diff --git a/res/layout/crypt_keeper_pin_entry.xml b/res/layout/crypt_keeper_pin_entry.xml index dfc5fb5..0f1f1e7 100644 --- a/res/layout/crypt_keeper_pin_entry.xml +++ b/res/layout/crypt_keeper_pin_entry.xml @@ -41,8 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="16dip" - style="@*android:style/Widget.Button.Transparent" - android:textSize="14sp" + style="?android:attr/borderlessButtonStyle" android:drawablePadding="6dip" /> diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml index 270b26b..dd9d233 100644 --- a/res/layout/crypt_keeper_pin_field.xml +++ b/res/layout/crypt_keeper_pin_field.xml @@ -28,6 +28,7 @@ android:inputType="numberPassword" android:imeOptions="flagForceAscii|actionDone" android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_horizontal" /> <ImageView android:id="@+id/switch_ime_button" |