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

Commit c250e1ed authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 

* commit '21dfd7c5':
  Update headphone volume safety warning message.
parents 20f8c730 21dfd7c5

core/java/android/view/VolumePanel.java

+0 −1
Original line number Diff line number Diff line
@@ -832,7 +832,6 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
            sConfirmSafeVolumeDialog.dismiss();

        }

        sConfirmSafeVolumeDialog = new AlertDialog.Builder(mContext)

                .setTitle(android.R.string.dialog_alert_title)

                .setMessage(com.android.internal.R.string.safe_media_volume_warning)

                .setPositiveButton(com.android.internal.R.string.yes,

                                    new DialogInterface.OnClickListener() {

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -3890,7 +3890,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 the recommended level?"

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

    </string>



    <string name="kg_temp_back_string"> &lt; </string> <!-- TODO: remove this -->