Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a filter for audio apps."

Browse Source
This commit is contained in:
Daniel Nishi
2017-02-01 21:01:51 +00:00
committed by Android (Google) Code Review
parent edae71777f 7e33682338
commit 646f500315
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

@@ -1489,4 +1489,19 @@ public class ApplicationsState {
return mFirstFilter.filterApp(info) && mSecondFilter.filterApp(info);
}
}
public static final AppFilter FILTER_AUDIO = new AppFilter() {
@Override
public void init() {
}
@Override
public boolean filterApp(AppEntry entry) {
boolean isMusicApp;
synchronized(entry) {
isMusicApp = entry.info.category == ApplicationInfo.CATEGORY_AUDIO;
}
return isMusicApp;
}
};
}

31
packages/SettingsLib/tests/integ/src/com/android/settingslib/applications/ApplicationsStateTest.java
View File

@@ -29,12 +29,10 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class ApplicationsStateTest {
private ApplicationsState.AppFilter mFilter;
private ApplicationsState.AppEntry mEntry;
@Before
public void setUp() {
mFilter = ApplicationsState.FILTER_GAMES;
mEntry = mock(ApplicationsState.AppEntry.class);
mEntry.info = mock(ApplicationInfo.class);
}
@@ -43,14 +41,14 @@ public class ApplicationsStateTest {
public void testGamesFilterAcceptsGameDeprecated() {
mEntry.info.flags = ApplicationInfo.FLAG_IS_GAME;
assertThat(mFilter.filterApp(mEntry)).isTrue();
assertThat(ApplicationsState.FILTER_GAMES.filterApp(mEntry)).isTrue();
}
@Test
public void testGameFilterAcceptsCategorizedGame() {
mEntry.info.category = ApplicationInfo.CATEGORY_GAME;
assertThat(mFilter.filterApp(mEntry)).isTrue();
assertThat(ApplicationsState.FILTER_GAMES.filterApp(mEntry)).isTrue();
}
@Test
@@ -58,13 +56,34 @@ public class ApplicationsStateTest {
mEntry.info.flags = ApplicationInfo.FLAG_IS_GAME;
mEntry.info.category = ApplicationInfo.CATEGORY_GAME;
assertThat(mFilter.filterApp(mEntry)).isTrue();
assertThat(ApplicationsState.FILTER_GAMES.filterApp(mEntry)).isTrue();
}
@Test
public void testGamesFilterRejectsNotGame() {
mEntry.info.category = ApplicationInfo.CATEGORY_UNDEFINED;
assertThat(mFilter.filterApp(mEntry)).isFalse();
assertThat(ApplicationsState.FILTER_GAMES.filterApp(mEntry)).isFalse();
}
@Test
public void testAudioFilterAcceptsCategorizedAudio() {
mEntry.info.category = ApplicationInfo.CATEGORY_AUDIO;
assertThat(ApplicationsState.FILTER_AUDIO.filterApp(mEntry)).isTrue();
}
@Test
public void testAudiosFilterRejectsNotAudio() {
mEntry.info.category = ApplicationInfo.CATEGORY_GAME;
assertThat(ApplicationsState.FILTER_AUDIO.filterApp(mEntry)).isFalse();
}
@Test
public void testAudiosFilterRejectsDefaultCategory() {
mEntry.info.category = ApplicationInfo.CATEGORY_UNDEFINED;
assertThat(ApplicationsState.FILTER_AUDIO.filterApp(mEntry)).isFalse();
}
}