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

Find graceful description when missing disk.

Browse Source 
Certain volumes (like internal storage) don't have a corresponding
DiskInfo object, so we need to fall back to using the VolumeInfo
description instead.

Bug: 77991425
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I92d377035b6028dd31527100da54bfb1d1828ae9
This commit is contained in:
Jeff Sharkey
2018-04-19 09:45:29 -06:00
parent 68ef601059
commit d98de2e2da
6 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/StorageWizardFormatSlow.java
View File

@@ -39,10 +39,10 @@ public class StorageWizardFormatSlow extends StorageWizardBase {
mFormatPrivate = getIntent().getBooleanExtra(EXTRA_FORMAT_PRIVATE, false);
setHeaderText(R.string.storage_wizard_slow_v2_title, mDisk.getShortDescription());
setBodyText(R.string.storage_wizard_slow_v2_body, mDisk.getDescription(),
mDisk.getShortDescription(), mDisk.getShortDescription(),
mDisk.getShortDescription());
setHeaderText(R.string.storage_wizard_slow_v2_title, getDiskShortDescription());
setBodyText(R.string.storage_wizard_slow_v2_body, getDiskDescription(),
getDiskShortDescription(), getDiskShortDescription(),
getDiskShortDescription());
setBackButtonText(R.string.storage_wizard_slow_v2_start_over);
setNextButtonText(R.string.storage_wizard_slow_v2_continue);