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

Browse Source 
am: 9a5bac7d5a

Change-Id: I59cea940381aa360be456c44afb36c58964c3065
This commit is contained in:
Daniel Nishi
2017-05-11 00:18:53 +00:00
committed by android-build-merger
parent bdba7ab697 9a5bac7d5a
commit a3349519d5
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/xml/storage_profile_fragment.xml
View File

@@ -35,15 +35,18 @@
android:order="4" /> android:order="4" />
<com.android.settings.deviceinfo.StorageItemPreference <com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_movies" 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 <com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_other_apps" android:key="pref_other_apps"
android:title="@string/storage_other_apps" android:title="@string/storage_other_apps"
android:icon="@drawable/ic_apps_vd_theme_24" android:icon="@drawable/ic_apps_vd_theme_24"
android:order="5" /> android:order="6" />
<com.android.settings.deviceinfo.StorageItemPreference <com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_files" android:key="pref_files"
android:title="@string/storage_files" android:title="@string/storage_files"
android:icon="@drawable/ic_folder_vd_theme_24" android:icon="@drawable/ic_folder_vd_theme_24"
android:order="6" /> android:order="7" />
</PreferenceScreen> </PreferenceScreen>

1
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -196,6 +196,7 @@ public class StorageItemPreferenceController extends PreferenceController {
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
badgePreference(pm, userHandle, mPhotoPreference); badgePreference(pm, userHandle, mPhotoPreference);
badgePreference(pm, userHandle, mMoviesPreference);
badgePreference(pm, userHandle, mAudioPreference); badgePreference(pm, userHandle, mAudioPreference);
badgePreference(pm, userHandle, mGamePreference); badgePreference(pm, userHandle, mGamePreference);
badgePreference(pm, userHandle, mAppPreference); badgePreference(pm, userHandle, mAppPreference);

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

@@ -298,6 +298,8 @@ public class StorageItemPreferenceControllerTest {
public void settingUserIdAppliesNewIcons() { public void settingUserIdAppliesNewIcons() {
StorageItemPreference audio = spy(new StorageItemPreference(mContext)); StorageItemPreference audio = spy(new StorageItemPreference(mContext));
audio.setIcon(R.drawable.ic_photo_library_vd_theme_24); 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)); StorageItemPreference image = spy(new StorageItemPreference(mContext));
image.setIcon(R.drawable.ic_photo_library_vd_theme_24); image.setIcon(R.drawable.ic_photo_library_vd_theme_24);
StorageItemPreference games = spy(new StorageItemPreference(mContext)); StorageItemPreference games = spy(new StorageItemPreference(mContext));
@@ -311,6 +313,8 @@ public class StorageItemPreferenceControllerTest {
PreferenceScreen screen = mock(PreferenceScreen.class); PreferenceScreen screen = mock(PreferenceScreen.class);
when(screen.findPreference( when(screen.findPreference(
eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio); eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
when(screen.findPreference(
eq(StorageItemPreferenceController.MOVIES_KEY))).thenReturn(video);
when(screen.findPreference( when(screen.findPreference(
eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image); eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);
when(screen.findPreference( when(screen.findPreference(
@@ -326,6 +330,7 @@ public class StorageItemPreferenceControllerTest {
mController.setUserId(new UserHandle(10)); mController.setUserId(new UserHandle(10));
verify(audio, times(2)).setIcon(any(Drawable.class)); 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(image, times(2)).setIcon(any(Drawable.class));
verify(games, times(2)).setIcon(any(Drawable.class)); verify(games, times(2)).setIcon(any(Drawable.class));
verify(apps, times(2)).setIcon(any(Drawable.class)); verify(apps, times(2)).setIcon(any(Drawable.class));