Shows "This device" for default internal storage
Bug: 188492974 Test: atest StorageEntryTest Change-Id: I7278ff604f22acafd47cef2f5d613a2bf9f0e371
This commit is contained in:
@@ -26,6 +26,8 @@ import android.os.storage.VolumeInfo;
|
|||||||
import android.os.storage.VolumeRecord;
|
import android.os.storage.VolumeRecord;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -44,8 +46,15 @@ public class StorageEntry implements Comparable<StorageEntry>, Parcelable {
|
|||||||
mVolumeInfo = volumeInfo;
|
mVolumeInfo = volumeInfo;
|
||||||
mUnsupportedDiskInfo = null;
|
mUnsupportedDiskInfo = null;
|
||||||
mMissingVolumeRecord = null;
|
mMissingVolumeRecord = null;
|
||||||
mVolumeInfoDescription = context.getSystemService(StorageManager.class)
|
|
||||||
.getBestVolumeDescription(mVolumeInfo);
|
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) {
|
public StorageEntry(@NonNull DiskInfo diskInfo) {
|
||||||
|
@@ -31,6 +31,8 @@ import android.os.storage.VolumeRecord;
|
|||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
import androidx.test.runner.AndroidJUnit4;
|
import androidx.test.runner.AndroidJUnit4;
|
||||||
|
|
||||||
|
import com.android.settings.testutils.ResourcesUtils;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
@@ -246,6 +248,17 @@ public class StorageEntryTest {
|
|||||||
assertThat(recordStorage.getDescription()).isEqualTo(description);
|
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
|
@Test
|
||||||
public void getDiskId_shouldReturnDiskId() {
|
public void getDiskId_shouldReturnDiskId() {
|
||||||
final VolumeInfo volumeInfo = mock(VolumeInfo.class);
|
final VolumeInfo volumeInfo = mock(VolumeInfo.class);
|
||||||
|
Reference in New Issue
Block a user