Rename audios to audio
Bug: 186635176
Test: build pass
Change-Id: I0d909f639fe36edf2e5088c7ec219cceee4e963a
diff --git a/res/values/config.xml b/res/values/config.xml
index 21d9c75..1e2855b 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -511,8 +511,8 @@
<!-- Media Uri to view videos storage category. -->
<string name="config_videos_storage_category_uri" translatable="false">content://com.android.providers.media.documents/root/videos_root</string>
- <!-- Media Uri to view audios storage category. -->
- <string name="config_audios_storage_category_uri" translatable="false">content://com.android.providers.media.documents/root/audio_root</string>
+ <!-- Media Uri to view audio storage category. -->
+ <string name="config_audio_storage_category_uri" translatable="false">content://com.android.providers.media.documents/root/audio_root</string>
<!-- Media Uri to view documents & other storage category. -->
<string name="config_documents_and_other_storage_category_uri" translatable="false">content://com.android.providers.media.documents/root/documents_root</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a34f909..4f377ee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11883,8 +11883,8 @@
<!-- Preference label for the Videos storage section. [CHAR LIMIT=50] -->
<string name="storage_videos">Videos</string>
- <!-- Preference label for the Audios storage section. [CHAR LIMIT=50] -->
- <string name="storage_audios">Audios</string>
+ <!-- Preference label for the Audio storage section. [CHAR LIMIT=50] -->
+ <string name="storage_audio">Audio</string>
<!-- Preference label for the Apps storage section. [CHAR LIMIT=50] -->
<string name="storage_apps">Apps</string>
diff --git a/res/xml/storage_category_fragment.xml b/res/xml/storage_category_fragment.xml
index 8ac9e94..72623d7 100644
--- a/res/xml/storage_category_fragment.xml
+++ b/res/xml/storage_category_fragment.xml
@@ -43,8 +43,8 @@
android:icon="@drawable/ic_local_movies"
android:order="102"/>
<com.android.settings.deviceinfo.StorageItemPreference
- android:key="pref_audios"
- android:title="@string/storage_audios"
+ android:key="pref_audio"
+ android:title="@string/storage_audio"
android:icon="@drawable/ic_media_stream"
android:order="103"/>
<com.android.settings.deviceinfo.StorageItemPreference
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 49db958..655e683 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -63,8 +63,8 @@
android:icon="@drawable/ic_local_movies"
android:order="102"/>
<com.android.settings.deviceinfo.StorageItemPreference
- android:key="pref_audios"
- android:title="@string/storage_audios"
+ android:key="pref_audio"
+ android:title="@string/storage_audio"
android:icon="@drawable/ic_media_stream"
android:order="103"/>
<com.android.settings.deviceinfo.StorageItemPreference
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 656f337..241c852 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -76,7 +76,7 @@
@VisibleForTesting
static final String VIDEOS_KEY = "pref_videos";
@VisibleForTesting
- static final String AUDIOS_KEY = "pref_audios";
+ static final String AUDIO_KEY = "pref_audio";
@VisibleForTesting
static final String APPS_KEY = "pref_apps";
@VisibleForTesting
@@ -93,7 +93,7 @@
@VisibleForTesting
final Uri mVideosUri;
@VisibleForTesting
- final Uri mAudiosUri;
+ final Uri mAudioUri;
@VisibleForTesting
final Uri mDocumentsAndOtherUri;
@@ -119,7 +119,7 @@
@VisibleForTesting
StorageItemPreference mVideosPreference;
@VisibleForTesting
- StorageItemPreference mAudiosPreference;
+ StorageItemPreference mAudioPreference;
@VisibleForTesting
StorageItemPreference mAppsPreference;
@VisibleForTesting
@@ -151,8 +151,8 @@
.getString(R.string.config_images_storage_category_uri));
mVideosUri = Uri.parse(context.getResources()
.getString(R.string.config_videos_storage_category_uri));
- mAudiosUri = Uri.parse(context.getResources()
- .getString(R.string.config_audios_storage_category_uri));
+ mAudioUri = Uri.parse(context.getResources()
+ .getString(R.string.config_audio_storage_category_uri));
mDocumentsAndOtherUri = Uri.parse(context.getResources()
.getString(R.string.config_documents_and_other_storage_category_uri));
}
@@ -182,8 +182,8 @@
case VIDEOS_KEY:
launchActivityWithUri(mVideosUri);
return true;
- case AUDIOS_KEY:
- launchActivityWithUri(mAudiosUri);
+ case AUDIO_KEY:
+ launchActivityWithUri(mAudioUri);
return true;
case APPS_KEY:
launchAppsIntent();
@@ -251,7 +251,7 @@
final boolean privateStoragePreferencesVisible = isValidPrivateVolume();
mImagesPreference.setVisible(privateStoragePreferencesVisible);
mVideosPreference.setVisible(privateStoragePreferencesVisible);
- mAudiosPreference.setVisible(privateStoragePreferencesVisible);
+ mAudioPreference.setVisible(privateStoragePreferencesVisible);
mAppsPreference.setVisible(privateStoragePreferencesVisible);
mGamesPreference.setVisible(privateStoragePreferencesVisible);
mDocumentsAndOtherPreference.setVisible(privateStoragePreferencesVisible);
@@ -279,7 +279,7 @@
mPrivateStorageItemPreferences.add(mImagesPreference);
mPrivateStorageItemPreferences.add(mVideosPreference);
- mPrivateStorageItemPreferences.add(mAudiosPreference);
+ mPrivateStorageItemPreferences.add(mAudioPreference);
mPrivateStorageItemPreferences.add(mAppsPreference);
mPrivateStorageItemPreferences.add(mGamesPreference);
mPrivateStorageItemPreferences.add(mDocumentsAndOtherPreference);
@@ -288,7 +288,7 @@
}
mScreen.removePreference(mImagesPreference);
mScreen.removePreference(mVideosPreference);
- mScreen.removePreference(mAudiosPreference);
+ mScreen.removePreference(mAudioPreference);
mScreen.removePreference(mAppsPreference);
mScreen.removePreference(mGamesPreference);
mScreen.removePreference(mDocumentsAndOtherPreference);
@@ -317,7 +317,7 @@
tintPreference(mPublicStoragePreference);
tintPreference(mImagesPreference);
tintPreference(mVideosPreference);
- tintPreference(mAudiosPreference);
+ tintPreference(mAudioPreference);
tintPreference(mAppsPreference);
tintPreference(mGamesPreference);
tintPreference(mDocumentsAndOtherPreference);
@@ -346,7 +346,7 @@
mPublicStoragePreference = screen.findPreference(PUBLIC_STORAGE_KEY);
mImagesPreference = screen.findPreference(IMAGES_KEY);
mVideosPreference = screen.findPreference(VIDEOS_KEY);
- mAudiosPreference = screen.findPreference(AUDIOS_KEY);
+ mAudioPreference = screen.findPreference(AUDIO_KEY);
mAppsPreference = screen.findPreference(APPS_KEY);
mGamesPreference = screen.findPreference(GAMES_KEY);
mDocumentsAndOtherPreference = screen.findPreference(DOCUMENTS_AND_OTHER_KEY);
@@ -363,7 +363,7 @@
mImagesPreference.setStorageSize(getImagesSize(data), mTotalSize);
mVideosPreference.setStorageSize(getVideosSize(data), mTotalSize);
- mAudiosPreference.setStorageSize(getAudiosSize(data), mTotalSize);
+ mAudioPreference.setStorageSize(getAudioSize(data), mTotalSize);
mAppsPreference.setStorageSize(getAppsSize(data), mTotalSize);
mGamesPreference.setStorageSize(getGamesSize(data), mTotalSize);
mDocumentsAndOtherPreference.setStorageSize(getDocumentsAndOtherSize(data),
@@ -426,7 +426,7 @@
return data.videoAppsSize;
}
- private long getAudiosSize(StorageAsyncLoader.AppsStorageResult data) {
+ private long getAudioSize(StorageAsyncLoader.AppsStorageResult data) {
return data.musicAppsSize + data.externalStats.audioBytes;
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 3fd1218..0a87d08 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -112,8 +112,8 @@
images.setIcon(R.drawable.ic_photo_library);
final StorageItemPreference videos = spy(new StorageItemPreference(mContext));
videos.setIcon(R.drawable.ic_local_movies);
- final StorageItemPreference audios = spy(new StorageItemPreference(mContext));
- audios.setIcon(R.drawable.ic_media_stream);
+ final StorageItemPreference audio = spy(new StorageItemPreference(mContext));
+ audio.setIcon(R.drawable.ic_media_stream);
final StorageItemPreference apps = spy(new StorageItemPreference(mContext));
apps.setIcon(R.drawable.ic_storage_apps);
final StorageItemPreference games = spy(new StorageItemPreference(mContext));
@@ -132,8 +132,8 @@
.thenReturn(images);
when(screen.findPreference(eq(StorageItemPreferenceController.VIDEOS_KEY)))
.thenReturn(videos);
- when(screen.findPreference(eq(StorageItemPreferenceController.AUDIOS_KEY)))
- .thenReturn(audios);
+ when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
+ .thenReturn(audio);
when(screen.findPreference(eq(StorageItemPreferenceController.APPS_KEY)))
.thenReturn(apps);
when(screen.findPreference(eq(StorageItemPreferenceController.GAMES_KEY)))
@@ -190,8 +190,8 @@
}
@Test
- public void launchAudiosIntent_resolveActionViewNull_settingsIntent() {
- mPreference.setKey(StorageItemPreferenceController.AUDIOS_KEY);
+ public void launchAudioIntent_resolveActionViewNull_settingsIntent() {
+ mPreference.setKey(StorageItemPreferenceController.AUDIO_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
mSvp, false /* isWorkProfile */);
@@ -203,7 +203,7 @@
final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
- assertThat(intent.getData()).isEqualTo(mController.mAudiosUri);
+ assertThat(intent.getData()).isEqualTo(mController.mAudioUri);
}
@Test
@@ -215,7 +215,7 @@
assertThat(mController.mPublicStoragePreference.isVisible()).isFalse();
assertThat(mController.mImagesPreference.isVisible()).isFalse();
assertThat(mController.mVideosPreference.isVisible()).isFalse();
- assertThat(mController.mAudiosPreference.isVisible()).isFalse();
+ assertThat(mController.mAudioPreference.isVisible()).isFalse();
assertThat(mController.mAppsPreference.isVisible()).isFalse();
assertThat(mController.mGamesPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isFalse();
@@ -355,7 +355,7 @@
assertThat(mController.mImagesPreference.getSummary().toString()).isEqualTo("0.35 GB");
assertThat(mController.mVideosPreference.getSummary().toString()).isEqualTo("0.16 GB");
- assertThat(mController.mAudiosPreference.getSummary().toString()).isEqualTo("0.14 GB");
+ assertThat(mController.mAudioPreference.getSummary().toString()).isEqualTo("0.14 GB");
assertThat(mController.mAppsPreference.getSummary().toString()).isEqualTo("0.09 GB");
assertThat(mController.mGamesPreference.getSummary().toString()).isEqualTo("0.08 GB");
assertThat(mController.mDocumentsAndOtherPreference.getSummary().toString())
@@ -371,7 +371,7 @@
verify(mController.mPublicStoragePreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mImagesPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mVideosPreference, times(2)).setIcon(nullable(Drawable.class));
- verify(mController.mAudiosPreference, times(2)).setIcon(nullable(Drawable.class));
+ verify(mController.mAudioPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mAppsPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mGamesPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mDocumentsAndOtherPreference, times(2))
@@ -455,7 +455,7 @@
assertThat(mController.mPublicStoragePreference.isVisible()).isTrue();
assertThat(mController.mImagesPreference.isVisible()).isFalse();
assertThat(mController.mVideosPreference.isVisible()).isFalse();
- assertThat(mController.mAudiosPreference.isVisible()).isFalse();
+ assertThat(mController.mAudioPreference.isVisible()).isFalse();
assertThat(mController.mAppsPreference.isVisible()).isFalse();
assertThat(mController.mGamesPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isFalse();