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

Commit 290edd0b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Storage wizard string changes per UX request." into pi-dev

parents 20bb2edd a4c79279

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -3252,9 +3252,11 @@ 
    <string name="storage_wizard_slow_v2_continue">Continue</string>















    <!-- Title of a full-screen message. This text lets the user know how to manage the storage device moving forward. The placeholder is for the name of the device (e.g. brand name of the SD card). [CHAR LIMIT=NONE] -->













    <string name="storage_wizard_ready_v2_external_body">To move content to <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>, go to <b>Settings > Storage</b></string>













    <string name="storage_wizard_ready_v2_external_body">You can move content to <xliff:g id="name" example="SanDisk SD card">^1</xliff:g></string>















    <!-- Title of a full-screen message. This text lets the user know that their content was moved to their storage device and how to manage the storage device moving forward. The placeholder is for the name of the device (e.g. brand name of the SD card). [CHAR LIMIT=NONE] -->













    <string name="storage_wizard_ready_v2_internal_body">Your content was moved to <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>.













    <string name="storage_wizard_ready_v2_internal_body">To move content to <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>, go to <b>Settings > Storage</b></string>













    <!-- Title of a full-screen message. This text lets the user know that their content was moved to their storage device and how to manage the storage device moving forward. The placeholder is for the name of the device (e.g. brand name of the SD card). [CHAR LIMIT=NONE] -->













    <string name="storage_wizard_ready_v2_internal_moved_body">Your content was moved to <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>.















\n\nTo manage this <xliff:g id="name" example="SD card">^2</xliff:g>, go to <b>Settings > Storage</b>.</string>





























    <!-- Phone info screen, section titles: -->

































src/com/android/settings/deviceinfo/StorageWizardReady.java



+8
−4




























Original line number
Diff line number
Diff line








@@ -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) {













        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());