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

Commit a3349519 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Add the badged icon for Movies & TV." into oc-dev 

am: 9a5bac7d

Change-Id: I59cea940381aa360be456c44afb36c58964c3065
parents bdba7ab6 9a5bac7d

res/xml/storage_profile_fragment.xml

+6 −3
Original line number Diff line number Diff line
@@ -35,15 +35,18 @@ 
        android:order="4" />

    <com.android.settings.deviceinfo.StorageItemPreference

        android:key="pref_movies"

        android:title="@string/storage_movies_tv" />

        android:title="@string/storage_movies_tv"

        android:icon="@drawable/ic_theaters_vd_theme_24"

        android:order="5"

    />

    <com.android.settings.deviceinfo.StorageItemPreference

        android:key="pref_other_apps"

        android:title="@string/storage_other_apps"

        android:icon="@drawable/ic_apps_vd_theme_24"

        android:order="5" />

        android:order="6" />

    <com.android.settings.deviceinfo.StorageItemPreference

        android:key="pref_files"

        android:title="@string/storage_files"

        android:icon="@drawable/ic_folder_vd_theme_24"

        android:order="6" />

        android:order="7" />

</PreferenceScreen>

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

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ public class StorageItemPreferenceController extends PreferenceController { 


        PackageManager pm = mContext.getPackageManager();

        badgePreference(pm, userHandle, mPhotoPreference);

        badgePreference(pm, userHandle, mMoviesPreference);

        badgePreference(pm, userHandle, mAudioPreference);

        badgePreference(pm, userHandle, mGamePreference);

        badgePreference(pm, userHandle, mAppPreference);

tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ public class StorageItemPreferenceControllerTest { 
    public void settingUserIdAppliesNewIcons() {

        StorageItemPreference audio = spy(new StorageItemPreference(mContext));

        audio.setIcon(R.drawable.ic_photo_library_vd_theme_24);

        StorageItemPreference video = spy(new StorageItemPreference(mContext));

        video.setIcon(R.drawable.ic_photo_library_vd_theme_24);

        StorageItemPreference image = spy(new StorageItemPreference(mContext));

        image.setIcon(R.drawable.ic_photo_library_vd_theme_24);

        StorageItemPreference games = spy(new StorageItemPreference(mContext));
@@ -311,6 +313,8 @@ public class StorageItemPreferenceControllerTest { 
        PreferenceScreen screen = mock(PreferenceScreen.class);

        when(screen.findPreference(

                eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);

        when(screen.findPreference(

                eq(StorageItemPreferenceController.MOVIES_KEY))).thenReturn(video);

        when(screen.findPreference(

                eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);

        when(screen.findPreference(
@@ -326,6 +330,7 @@ public class StorageItemPreferenceControllerTest { 
        mController.setUserId(new UserHandle(10));



        verify(audio, times(2)).setIcon(any(Drawable.class));

        verify(video, times(2)).setIcon(any(Drawable.class));

        verify(image, times(2)).setIcon(any(Drawable.class));

        verify(games, times(2)).setIcon(any(Drawable.class));

        verify(apps, times(2)).setIcon(any(Drawable.class));