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

Merge "Shows "This device" for default internal storage" into sc-dev am: 8b5913ba18

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609996

Change-Id: I227b20c455ef1fc7792cb7e92d6cf325f043503c
This commit is contained in:
Arc Wang
2021-05-21 06:36:34 +00:00
committed by Automerger Merge Worker
parent 305520fe25 8b5913ba18
commit e7e25f12f1
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/deviceinfo/storage/StorageEntry.java
View File

@@ -26,6 +26,8 @@ import android.os.storage.VolumeInfo;
import android.os.storage.VolumeRecord;
import android.text.TextUtils;
import com.android.settings.R;
import java.io.File;
/**
@@ -44,9 +46,16 @@ public class StorageEntry implements Comparable<StorageEntry>, Parcelable {
mVolumeInfo = volumeInfo;
mUnsupportedDiskInfo = null;
mMissingVolumeRecord = null;
if (isDefaultInternalStorage()) {
// Shows "This device" for default internal storage.
mVolumeInfoDescription = context.getResources()
.getString(R.string.storage_default_internal_storage);
} else {
mVolumeInfoDescription = context.getSystemService(StorageManager.class)
.getBestVolumeDescription(mVolumeInfo);
}
}
public StorageEntry(@NonNull DiskInfo diskInfo) {
mVolumeInfo = null;

13
tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java
View File

@@ -31,6 +31,8 @@ import android.os.storage.VolumeRecord;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.runner.AndroidJUnit4;
import com.android.settings.testutils.ResourcesUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -246,6 +248,17 @@ public class StorageEntryTest {
assertThat(recordStorage.getDescription()).isEqualTo(description);
}
@Test
public void getDescription_defaultInternalStorage_returnThisDevice() {
final VolumeInfo volumeInfo = mock(VolumeInfo.class);
when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
when(volumeInfo.getId()).thenReturn(VolumeInfo.ID_PRIVATE_INTERNAL);
final StorageEntry volumeStorage = new StorageEntry(mContext, volumeInfo);
assertThat(volumeStorage.getDescription()).isEqualTo(
ResourcesUtils.getResourcesString(mContext, "storage_default_internal_storage"));
}
@Test
public void getDiskId_shouldReturnDiskId() {
final VolumeInfo volumeInfo = mock(VolumeInfo.class);