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

BluetoothDialog view fixed for no pair code case

Browse Source 
BluetoothPairingDialog no longer asks for a
pair code when the user only needs to
confirm that they would like to connect
to a device. Also, the layout padding
was updated a bit to make it look nicer.

Test: RunSettingsRoboTests
Bug: 31340598
Change-Id: I9394fcd53dffcff9a17fbafabdce0e94ae88fba2
This commit is contained in:
Salvador Martinez
2016-09-30 13:59:30 -07:00
parent 9fc9f0f177
commit 4d279a56f5
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/bluetooth_pin_confirm.xml
View File

@@ -27,6 +27,7 @@
android:paddingStart="16dip" android:paddingStart="16dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="@dimen/bluetooth_dialog_padding_top"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

1
res/values/dimens.xml
View File

@@ -204,6 +204,7 @@
<!-- Bluetooth Preferences --> <!-- Bluetooth Preferences -->
<dimen name="bluetooth_dialog_padding">8dip</dimen> <dimen name="bluetooth_dialog_padding">8dip</dimen>
<dimen name="bluetooth_dialog_padding_top">20dp</dimen>
<integer name="bluetooth_name_length">32</integer> <integer name="bluetooth_name_length">32</integer>
<dimen name="bluetooth_pairing_padding">24dp</dimen> <dimen name="bluetooth_pairing_padding">24dp</dimen>
<dimen name="bluetooth_pairing_edittext_padding">21dp</dimen> <dimen name="bluetooth_pairing_edittext_padding">21dp</dimen>

2
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -309,6 +309,8 @@ public final class BluetoothPairingDialog extends AlertActivity implements
break; break;
case BluetoothDevice.PAIRING_VARIANT_CONSENT: case BluetoothDevice.PAIRING_VARIANT_CONSENT:
messagePairing.setVisibility(view.GONE);
break;
case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT: case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
messagePairing.setVisibility(View.VISIBLE); messagePairing.setVisibility(View.VISIBLE);
break; break;