diff --git a/res/values/strings.xml b/res/values/strings.xml index 109846290d3..d0ad58a0d80 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3588,6 +3588,8 @@ Format SD card for portable storage Store photos, videos, music, and more and access them from other devices. <a href="https://support.google.com/android/answer/12153449">Learn more about setting up an SD card</a>. + + Store photos, videos, music, and more and access them from other devices. Format @@ -3601,7 +3603,7 @@ This ^1 needs to be formatted to store photos, videos, music, and more. \n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device. - + Format ^1 diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java index b912ffe4958..17ab4e73d4f 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardInit.java +++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java @@ -76,8 +76,11 @@ public class StorageWizardInit extends StorageWizardBase { } if(mPortable) { mFlipper.setDisplayedChild(0); - setHeaderText(R.string.storage_wizard_init_v2_external_title, - getDiskShortDescription()); + setHeaderText( + ((mDisk != null) && mDisk.isSd()) + ? R.string.storage_wizard_init_v2_external_title + : R.string.storage_wizard_format_confirm_v2_action, + getDiskShortDescription()); setNextButtonText(R.string.storage_wizard_init_v2_external_action); setBackButtonText(R.string.wizard_back_adoptable); setNextButtonVisibility(View.VISIBLE); @@ -104,8 +107,11 @@ public class StorageWizardInit extends StorageWizardBase { v.setEnabled(false); } else if (mPortable == false) { mFlipper.showNext(); - setHeaderText(R.string.storage_wizard_init_v2_external_title, - getDiskShortDescription()); + setHeaderText( + ((mDisk != null) && mDisk.isSd()) + ? R.string.storage_wizard_init_v2_external_title + : R.string.storage_wizard_format_confirm_v2_action, + getDiskShortDescription()); setNextButtonText(R.string.storage_wizard_init_v2_external_action); setBackButtonText(R.string.wizard_back_adoptable); setBackButtonVisibility(View.VISIBLE); @@ -151,8 +157,10 @@ public class StorageWizardInit extends StorageWizardBase { private void setupHyperlink() { TextView external_storage_textview = findViewById(R.id.storage_wizard_init_external_text); TextView internal_storage_textview = findViewById(R.id.storage_wizard_init_internal_text); - String external_storage_text = getResources().getString(R.string. - storage_wizard_init_v2_external_summary); + String external_storage_text = getResources().getString( + ((mDisk != null) && mDisk.isSd()) + ? R.string.storage_wizard_init_v2_external_summary + : R.string.storage_wizard_init_v2_external_summary_non_sd_card); String internal_storage_text = getResources().getString(R.string. storage_wizard_init_v2_internal_summary); @@ -193,4 +201,4 @@ public class StorageWizardInit extends StorageWizardBase { || event.getY() > v.getMeasuredHeight()); } }; -} \ No newline at end of file +}