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

am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev

Browse Source 
* commit 'f6526146250ff68df0f8941fe0b91ae74d55ab8d':
  Removed an extraneous messge when pairing.
This commit is contained in:
PauloftheWest
2014-09-18 16:11:54 +00:00
committed by Android Git Automerger
parent 09c1ddc565 f652614625
commit 50a53bdbe3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/bluetooth_pin_confirm.xml
View File

@@ -24,6 +24,7 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingStart="16dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:orientation="vertical">

3
res/layout/bluetooth_pin_entry.xml
View File

@@ -84,7 +84,8 @@
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_dialog_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="@*android:color/secondary_text_material_light"/>
<TextView <TextView
android:id="@+id/phonebook_sharing_message" android:id="@+id/phonebook_sharing_message"

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

@@ -235,6 +235,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements
switch (mType) { switch (mType) {
case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY: case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY:
case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN: case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN:
messagePairing.setVisibility(View.VISIBLE);
case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION: case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION:
messageCaption = getString(R.string.bluetooth_enter_pin_msg); messageCaption = getString(R.string.bluetooth_enter_pin_msg);
pairingContent = mPairingKey; pairingContent = mPairingKey;
@@ -242,6 +243,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements
case BluetoothDevice.PAIRING_VARIANT_CONSENT: case BluetoothDevice.PAIRING_VARIANT_CONSENT:
case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT: case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
messagePairing.setVisibility(View.VISIBLE);
messageCaption = getString(R.string.bluetooth_enter_pin_msg); messageCaption = getString(R.string.bluetooth_enter_pin_msg);
break; break;
@@ -259,7 +261,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements
pairingViewCaption.setVisibility(View.VISIBLE); pairingViewCaption.setVisibility(View.VISIBLE);
pairingViewContent.setVisibility(View.VISIBLE); pairingViewContent.setVisibility(View.VISIBLE);
pairingViewContent.setText(pairingContent); pairingViewContent.setText(pairingContent);
messagePairing.setVisibility(View.VISIBLE);
} }
return view; return view;