diff options
| author | PauloftheWest <paulofthewest@google.com> | 2014-08-15 06:05:42 -0700 |
|---|---|---|
| committer | PauloftheWest <paulofthewest@google.com> | 2014-08-27 13:17:51 -0700 |
| commit | e49c30e533be90280b4a6e9cb0065adb1b43b104 (patch) | |
| tree | 0132a1bc6c6e61d994e5c84fcc7d94eca71abb3c /res/layout/bluetooth_pin_entry.xml | |
| parent | 18fbf724aac345418eba37c656b968f19acd15f7 (diff) | |
| download | packages_apps_Settings-e49c30e533be90280b4a6e9cb0065adb1b43b104.tar.gz packages_apps_Settings-e49c30e533be90280b4a6e9cb0065adb1b43b104.tar.bz2 packages_apps_Settings-e49c30e533be90280b4a6e9cb0065adb1b43b104.zip | |
Applied Material Spec to Bluetooth pairing dialog.
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
Diffstat (limited to 'res/layout/bluetooth_pin_entry.xml')
| -rw-r--r-- | res/layout/bluetooth_pin_entry.xml | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml index 44d9dde71..caca4fb50 100644 --- a/res/layout/bluetooth_pin_entry.xml +++ b/res/layout/bluetooth_pin_entry.xml @@ -29,22 +29,31 @@ android:orientation="vertical"> <TextView - android:id="@+id/message" + android:id="@+id/message_caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dip" - android:layout_marginEnd="20dip" - android:layout_marginTop="20dip" - android:layout_marginBottom="20dip" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" + android:layout_marginTop="@dimen/bluetooth_dialog_padding" android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:textAppearance="@android:style/TextAppearance.Material.Caption" /> + + <TextView + android:id="@+id/message_subhead" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" + android:layout_marginBottom="@dimen/bluetooth_dialog_padding" + android:gravity="center_vertical" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> <EditText android:id="@+id/text" android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_marginStart="20dip" - android:layout_marginEnd="20dip" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:inputType="textPassword" android:singleLine="true" /> @@ -53,8 +62,8 @@ android:text="@string/bluetooth_pin_values_hint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dip" - android:layout_marginEnd="20dip" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -63,8 +72,8 @@ android:text="@string/bluetooth_enable_alphanumeric_pin" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dip" - android:layout_marginEnd="20dip" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:gravity="center" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -72,8 +81,8 @@ android:id="@+id/message_below_pin" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dip" - android:layout_marginEnd="20dip" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" /> |