Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5879f8d0 authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Remove bottom preference if expressive theme enabled" into main

parents 417bac99 2bea4b33

src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java

+14 −12
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
            }

        }



        if (!Flags.enableBluetoothSettingsExpressiveDesign()) {

            Preference preference = mProfilesContainer.findPreference(KEY_BOTTOM_PREFERENCE);

            if (preference == null) {

                preference = new Preference(mContext);
@@ -570,6 +571,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
                preference.setSelectable(false);

                mProfilesContainer.addPreference(preference);

            }

        }



        Set<String> additionalInvisibleProfiles = mAdditionalInvisibleProfiles.get();

        HashSet<String> combinedInvisibleProfiles = new HashSet<>(mInvisibleProfiles);