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

Merge "Display BT device even without legal name"

Browse Source
This commit is contained in:
Lei Yu
2019-01-03 22:14:50 +00:00
committed by Android (Google) Code Review
parent 656c300e94 7b2ca324d0
commit f1f0cd1f27
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
View File

@@ -52,8 +52,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
LocalBluetoothProfileManager.ServiceListener { LocalBluetoothProfileManager.ServiceListener {
private static final String TAG = "BluetoothDeviceUpdater"; private static final String TAG = "BluetoothDeviceUpdater";
private static final boolean DBG = true; private static final boolean DBG = true;
private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
"persist.bluetooth.showdeviceswithoutnames";
protected final DevicePreferenceCallback mDevicePreferenceCallback; protected final DevicePreferenceCallback mDevicePreferenceCallback;
protected final Map<BluetoothDevice, Preference> mPreferenceMap; protected final Map<BluetoothDevice, Preference> mPreferenceMap;
@@ -62,8 +60,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
@VisibleForTesting @VisibleForTesting
protected LocalBluetoothManager mLocalManager; protected LocalBluetoothManager mLocalManager;
private final boolean mShowDeviceWithoutNames;
@VisibleForTesting @VisibleForTesting
final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> { final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
launchDeviceDetails(pref); launchDeviceDetails(pref);
@@ -79,8 +75,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
DevicePreferenceCallback devicePreferenceCallback, LocalBluetoothManager localManager) { DevicePreferenceCallback devicePreferenceCallback, LocalBluetoothManager localManager) {
mFragment = fragment; mFragment = fragment;
mDevicePreferenceCallback = devicePreferenceCallback; mDevicePreferenceCallback = devicePreferenceCallback;
mShowDeviceWithoutNames = SystemProperties.getBoolean(
BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
mPreferenceMap = new HashMap<>(); mPreferenceMap = new HashMap<>();
mLocalManager = localManager; mLocalManager = localManager;
} }
@@ -223,7 +217,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
if (!mPreferenceMap.containsKey(device)) { if (!mPreferenceMap.containsKey(device)) {
BluetoothDevicePreference btPreference = BluetoothDevicePreference btPreference =
new BluetoothDevicePreference(mPrefContext, cachedDevice, new BluetoothDevicePreference(mPrefContext, cachedDevice,
mShowDeviceWithoutNames); true /* showDeviceWithoutNames */);
btPreference.setOnGearClickListener(mDeviceProfilesListener); btPreference.setOnGearClickListener(mDeviceProfilesListener);
if (this instanceof Preference.OnPreferenceClickListener) { if (this instanceof Preference.OnPreferenceClickListener) {
btPreference.setOnPreferenceClickListener( btPreference.setOnPreferenceClickListener(