Merge "AOD: Ambient display settings to dedicated settings screen"

This commit is contained in:
Adrian Roos
2017-05-31 04:25:38 +00:00
committed by Android (Google) Code Review
14 changed files with 402 additions and 68 deletions

View File

@@ -258,7 +258,7 @@ public class DatabaseIndexingManagerTest {
SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
assertThat(cursor.getCount()).isEqualTo(19);
assertThat(cursor.getCount()).isEqualTo(16);
}
@Test
@@ -273,7 +273,7 @@ public class DatabaseIndexingManagerTest {
Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
assertThat(cursor.getCount()).isEqualTo(2);
cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
assertThat(cursor.getCount()).isEqualTo(17);
assertThat(cursor.getCount()).isEqualTo(14);
}
@Test