commit b6059a9e98b28d8c1232a8db675d54503c01b6ff
author Daniel Nishi <dhnishi@google.com> Mon Feb 27 17:23:00 2017 -0800
committer Daniel Nishi <dhnishi@google.com> Tue Feb 28 01:36:22 2017 +0000
tree 34f32418976f8ceda3adf40fe6c6c3f34d8e3960
parent 5ac2e138b1a7dd61fb55c3d10fab7ed4159cc92e

Use "Music & audio" as the title for the music view.

Change-Id: I33bc5ccf55ee09842368b2fd4a83b9fd492eded0
Fixes: 35713002
Test: Manual

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7428d20..cfbaa3e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8187,7 +8187,7 @@
     <string name="storage_photos_videos">Photos &amp; Videos</string>
 
     <!-- Preference label for the Music & Audio storage section. [CHAR LIMIT=50] -->
-    <string name="storage_music_audio">Music &amp; Audio</string>
+    <string name="storage_music_audio">Music &amp; audio</string>
 
     <!-- Preference label for the Games storage section. [CHAR LIMIT=50] -->
     <string name="storage_games">Games</string>
@@ -8222,8 +8222,6 @@
 
     <!-- Title for audio files preference. [CHAR LIMIT=50] -->
     <string name="audio_files_title">Audio files</string>
-    <!-- Title for the Audio storage view. [CHAR LIMIT=50] -->
-    <string name="audio_storage_title">Music</string>
 
     <!-- UI webview setting: WebView uninstalled-for-user explanatory text [CHAR LIMIT=30] -->
     <string name="webview_uninstalled_for_user">(uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>

src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java

diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index e31d968..7487b28 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -225,7 +225,7 @@
         args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
         args.putInt(ManageApplications.EXTRA_STORAGE_TYPE, ManageApplications.STORAGE_TYPE_MUSIC);
         return Utils.onBuildStartFragmentIntent(mContext,
-                ManageApplications.class.getName(), args, null, R.string.audio_storage_title, null,
+                ManageApplications.class.getName(), args, null, R.string.storage_music_audio, null,
                 false, mMetricsFeatureProvider.getMetricsCategory(mFragment));
     }