PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the badged icon for Movies & TV." into oc-dev am: 9a5bac7d5a

Browse Source 
am: a3349519d5

Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
This commit is contained in:
Daniel Nishi
2017-05-11 00:52:07 +00:00
committed by android-build-merger
parent 7932d5a66f a3349519d5
commit 2c00b770eb
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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