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

Commit 74c79cef authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topics "refactor-expandable-ui", "refactor-ha-files" into main 

* changes:
  Refactor: extract common methods to ExpandableUi interface
  Refactor: Group hearing device files into a single package
parents a74cfdff 9feafd75

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+4 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import androidx.annotation.WorkerThread; 
import com.android.internal.util.ArrayUtils;

import com.android.settingslib.R;

import com.android.settingslib.Utils;

import com.android.settingslib.bluetooth.hearingdevices.metrics.HearingDeviceStatsLogUtils;

import com.android.settingslib.flags.Flags;

import com.android.settingslib.utils.ThreadUtils;

import com.android.settingslib.widget.AdaptiveOutlineDrawable;
@@ -361,7 +362,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
                updatePreferredTransport();

            }



            HearingAidStatsLogUtils.updateHistoryIfNeeded(mContext, this, profile, newProfileState);

            HearingDeviceStatsLogUtils.updateHistoryIfNeeded(mContext, this, profile,

                    newProfileState);

        }



        if (Flags.enableBluetoothDiagnosis() && !isBusy()) {
@@ -1146,7 +1148,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


            // Saves this device as just bonded and checks if it's an hearing device after

            // profiles are connected. This is for judging whether to display the survey.

            HearingAidStatsLogUtils.addToJustBonded(getAddress());

            HearingDeviceStatsLogUtils.addToJustBonded(getAddress());



            if (Flags.enableBluetoothDiagnosis()) {

                mBondFailureTimeMillis = -1;

packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import androidx.collection.ArraySet; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants.RoutingValue;

import com.android.settingslib.bluetooth.hearingdevices.metrics.HearingDeviceLocalDataManager;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+3 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import androidx.annotation.VisibleForTesting; 


import com.android.internal.util.ArrayUtils;

import com.android.internal.util.CollectionUtils;

import com.android.settingslib.bluetooth.hearingdevices.metrics.HearingDeviceStatsLogUtils;

import com.android.settingslib.flags.Flags;



import java.util.ArrayList;
@@ -374,7 +375,7 @@ public class LocalBluetoothProfileManager { 
                    }

                }



                HearingAidStatsLogUtils.logHearingAidInfo(cachedDevice);

                HearingDeviceStatsLogUtils.logHearingAidInfo(cachedDevice);

            }



            if (isHapClientOrLeAudioProfile && newState == BluetoothProfile.STATE_CONNECTED) {
@@ -389,7 +390,7 @@ public class LocalBluetoothProfileManager { 
                            .setLeAudioLocation(getLeAudioProfile().getAudioLocation(device))

                            .setHapDeviceType(getHapClientProfile().getHearingAidType(device));

                    cachedDevice.setHearingAidInfo(infoBuilder.build());

                    HearingAidStatsLogUtils.logHearingAidInfo(cachedDevice);

                    HearingDeviceStatsLogUtils.logHearingAidInfo(cachedDevice);

                }

            }

packages/SettingsLib/src/com/android/settingslib/bluetooth/AmbientVolumeController.java→packages/SettingsLib/src/com/android/settingslib/bluetooth/hearingdevices/AmbientVolumeController.java

+6 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@ 
 * limitations under the License.

 */



package com.android.settingslib.bluetooth;

package com.android.settingslib.bluetooth.hearingdevices;



import static android.bluetooth.AudioInputControl.MUTE_DISABLED;

import static android.bluetooth.AudioInputControl.MUTE_MUTED;

import static android.bluetooth.AudioInputControl.MUTE_NOT_MUTED;



import static com.android.settingslib.bluetooth.HearingDeviceLocalDataManager.Data.INVALID_VOLUME;

import static com.android.settingslib.bluetooth.hearingdevices.metrics.HearingDeviceLocalDataManager.Data.INVALID_VOLUME;



import android.bluetooth.AudioInputControl;

import android.bluetooth.BluetoothDevice;
@@ -31,6 +31,9 @@ import android.util.Log; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;

import com.android.settingslib.bluetooth.VolumeControlProfile;



import java.util.Collections;

import java.util.List;

import java.util.Map;

packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingDeviceLocalDataManager.java→packages/SettingsLib/src/com/android/settingslib/bluetooth/hearingdevices/metrics/HearingDeviceLocalDataManager.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



package com.android.settingslib.bluetooth;

package com.android.settingslib.bluetooth.hearingdevices.metrics;



import static com.android.settingslib.bluetooth.HearingDeviceLocalDataManager.Data.INVALID_VOLUME;

import static com.android.settingslib.bluetooth.hearingdevices.metrics.HearingDeviceLocalDataManager.Data.INVALID_VOLUME;



import android.bluetooth.BluetoothDevice;

import android.content.ContentResolver;