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

Author: Eric Laurent

core/java/android/view/VolumePanel.java

@@ -832,7 +832,6 @@ protected void onDisplaySafeVolumeWarning() {
             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

@@ -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 -->