Alexey Polyudov f689441eed fix the build breakage caused by merge resolution ...

commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit 8c041f7862)

2017-02-02 21:58:36 +00:00

..

BluetoothDevicePreference.java

Make headset icons consistent before / after pairing

2017-01-23 17:25:27 +00:00

BluetoothDiscoverableEnabler.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

BluetoothEnabler.java

Handle return value when Bluetooth is enabled

2016-05-19 18:27:03 +00:00

BluetoothNameDialogFragment.java

Bluetooth: Fix to avoid taking space as name upon orientation

2015-06-25 02:08:38 +00:00

BluetoothPairingDialog.java

Fix Bluetooth pairing dialogue crash

2017-01-19 22:39:17 +00:00

BluetoothPairingRequest.java

Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp

2015-10-20 23:14:42 +00:00

BluetoothPermissionActivity.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

BluetoothPermissionRequest.java

Always show pairing dialog for device-specific keyboard.

2015-09-17 15:23:46 +01:00

BluetoothProgressCategory.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

BluetoothSettings.java

Fix multiple bluetooth devices bug

2016-07-25 10:37:39 -04:00

DeviceListPreferenceFragment.java

Disable animations for bluetooth.

2016-04-12 14:45:41 -04:00

DevicePickerActivity.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

DevicePickerFragment.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

DeviceProfilesSettings.java

Connect button click handler for bluetooth forget dialog.

2016-09-27 22:45:58 +00:00

DockEventReceiver.java

display audio dialog when connecting low end dock

2012-10-30 10:41:46 -07:00

DockService.java

Bluetooth: remove BluetoothDiscoveryReceiver

2017-01-26 15:38:05 -08:00

LocalBluetoothPreferences.java

fix the build breakage caused by merge resolution

2017-02-02 21:58:36 +00:00

RequestPermissionActivity.java

DO NOT MERGE Add Bluetooth toggle prompts - settings

2016-12-12 09:44:39 -08:00

RequestPermissionHelperActivity.java

DO NOT MERGE Add Bluetooth toggle prompts - settings

2016-12-12 09:44:39 -08:00

Utf8ByteLengthFilter.java

Refactor Bluetooth settings for readability and performance.

2011-03-01 18:44:36 -08:00

Utils.java

Move isolatable bluetooth code to SettingsLib

2015-02-05 10:43:57 -05:00