Don't show footer for headset when bonding loss

Test: local tested
Flag: EXEMPT minor fix
Bug: 380801155
Change-Id: I5bb1bbcb08723a5ac5c8b82d2428df7a7f3e275d
This commit is contained in:
Haijie Hong
2025-03-21 16:14:50 +08:00
parent 5540cd1606
commit 026d698a91

View File

@@ -60,6 +60,8 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -417,13 +419,17 @@ public class BluetoothDeviceDetailsFragment extends BluetoothDetailsConfigurable
@Nullable @Nullable
private List<String> generateDisplayedPreferenceKeys(boolean bondingLoss) { private List<String> generateDisplayedPreferenceKeys(boolean bondingLoss) {
if (bondingLoss) { if (bondingLoss) {
return List.of( ImmutableList.Builder<String> visibleKeys = new ImmutableList.Builder<>();
use(BluetoothDetailsBannerController.class).getPreferenceKey(), visibleKeys
use(AdvancedBluetoothDetailsHeaderController.class).getPreferenceKey(), .add(use(BluetoothDetailsBannerController.class).getPreferenceKey())
use(BluetoothDetailsHeaderController.class).getPreferenceKey(), .add(use(AdvancedBluetoothDetailsHeaderController.class).getPreferenceKey())
use(LeAudioBluetoothDetailsHeaderController.class).getPreferenceKey(), .add(use(BluetoothDetailsHeaderController.class).getPreferenceKey())
use(BluetoothDetailsButtonsController.class).getPreferenceKey(), .add(use(LeAudioBluetoothDetailsHeaderController.class).getPreferenceKey())
use(BluetoothDetailsMacAddressController.class).getPreferenceKey()); .add(use(BluetoothDetailsButtonsController.class).getPreferenceKey());
if (!BluetoothUtils.isHeadset(mCachedDevice.getDevice())) {
visibleKeys.add(use(BluetoothDetailsMacAddressController.class).getPreferenceKey());
}
return visibleKeys.build();
} }
return null; return null;
} }