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

47
src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
View File

@@ -33,7 +33,6 @@ import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.DockUpdaterFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -79,9 +78,7 @@ public class SavedDeviceGroupController extends BasePreferenceController
mBluetoothDeviceUpdater.registerCallback();
mSavedDockUpdater.registerCallback();
mBluetoothDeviceUpdater.refreshPreference();
if (Flags.enableSavedDevicesOrderByRecency()) {
updatePreferenceGroup();
}
updatePreferenceGroup();
}
@Override
@@ -119,42 +116,28 @@ public class SavedDeviceGroupController extends BasePreferenceController
@Override
public void onDeviceAdded(Preference preference) {
if (Flags.enableSavedDevicesOrderByRecency()) {
mPreferenceGroup.addPreference(preference);
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.put(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
mDockDevicesList.add(preference);
}
updatePreferenceGroup();
mPreferenceGroup.addPreference(preference);
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.put(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
if (mPreferenceGroup.getPreferenceCount() == 0) {
mPreferenceGroup.setVisible(true);
}
mPreferenceGroup.addPreference(preference);
mDockDevicesList.add(preference);
}
updatePreferenceGroup();
}
@Override
public void onDeviceRemoved(Preference preference) {
if (Flags.enableSavedDevicesOrderByRecency()) {
mPreferenceGroup.removePreference(preference);
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.remove(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
mDockDevicesList.remove(preference);
}
updatePreferenceGroup();
mPreferenceGroup.removePreference(preference);
if (preference instanceof BluetoothDevicePreference) {
mDevicePreferenceMap.remove(
((BluetoothDevicePreference) preference).getBluetoothDevice().getDevice(),
preference);
} else {
mPreferenceGroup.removePreference(preference);
if (mPreferenceGroup.getPreferenceCount() == 0) {
mPreferenceGroup.setVisible(false);
}
mDockDevicesList.remove(preference);
}
updatePreferenceGroup();
}
/** Sort the preferenceGroup by most recently used. */