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 /res/layout/crypt_keeper_pin_entry.xml | |
| 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
Diffstat (limited to 'res/layout/crypt_keeper_pin_entry.xml')
| -rw-r--r-- | res/layout/crypt_keeper_pin_entry.xml | 33 |
1 files changed, 10 insertions, 23 deletions
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> |