Alexey Polyudov 8c041f7862 fix the build breakage cuased by merge resolution ...

commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>

2017-02-02 12:59:50 -08:00

..

BluetoothDevicePreference.java

Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4 am: 60eb5503e8

2017-01-25 16:16:12 +00:00

BluetoothDiscoverableEnabler.java

Depend on support lib preferences

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

BluetoothEnabler.java

Update Network & internet->Wi-Fi to use MasterSwitchPreference.

2017-01-25 10:43:01 -08:00

BluetoothMasterSwitchPreferenceController.java

Update Network & internet->Wi-Fi to use MasterSwitchPreference.

2017-01-25 10:43:01 -08:00

BluetoothNameDialogFragment.java

Update package names to work with the proto3 compiler

2016-11-08 14:06:17 +00:00

BluetoothPairingController.java

Robotests for BluetoothPairingDialog

2016-10-25 17:18:53 -07:00

BluetoothPairingDialog.java

Fix Bluetooth pairing dialogue crash

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

BluetoothPairingDialogFragment.java

Update package names to work with the proto3 compiler

2016-11-08 14:06: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

Use same fallback bt name in Settings and notification.

2016-08-08 14:48:24 -07:00

BluetoothPermissionRequest.java

Eliminate useless 'isManagedProfile' utils method

2016-09-12 16:25:28 +09:00

BluetoothProgressCategory.java

Left align preferences and graphs to leave space for icon.

2016-12-19 13:41:37 -08:00

BluetoothSettings.java

Update Network & internet->Wi-Fi to use MasterSwitchPreference.

2017-01-25 10:43:01 -08:00

BluetoothSummaryUpdater.java

Update Network & internet->Wi-Fi to use MasterSwitchPreference.

2017-01-25 10:43:01 -08:00

DeviceListPreferenceFragment.java

Changes event handling phases for DeviceListPreferenceFragment.

2016-10-13 11:22:54 -07:00

DevicePickerActivity.java

Depend on support lib preferences

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

DevicePickerFragment.java

Update package names to work with the proto3 compiler

2016-11-08 14:06:17 +00:00

DeviceProfilesSettings.java

Update package names to work with the proto3 compiler

2016-11-08 14:06:17 +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 cuased by merge resolution

2017-02-02 12:59:50 -08:00

RequestPermissionActivity.java

DO NOT MERGE Add Bluetooth toggle prompts - settings

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

RequestPermissionHelperActivity.java

RequestPermissionHelperActivity: policy transparency for BT disallowed

2017-01-26 15:44:55 +01:00

Utf8ByteLengthFilter.java

Refactor Bluetooth settings for readability and performance.

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

Utils.java

Use same fallback bt name in Settings and notification.

2016-08-08 14:48:24 -07:00