PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied Material Spec to Bluetooth pairing dialog.

Browse Source 
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
This commit is contained in:
PauloftheWest
2014-08-15 06:05:42 -07:00
parent 18fbf724aa
commit e49c30e533
5 changed files with 111 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
res/layout/bluetooth_pin_confirm.xml
View File

@@ -29,15 +29,61 @@
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.Body1"
android:textColor="@*android:color/secondary_text_material_light" />
<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" />
<TextView
android:id="@+id/pairing_caption"
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:gravity="center_vertical"
android:text="@string/bluetooth_pairing_key_msg"
android:visibility="gone"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="@*android:color/secondary_text_material_light" />
<TextView
android:id="@+id/pairing_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:visibility="gone"
android:textAppearance="@android:style/TextAppearance.Material.Headline" />
<TextView
android:id="@+id/pairing_code_message"
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:text="@string/bluetooth_enter_passkey_msg"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="@*android:color/secondary_text_material_light"
android:visibility="gone" />
</LinearLayout>

37
res/layout/bluetooth_pin_entry.xml
View File

@@ -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" />