commit 21dfd7c5fe9e42d2ef3ac7423065c86dfe8f29da
author Eric Laurent <elaurent@google.com> Mon Sep 17 18:29:27 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 17 18:29:27 2012 -0700
tree 8925724220fac744954306f0cf92b9ad4e3d6c61
parent c33f94e2a50c9b03cb771237e8672743da8b1314
parent b6397c71709d9129c889028e89899789c667c339

Merge "Update headphone volume safety warning message." into jb-mr1-dev

core/java/android/view/VolumePanel.java

diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java
index c93da06..d6f63a7 100644
--- a/core/java/android/view/VolumePanel.java
+++ b/core/java/android/view/VolumePanel.java
@@ -832,7 +832,6 @@
             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

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 56e5ce1..b904c60 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -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 -->