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

Merge "Split Documents&Other" into main

Browse Source
This commit is contained in:
Aleksandr Lukin
2024-04-08 09:50:11 +00:00
committed by Android (Google) Code Review
parent 909c61d27a 67835caf33
commit 84bdea6756
10 changed files with 165 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageCacheHelperTest.java
View File

@@ -36,6 +36,7 @@ public class StorageCacheHelperTest {
private static final long FAKE_APPS_SIZE = 4000L;
private static final long FAKE_GAMES_SIZE = 5000L;
private static final long FAKE_DOCS_SIZE = 1500L;
private static final long FAKE_OTHER_SIZE = 2000L;
private static final long FAKE_TRASH_SIZE = 500L;
private static final long FAKE_SYSTEM_SIZE = 2300L;
private static final long FAKE_TOTAL_SIZE = 256000L;
@@ -72,6 +73,8 @@ public class StorageCacheHelperTest {
assertThat(storageCache.imagesSize).isEqualTo(FAKE_IMAGES_SIZE);
assertThat(storageCache.temporaryFilesSize).isEqualTo(FAKE_TEMPORARY_FILES_SIZE);
assertThat(storageCache.documentsSize).isEqualTo(FAKE_DOCS_SIZE);
assertThat(storageCache.otherSize).isEqualTo(FAKE_OTHER_SIZE);
assertThat(storageCache.totalSize).isEqualTo(0);
}
@@ -97,7 +100,8 @@ public class StorageCacheHelperTest {
result.trashSize = FAKE_TRASH_SIZE;
result.systemSize = FAKE_SYSTEM_SIZE;
result.imagesSize = FAKE_IMAGES_SIZE;
result.documentsAndOtherSize = FAKE_DOCS_SIZE;
result.documentsSize = FAKE_DOCS_SIZE;
result.otherSize = FAKE_OTHER_SIZE;
result.audioSize = FAKE_AUDIO_SIZE;
result.gamesSize = FAKE_GAMES_SIZE;
result.videosSize = FAKE_VIDEOS_SIZE;

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

@@ -124,8 +124,10 @@ public class StorageItemPreferenceControllerTest {
apps.setIcon(R.drawable.ic_storage_apps);
final StorageItemPreference games = spy(new StorageItemPreference(mContext));
games.setIcon(R.drawable.ic_videogame_vd_theme_24);
final StorageItemPreference documentsAndOther = spy(new StorageItemPreference(mContext));
documentsAndOther.setIcon(R.drawable.ic_folder_vd_theme_24);
final StorageItemPreference documents = spy(new StorageItemPreference(mContext));
documents.setIcon(R.drawable.ic_folder_vd_theme_24);
final StorageItemPreference other = spy(new StorageItemPreference(mContext));
other.setIcon(R.drawable.ic_category_vd_theme_24);
final StorageItemPreference system = spy(new StorageItemPreference(mContext));
system.setIcon(R.drawable.ic_android_vd_theme_24);
final StorageItemPreference temporaryFiles = spy(new StorageItemPreference(mContext));
@@ -147,8 +149,10 @@ public class StorageItemPreferenceControllerTest {
.thenReturn(apps);
when(screen.findPreference(eq(StorageItemPreferenceController.GAMES_KEY)))
.thenReturn(games);
when(screen.findPreference(eq(StorageItemPreferenceController.DOCUMENTS_AND_OTHER_KEY)))
.thenReturn(documentsAndOther);
when(screen.findPreference(eq(StorageItemPreferenceController.DOCUMENTS_KEY)))
.thenReturn(documents);
when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_KEY)))
.thenReturn(other);
when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
.thenReturn(system);
when(screen.findPreference(eq(StorageItemPreferenceController.TEMPORARY_FILES_KEY)))
@@ -225,7 +229,8 @@ public class StorageItemPreferenceControllerTest {
assertThat(mController.mAudioPreference.isVisible()).isFalse();
assertThat(mController.mAppsPreference.isVisible()).isFalse();
assertThat(mController.mGamesPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsPreference.isVisible()).isFalse();
assertThat(mController.mOtherPreference.isVisible()).isFalse();
assertThat(mController.mSystemPreference.isVisible()).isFalse();
assertThat(mController.mTemporaryFilesPreference.isVisible()).isFalse();
assertThat(mController.mTrashPreference.isVisible()).isFalse();
@@ -278,8 +283,8 @@ public class StorageItemPreferenceControllerTest {
}
@Test
public void launchDocumentsAndOtherIntent_resolveActionViewNull_settingsIntent() {
mPreference.setKey(StorageItemPreferenceController.DOCUMENTS_AND_OTHER_KEY);
public void launchDocumentsIntent_resolveActionViewNull_settingsIntent() {
mPreference.setKey(StorageItemPreferenceController.DOCUMENTS_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
mSvp, ProfileSelectFragment.ProfileType.PERSONAL);
@@ -291,7 +296,24 @@ public class StorageItemPreferenceControllerTest {
Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
assertThat(intent.getData()).isEqualTo(mController.mDocumentsAndOtherUri);
assertThat(intent.getData()).isEqualTo(mController.mDocumentsUri);
}
@Test
public void launchOtherIntent_resolveActionViewNull_settingsIntent() {
mPreference.setKey(StorageItemPreferenceController.OTHER_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
mSvp, ProfileSelectFragment.ProfileType.PERSONAL);
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mockContext).startActivityAsUser(argumentCaptor.capture(),
nullable(UserHandle.class));
Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
assertThat(intent.getData()).isEqualTo(mController.mOtherUri);
}
@Test
@@ -359,7 +381,8 @@ public class StorageItemPreferenceControllerTest {
result.imagesSize = MEGABYTE_IN_BYTES * 350;
result.videosSize = GIGABYTE_IN_BYTES * 30;
result.audioSize = MEGABYTE_IN_BYTES * 40;
result.documentsAndOtherSize = MEGABYTE_IN_BYTES * 50;
result.documentsSize = MEGABYTE_IN_BYTES * 50;
result.otherSize = MEGABYTE_IN_BYTES * 70;
result.trashSize = KILOBYTE_IN_BYTES * 100;
result.allAppsExceptGamesSize = MEGABYTE_IN_BYTES * 90;
result.systemSize = MEGABYTE_IN_BYTES * 60;
@@ -373,8 +396,8 @@ public class StorageItemPreferenceControllerTest {
assertThat(mController.mAudioPreference.getSummary().toString()).isEqualTo("40 MB");
assertThat(mController.mAppsPreference.getSummary().toString()).isEqualTo("90 MB");
assertThat(mController.mGamesPreference.getSummary().toString()).isEqualTo("80 MB");
assertThat(mController.mDocumentsAndOtherPreference.getSummary().toString())
.isEqualTo("50 MB");
assertThat(mController.mDocumentsPreference.getSummary().toString()).isEqualTo("50 MB");
assertThat(mController.mOtherPreference.getSummary().toString()).isEqualTo("70 MB");
assertThat(mController.mTrashPreference.getSummary().toString()).isEqualTo("100 kB");
assertThat(mController.mSystemPreference.getSummary().toString())
.isEqualTo("60 MB");
@@ -392,8 +415,8 @@ public class StorageItemPreferenceControllerTest {
verify(mController.mAudioPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mAppsPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mGamesPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mDocumentsAndOtherPreference, times(2))
.setIcon(nullable(Drawable.class));
verify(mController.mDocumentsPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mOtherPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mSystemPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mTemporaryFilesPreference, times(2)).setIcon(nullable(Drawable.class));
verify(mController.mTrashPreference, times(2)).setIcon(nullable(Drawable.class));
@@ -408,7 +431,8 @@ public class StorageItemPreferenceControllerTest {
mController.displayPreference(mPreferenceScreen);
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isTrue();
assertThat(mController.mDocumentsPreference.isVisible()).isTrue();
assertThat(mController.mOtherPreference.isVisible()).isTrue();
}
@Test
@@ -423,7 +447,8 @@ public class StorageItemPreferenceControllerTest {
mController.setPrivateStorageCategoryPreferencesVisibility(true);
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsPreference.isVisible()).isFalse();
assertThat(mController.mOtherPreference.isVisible()).isFalse();
}
@Test
@@ -438,7 +463,8 @@ public class StorageItemPreferenceControllerTest {
// And we bring it back.
mController.setVolume(mVolume);
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isTrue();
assertThat(mController.mDocumentsPreference.isVisible()).isTrue();
assertThat(mController.mOtherPreference.isVisible()).isTrue();
}
@Test
@@ -458,7 +484,8 @@ public class StorageItemPreferenceControllerTest {
assertThat(mController.mAudioPreference.isVisible()).isFalse();
assertThat(mController.mAppsPreference.isVisible()).isFalse();
assertThat(mController.mGamesPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsAndOtherPreference.isVisible()).isFalse();
assertThat(mController.mDocumentsPreference.isVisible()).isFalse();
assertThat(mController.mOtherPreference.isVisible()).isFalse();
assertThat(mController.mSystemPreference.isVisible()).isFalse();
assertThat(mController.mTemporaryFilesPreference.isVisible()).isFalse();
assertThat(mController.mTrashPreference.isVisible()).isFalse();