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

Commit 9f5cd3c2 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Volumes panel shouldn't depend on Silent mode setting."

parents 2d75f829 7f0d760e

res/xml/sound_settings.xml

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


    <com.android.settings.RingerVolumePreference

            android:key="ring_volume"

            android:dependency="silent"

            android:title="@string/all_volume_title"

            android:dialogTitle="@string/all_volume_title"

            android:persistent="false"
@@ -37,7 +36,7 @@ 
            android:key="silent"

            android:title="@string/silent_mode_title"

            android:persistent="false"

            android:disableDependentsState="true" />

            />



    <Preference

            android:key="musicfx"

src/com/android/settings/RingerVolumePreference.java

+6 −3
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL 
                public void onReceive(Context context, Intent intent) {

                    final String action = intent.getAction();

                    if (AudioManager.RINGER_MODE_CHANGED_ACTION.equals(action)) {

                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED,

                                intent.getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));

                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED, intent

                                .getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));

                    }

                }

            };
@@ -222,7 +222,10 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL 
    @Override

    public void onActivityStop() {

        super.onActivityStop();

        cleanup();



        for (SeekBarVolumizer vol : mSeekBarVolumizer) {

            if (vol != null) vol.stopSample();

        }

    }



    @Override