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

Commit 646a6501 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am ec2b8cb3: Merge "Volume: Show safe media warning in settings." into lmp-dev 

* commit 'ec2b8cb3482486d3114ea6f33af272f5e86a56d3':
  Volume: Show safe media warning in settings.
parents e8e4437a 543650bb

core/java/android/preference/SeekBarVolumizer.java

+2 −1
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
    public boolean handleMessage(Message msg) {

        switch (msg.what) {

            case MSG_SET_STREAM_VOLUME:

                mAudioManager.setStreamVolume(mStreamType, mLastProgress, 0);

                mAudioManager.setStreamVolume(mStreamType, mLastProgress,

                        AudioManager.FLAG_SHOW_UI_WARNINGS);

                break;

            case MSG_START_SAMPLE:

                onStartSample();

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4498,7 +4498,7 @@ 
    <!-- Message shown in dialog when user is attempting to set the music volume above the

    recommended maximum level for headphones -->

    <string name="safe_media_volume_warning" product="default">

       "Raise volume above recommended level?\nListening at high volume for long periods may damage your hearing."

       "Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."

    </string>



    <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->

media/java/android/media/AudioManager.java

+6 −0
Original line number Diff line number Diff line
@@ -353,6 +353,12 @@ public class AudioManager { 
     */

    public static final int FLAG_ACTIVE_MEDIA_ONLY = 1 << 9;



    /**

     * Like FLAG_SHOW_UI, but only dialog warnings and confirmations, no sliders.

     * @hide

     */

    public static final int FLAG_SHOW_UI_WARNINGS = 1 << 10;



    /**

     * Ringer mode that will be silent and will not vibrate. (This overrides the

     * vibrate setting.)

media/java/android/media/AudioService.java

+32 −6
Original line number Diff line number Diff line
@@ -1131,6 +1131,13 @@ public class AudioService extends IAudioService.Stub { 
            mFlags = flags;

            mDevice = device;

        }



        @Override

        public String toString() {

            return new StringBuilder().append("{streamType=").append(mStreamType).append(",index=")

                    .append(mIndex).append(",flags=").append(mFlags).append(",device=")

                    .append(mDevice).append('}').toString();

        }

    };



    private void onSetStreamVolume(int streamType, int index, int flags, int device) {
@@ -2724,7 +2731,9 @@ public class AudioService extends IAudioService.Stub { 
            if ((mMcc != mcc) || ((mMcc == 0) && force)) {

                mSafeMediaVolumeIndex = mContext.getResources().getInteger(

                        com.android.internal.R.integer.config_safe_media_volume_index) * 10;

                boolean safeMediaVolumeEnabled = mContext.getResources().getBoolean(

                boolean safeMediaVolumeEnabled =

                        SystemProperties.getBoolean("audio.safemedia.force", false)

                        || mContext.getResources().getBoolean(

                                com.android.internal.R.bool.config_safe_media_volume_enabled);



                // The persisted state is either "disabled" or "active": this is the state applied
@@ -4863,10 +4872,10 @@ public class AudioService extends IAudioService.Stub { 
    // SAFE_MEDIA_VOLUME_DISABLED according to country option. If not SAFE_MEDIA_VOLUME_DISABLED, it

    // can be set to SAFE_MEDIA_VOLUME_INACTIVE by calling AudioService.disableSafeMediaVolume()

    // (when user opts out).

    private final int SAFE_MEDIA_VOLUME_NOT_CONFIGURED = 0;

    private final int SAFE_MEDIA_VOLUME_DISABLED = 1;

    private final int SAFE_MEDIA_VOLUME_INACTIVE = 2;

    private final int SAFE_MEDIA_VOLUME_ACTIVE = 3;

    private static final int SAFE_MEDIA_VOLUME_NOT_CONFIGURED = 0;

    private static final int SAFE_MEDIA_VOLUME_DISABLED = 1;

    private static final int SAFE_MEDIA_VOLUME_INACTIVE = 2;  // confirmed

    private static final int SAFE_MEDIA_VOLUME_ACTIVE = 3;  // unconfirmed

    private Integer mSafeMediaVolumeState;



    private int mMcc = 0;
@@ -5058,7 +5067,24 @@ public class AudioService extends IAudioService.Stub { 
        pw.println("\nAudio routes:");

        pw.print("  mMainType=0x"); pw.println(Integer.toHexString(mCurAudioRoutes.mMainType));

        pw.print("  mBluetoothName="); pw.println(mCurAudioRoutes.mBluetoothName);



        pw.println("\nOther state:");

        pw.print("  mVolumeController="); pw.println(mVolumeController);

        pw.print("  mSafeMediaVolumeState=");

        pw.println(safeMediaVolumeStateToString(mSafeMediaVolumeState));

        pw.print("  mSafeMediaVolumeIndex="); pw.println(mSafeMediaVolumeIndex);

        pw.print("  mPendingVolumeCommand="); pw.println(mPendingVolumeCommand);

        pw.print("  mMusicActiveMs="); pw.println(mMusicActiveMs);

    }



    private static String safeMediaVolumeStateToString(Integer state) {

        switch(state) {

            case SAFE_MEDIA_VOLUME_NOT_CONFIGURED: return "SAFE_MEDIA_VOLUME_NOT_CONFIGURED";

            case SAFE_MEDIA_VOLUME_DISABLED: return "SAFE_MEDIA_VOLUME_DISABLED";

            case SAFE_MEDIA_VOLUME_INACTIVE: return "SAFE_MEDIA_VOLUME_INACTIVE";

            case SAFE_MEDIA_VOLUME_ACTIVE: return "SAFE_MEDIA_VOLUME_ACTIVE";

        }

        return null;

    }



    // Inform AudioFlinger of our device's low RAM attribute

packages/SystemUI/res/values/styles.xml

+5 −3
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ 
        <item name="android:colorControlActivated">@color/system_accent_color</item>

    </style>



    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog">

        <item name="android:colorPrimary">@color/system_primary_color</item>

        <item name="android:colorControlActivated">@color/system_accent_color</item>

    </style>



    <style name="NotificationsQuickSettings">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>
@@ -275,7 +280,4 @@ 
        <item name="android:textStyle">italic</item>

        <item name="android:textColor">#60000000</item>

    </style>



    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog">

    </style>

</resources>