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

[ConnectedDevicePage] Clean up flag enable_saved_devices_order_by_recency

Browse Source 
Test: atest PreviouslyConnectedDevicePreferenceControllerTest SavedDeviceGroupControllerTest
Bug: 340145121
Change-Id: I2fd6d506b343332edceb0235c1e36345d74cbf55
This commit is contained in:
Ze Li
2024-05-13 17:38:39 +08:00
parent b63ed17b94
commit 9d696fe4d8
5 changed files with 37 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
View File

@@ -37,7 +37,6 @@ import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -86,11 +85,7 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
mSavedDockUpdater = FeatureFactory.getFeatureFactory().getDockUpdaterFeatureProvider()
.getSavedDockUpdater(context, this);
mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
if (Flags.enableSavedDevicesOrderByRecency()) {
mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
} else {
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}
mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
}
@Override
@@ -123,9 +118,7 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
mBluetoothDeviceUpdater.refreshPreference();
if (Flags.enableSavedDevicesOrderByRecency()) {
updatePreferenceGroup();
}
updatePreferenceGroup();
}
@Override
@@ -143,37 +136,17 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
@Override
public void onDeviceAdded(Preference preference) {
if (Flags.enableSavedDevicesOrderByRecency()) {
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.put(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
mDockDevicesList.add(preference);
}
if (DEBUG) {
Log.d(TAG, "onDeviceAdded() " + preference.getTitle());
}
updatePreferenceGroup();
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.put(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
final List<BluetoothDevice> bluetoothDevices =
mBluetoothAdapter.getMostRecentlyConnectedDevices();
final int index =
preference instanceof BluetoothDevicePreference
? bluetoothDevices.indexOf(
((BluetoothDevicePreference) preference)
.getBluetoothDevice()
.getDevice())
: DOCK_DEVICE_INDEX;
if (DEBUG) {
Log.d(TAG, "onDeviceAdded() " + preference.getTitle() + ", index of : " + index);
for (BluetoothDevice device : bluetoothDevices) {
Log.d(TAG, "onDeviceAdded() most recently device : " + device.getName());
}
}
addPreference(index, preference);
updatePreferenceVisibility();
mDockDevicesList.add(preference);
}
if (DEBUG) {
Log.d(TAG, "onDeviceAdded() " + preference.getTitle());
}
updatePreferenceGroup();
}
private void addPreference(int index, Preference preference) {
@@ -224,28 +197,17 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
@Override
public void onDeviceRemoved(Preference preference) {
if (Flags.enableSavedDevicesOrderByRecency()) {
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.remove(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
mDockDevicesList.remove(preference);
}
if (DEBUG) {
Log.d(TAG, "onDeviceRemoved() " + preference.getTitle());
}
updatePreferenceGroup();
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.remove(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
if (preference instanceof BluetoothDevicePreference) {
mDevicesList.remove(preference);
} else {
mDockDevicesList.remove(preference);
}
addPreference();
updatePreferenceVisibility();
mDockDevicesList.remove(preference);
}
if (DEBUG) {
Log.d(TAG, "onDeviceRemoved() " + preference.getTitle());
}
updatePreferenceGroup();
}
/** Sort the preferenceGroup by most recently used. */