From 98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Thu, 12 Nov 2015 14:55:51 -0800 Subject: [PATCH] Uncheck checkbox for contact sharing by default for non carkit devices. + In BT pairing dialog, uncheck checkbox for contact sharing by default for devices not recognized as carkits at pair time. Bug: 23607427 Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76 (cherry picked from commit dbc47fb262a4273417d99dabab757854aa3b0eaf) --- .../bluetooth/BluetoothPairingDialog.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index 7fa31b3f04a..1ff99f787a3 100755 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -195,8 +195,14 @@ public final class BluetoothPairingDialog extends AlertActivity implements } else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){ contactSharing.setChecked(false); } else { - contactSharing.setChecked(true); - mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); + if (mDevice.getBluetoothClass().getDeviceClass() + == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { + contactSharing.setChecked(true); + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); + } else { + contactSharing.setChecked(false); + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); + } } contactSharing.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @@ -209,12 +215,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements } } }); - if (mDevice.getBluetoothClass().getDeviceClass() - == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { - contactSharing.setVisibility(View.VISIBLE); - } else { - contactSharing.setVisibility(View.GONE); - } + mPairingView = (EditText) view.findViewById(R.id.text); mPairingView.addTextChangedListener(this); alphanumericPin.setOnCheckedChangeListener(this); @@ -267,8 +268,14 @@ public final class BluetoothPairingDialog extends AlertActivity implements } else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){ contactSharing.setChecked(false); } else { - contactSharing.setChecked(true); - mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); + if (mDevice.getBluetoothClass().getDeviceClass() + == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { + contactSharing.setChecked(true); + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED); + } else { + contactSharing.setChecked(false); + mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED); + } } contactSharing.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @@ -281,12 +288,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements } } }); - if (mDevice.getBluetoothClass().getDeviceClass() - == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { - contactSharing.setVisibility(View.VISIBLE); - } else { - contactSharing.setVisibility(View.GONE); - } String messageCaption = null; String pairingContent = null;