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

Merge "Don't show footer for headset when bonding loss" into main

Browse Source
This commit is contained in:
Haijie Hong
2025-03-21 02:52:39 -07:00
committed by Android (Google) Code Review
parent af3a006b2a 026d698a91
commit 93a4eaa4b2
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
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;
} }