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

Merge "Storage wizard string changes per UX request." into pi-dev am: 290edd0b73

Browse Source 
am: 1e916920c5

Change-Id: Ie66f1e4d6daa98640e7e56efb7862be0d1c18914
This commit is contained in:
Jeff Sharkey
2018-04-14 20:41:12 -07:00
committed by android-build-merger
parent 3ddbaf439a 1e916920c5
commit 25fe7a27b5
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/deviceinfo/StorageWizardReady.java
View File

@@ -36,10 +36,14 @@ public class StorageWizardReady extends StorageWizardBase {
setHeaderText(R.string.storage_wizard_ready_title, mDisk.getShortDescription());
final VolumeInfo privateVol = findFirstVolume(VolumeInfo.TYPE_PRIVATE);
final boolean migrateSkip = getIntent().getBooleanExtra(EXTRA_MIGRATE_SKIP, false);
if (privateVol != null && !migrateSkip) {
setBodyText(R.string.storage_wizard_ready_v2_internal_body,
mDisk.getDescription(), mDisk.getShortDescription());
if (privateVol != null) {
if (getIntent().getBooleanExtra(EXTRA_MIGRATE_SKIP, false)) {
setBodyText(R.string.storage_wizard_ready_v2_internal_body,
mDisk.getDescription());
} else {
setBodyText(R.string.storage_wizard_ready_v2_internal_moved_body,
mDisk.getDescription(), mDisk.getShortDescription());
}
} else {
setBodyText(R.string.storage_wizard_ready_v2_external_body,
mDisk.getDescription());