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

Commit 6062b649 authored by Arc Wang's avatar Arc Wang
Browse files

Rename audios to audio 

Bug: 186635176
Test: build pass
Change-Id: I0d909f639fe36edf2e5088c7ec219cceee4e963a
parent c0b5ba52

res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

























res/xml/storage_category_fragment.xml



+2
−2




























Original line number
Diff line number
Diff line








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

































res/xml/storage_dashboard_fragment.xml



+2
−2




























Original line number
Diff line number
Diff line








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

































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



+14
−14




























Original line number
Diff line number
Diff line








@@ -76,7 +76,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













    @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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













    @VisibleForTesting















    final Uri mVideosUri;















    @VisibleForTesting













    final Uri mAudiosUri;













    final Uri mAudioUri;















    @VisibleForTesting















    final Uri mDocumentsAndOtherUri;

























@@ -119,7 +119,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













    @VisibleForTesting















    StorageItemPreference mVideosPreference;















    @VisibleForTesting













    StorageItemPreference mAudiosPreference;













    StorageItemPreference mAudioPreference;















    @VisibleForTesting















    StorageItemPreference mAppsPreference;















    @VisibleForTesting










@@ -151,8 +151,8 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













                .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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













            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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













        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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle





























            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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













        }















        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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













        tintPreference(mPublicStoragePreference);















        tintPreference(mImagesPreference);















        tintPreference(mVideosPreference);













        tintPreference(mAudiosPreference);













        tintPreference(mAudioPreference);















        tintPreference(mAppsPreference);















        tintPreference(mGamesPreference);















        tintPreference(mDocumentsAndOtherPreference);










@@ -346,7 +346,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













        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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle





























        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 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle













        return data.videoAppsSize;















    }





























    private long getAudiosSize(StorageAsyncLoader.AppsStorageResult data) {













    private long getAudioSize(StorageAsyncLoader.AppsStorageResult data) {















        return data.musicAppsSize + data.externalStats.audioBytes;















    }