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 am: e7e25f12f1 am: 766ddfce34

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

Change-Id: Ie925d28907b45da43cb43391ddd39c65ef342d00
This commit is contained in:
Arc Wang
2021-05-21 07:12:35 +00:00
committed by Automerger Merge Worker
parent 1d84be534f 766ddfce34
commit c60e8c41a4
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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,8 +46,15 @@ public class StorageEntry implements Comparable<StorageEntry>, Parcelable {
mVolumeInfo = volumeInfo;
mUnsupportedDiskInfo = 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) {