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

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

Merge changes I91f55968,I81c82b1a into main 

* changes:
  Fix: Ensure slider value is reset to min when disabled
  Delay refreshing after loading the device to prevent extra expand action
parents 6a578ec8 6b224a84

packages/SettingsLib/src/com/android/settingslib/bluetooth/hearingdevices/ui/AmbientVolumeUiController.java

+4 −1
Original line number Diff line number Diff line
@@ -351,7 +351,10 @@ public class AmbientVolumeUiController implements 
        mAmbientLayout.setControlExpandable(mSideToDeviceMap.size() >  1);

        mAmbientLayout.setupSliders(mSideToDeviceMap.keySet());

        if (mStarted) {

            refresh();

            // We have to check if we need to expand the controls by getting all remote

            // device's ambient value, delay for a while to wait all remote devices connected and

            // updated to the latest value to avoid unnecessary expand action.

            postDelayedOnMainThread(this::refresh, 1200L);

        }

    }

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/AmbientVolumeLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ public class AmbientVolumeLayout extends LinearLayout implements AmbientVolumeUi 
    @Override

    public void setSliderEnabled(int side, boolean enabled) {

        AmbientVolumeSlider slider = mSideToSliderMap.get(side);

        if (slider != null && slider.isEnabled() != enabled) {

        if (slider != null) {

            slider.setEnabled(enabled);

            if (!enabled) {

                slider.setValue(slider.getMin());