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

Commit 420342c4 authored by Behnam Heydarshahi's avatar Behnam Heydarshahi
Browse files

Bugfix: Ring volume stuck at zero on tangor 

Solution: offer a boolean config for volumeUpToExitSilent and
overwrite it for tangorpro.

Flag: NONE
Bug: b/279645379
Test: Manual. Slide ring volume all the way left in settings.
Press volume up. Ring volume slider progress should move away from 0,
and the ring icon should change from silent to normal.

Change-Id: Ice564acc8226d5baa6059bf3d9c34ffc0111f4d1
parent eaebba0a

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2213,7 +2213,10 @@ 
    <bool name="config_single_volume">false</bool>



    <!-- Volume policy -->

    <!-- Strongly consider keeping these 2 values in sync - otherwise vol up/vol down have confusing

    asymmetric behavior, as in b/279645379 -->

    <bool name="config_volume_down_to_enter_silent">false</bool>

    <bool name="config_volume_up_to_exit_silent">false</bool>



    <!-- The number of volume steps for the notification stream -->

    <integer name="config_audio_notif_vol_steps">7</integer>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ 
  <java-symbol type="integer" name="config_phonenumber_compare_min_match" />

  <java-symbol type="bool" name="config_single_volume" />

  <java-symbol type="bool" name="config_volume_down_to_enter_silent" />

  <java-symbol type="bool" name="config_volume_up_to_exit_silent" />

  <java-symbol type="bool" name="config_voice_capable" />

  <java-symbol type="bool" name="config_requireCallCapableAccountForHandle" />

  <java-symbol type="bool" name="config_user_notification_of_restrictied_mobile_access" />

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java

+5 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
    public static final String VOLUME_SILENT_DO_NOT_DISTURB = "sysui_do_not_disturb";



    private final boolean mDefaultVolumeDownToEnterSilent;

    public static final boolean DEFAULT_VOLUME_UP_TO_EXIT_SILENT = false;

    public final boolean mDefaultVolumeUpToExitSilent;

    public static final boolean DEFAULT_DO_NOT_DISTURB_WHEN_SILENT = false;



    private static final Intent ZEN_SETTINGS =
@@ -107,10 +107,12 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 


        mDefaultVolumeDownToEnterSilent = mContext.getResources()

                .getBoolean(R.bool.config_volume_down_to_enter_silent);

        mDefaultVolumeUpToExitSilent = mContext.getResources()

                .getBoolean(R.bool.config_volume_up_to_exit_silent);



        mVolumePolicy = new VolumePolicy(

                mDefaultVolumeDownToEnterSilent,  // volumeDownToEnterSilent

                DEFAULT_VOLUME_UP_TO_EXIT_SILENT,  // volumeUpToExitSilent

                mDefaultVolumeUpToExitSilent,  // volumeUpToExitSilent

                DEFAULT_DO_NOT_DISTURB_WHEN_SILENT,  // doNotDisturbWhenSilent

                400    // vibrateToSilentDebounce

        );
@@ -133,7 +135,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
                TunerService.parseIntegerSwitch(newValue, mDefaultVolumeDownToEnterSilent);

        } else if (VOLUME_UP_SILENT.equals(key)) {

            volumeUpToExitSilent =

                TunerService.parseIntegerSwitch(newValue, DEFAULT_VOLUME_UP_TO_EXIT_SILENT);

                TunerService.parseIntegerSwitch(newValue, mDefaultVolumeUpToExitSilent);

        } else if (VOLUME_SILENT_DO_NOT_DISTURB.equals(key)) {

            doNotDisturbWhenSilent =

                TunerService.parseIntegerSwitch(newValue, DEFAULT_DO_NOT_DISTURB_WHEN_SILENT);