Storage wizard string changes per UX request.

Bug: 77207119
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I93adf01442d006927c792db405d8cf73c963dd40

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef02a10..b24d763 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3248,9 +3248,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: -->

diff --git a/src/com/android/settings/deviceinfo/StorageWizardReady.java b/src/com/android/settings/deviceinfo/StorageWizardReady.java
index 55f4ba1..c5c4ca2 100644 (file)
--- a/src/com/android/settings/deviceinfo/StorageWizardReady.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardReady.java
@@ -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());