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

Merge "Fix Settings/Storage "Format USB drive" title string" into main

Browse Source
This commit is contained in:
Nigel Tao
2025-03-07 14:58:24 -08:00
committed by Android (Google) Code Review
parent ea342bbd82 7d5c3dc764
commit 7a81ed89fa
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -3588,6 +3588,8 @@
<string name="storage_wizard_init_v2_external_title">Format SD card for portable storage</string>
<!-- Subtext for a line item. Below this subtext, a user can tap a button to select this option if they want to use their SD card as portable device storage. [CHAR LIMIT=NONE] -->
<string name="storage_wizard_init_v2_external_summary">Store photos, videos, music, and more and access them from other devices. &lt;a href="https://support.google.com/android/answer/12153449"&gt;Learn more about setting up an SD card&lt;/a&gt;.</string>
<!-- Subtext for a line item. Below this subtext, a user can tap a button to select this option if they want to use their USB drive as portable device storage. [CHAR LIMIT=NONE] -->
<string name="storage_wizard_init_v2_external_summary_non_sd_card">Store photos, videos, music, and more and access them from other devices.</string>
<!-- Button text. A user can tap this button if they want to use their SD card as portable device storage. [CHAR LIMIT=32] -->
<string name="storage_wizard_init_v2_external_action">Format</string>
<!-- Button text. A user can tap this button if they want to delay setting up their SD card until a later time. [CHAR LIMIT=32] -->
@@ -3601,7 +3603,7 @@
<!-- Body of a dialog. This text is confirming that the user wants to use their SD card as portable storage, but the formatting process will erase existing content on the card. The first placeholder is for the name of the device (e.g. a brand name of the SD card or USB drive). The second and third placeholders are for the general references (e.g. SD card, USB drive). [CHAR LIMIT=NONE] -->
<string name="storage_wizard_format_confirm_v2_body_external">This <xliff:g id="name" example="SanDisk SD card">^1</xliff:g> needs to be formatted to store photos, videos, music, and more.
\n\nFormatting will erase existing content on the <xliff:g id="name" example="SD card">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="name" example="SD card">^3</xliff:g> or device.</string>
<!-- Button text. If a user taps this button, their SD card or USB device will be formatted and used as extra phone storage. The placeholder is for the specific device (e.g. SD card, USB drive, etc.). [CHAR LIMIT=16] -->
<!-- Button or title text. If a user taps this button, their SD card or USB device will be formatted and used as extra phone storage. The placeholder is for the specific device (e.g. SD card, USB drive, etc.). [CHAR LIMIT=16] -->
<string name="storage_wizard_format_confirm_v2_action">Format <xliff:g id="name" example="SD card">^1</xliff:g></string>
<!-- Title of a full-screen message. This string is confirming that a user wants to move their content to the storage device. They can press a button at the bottom of the screen to move their content. The placeholder is for the specific device (e.g. SD card, USB drive, etc.). [CHAR LIMIT=32] -->

22
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

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