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

Merge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev

Browse Source 
am: 391f67e484

Change-Id: Id1f72339ea39ce4d734f9cc869c5c2c2a4ee233d
This commit is contained in:
Daniel Nishi
2016-07-20 23:57:46 +00:00
committed by android-build-merger
parent 4a8695ed1e 391f67e484
commit b0bb093519
2 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
res/layout/bluetooth_pin_entry.xml
View File

@@ -28,32 +28,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView
android:id="@+id/message_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:layout_marginTop="@dimen/bluetooth_dialog_padding"
android:gravity="center_vertical"
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 <EditText
android:id="@+id/text" android:id="@+id/text"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_pairing_edittext_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_pairing_padding"
android:layout_marginTop="11dp"
android:minHeight="48dp"
android:inputType="textPassword" android:inputType="textPassword"
android:singleLine="true" /> android:singleLine="true" />
@@ -62,8 +44,9 @@
android:text="@string/bluetooth_pin_values_hint" android:text="@string/bluetooth_pin_values_hint"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_pairing_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_pairing_padding"
android:layout_marginBottom="6dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -72,30 +55,37 @@
android:text="@string/bluetooth_enable_alphanumeric_pin" android:text="@string/bluetooth_enable_alphanumeric_pin"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_pairing_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_pairing_padding"
android:layout_marginBottom="16dp"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:paddingStart="@dimen/bluetooth_checkbox_padding"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"/>
<TextView <TextView
android:id="@+id/message_below_pin" android:id="@+id/message_below_pin"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_pairing_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_pairing_padding"
android:layout_marginBottom="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="@*android:color/secondary_text_material_light"/> android:textColor="?android:attr/textColorSecondary"/>
<CheckBox <CheckBox
android:id="@+id/phonebook_sharing_message_entry_pin" android:id="@+id/phonebook_sharing_message_entry_pin"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_pairing_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_pairing_padding"
android:layout_marginBottom="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="@dimen/bluetooth_checkbox_padding"
android:text="@string/bluetooth_pairing_shares_phonebook" android:text="@string/bluetooth_pairing_shares_phonebook"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout> </LinearLayout>

4
res/values/dimens.xml
View File

@@ -201,7 +201,9 @@
<!-- Bluetooth Preferences --> <!-- Bluetooth Preferences -->
<dimen name="bluetooth_dialog_padding">8dip</dimen> <dimen name="bluetooth_dialog_padding">8dip</dimen>
<integer name="bluetooth_name_length">32</integer> <integer name="bluetooth_name_length">32</integer>
<dimen name="bluetooth_pairing_padding">20dp</dimen> <dimen name="bluetooth_pairing_padding">24dp</dimen>
<dimen name="bluetooth_pairing_edittext_padding">21dp</dimen>
<dimen name="bluetooth_checkbox_padding">16dp</dimen>
<!-- WiFi Preferences --> <!-- WiFi Preferences -->
<dimen name="wifi_divider_height">1px</dimen> <dimen name="wifi_divider_height">1px</dimen>