Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b5913ba authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "Shows "This device" for default internal storage" into sc-dev

parents 87093d40 07dc4fe7

src/com/android/settings/deviceinfo/storage/StorageEntry.java

+11 −2
Original line number Diff line number Diff line
@@ -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;

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

+13 −0
Original line number Diff line number Diff line
@@ -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);