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

Merge "Fix grammar issue with all set page subtitle" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-04-08 09:57:13 -07:00
committed by Android (Google) Code Review
parent b1e5175b76 02d9e5043a
commit 1f4ee92d18
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/res/values/strings.xml
+3 -3
View File
@@ -219,10 +219,10 @@
<string name="allset_hint">Swipe up to go home</string>
<!-- Hint string at the bottom of "All Set" page for button navigation [CHAR LIMIT=NONE] -->
<string name="allset_button_hint">Tap the home button to go to your home screen</string>
<!-- Description of "All Set" page on the user's device [CHAR LIMIT=NONE] -->
<!-- Description of "All Set" page on the user's device when their device name is provided [CHAR LIMIT=NONE] -->
<string name="allset_description_generic">You\u2019re ready to start using your <xliff:g id="device" example="Pixel 6">%1$s</xliff:g></string>
<!-- A default device name to use in the description of the "All Set" page [CHAR LIMIT=NONE] -->
<string name="default_device_name">device</string>
<!-- Description of "All Set" page on the user's device when no device name is provided [CHAR LIMIT=NONE] -->
<string name="allset_description_fallback">You\u2019re ready to start using your device</string>
<!-- String linking to navigation settings on "All Set" page [CHAR LIMIT=NONE] -->
<string name="allset_navigation_settings"><annotation id="link">System navigation settings</annotation></string>
quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+3 -4
View File
@@ -171,10 +171,9 @@ public class AllSetActivity extends Activity {
TextView subtitle = findViewById(R.id.subtitle);
String suwDeviceName = intent.getStringExtra(EXTRA_DEVICE_NAME);
subtitle.setText(getString(
R.string.allset_description_generic,
!TextUtils.isEmpty(suwDeviceName)
? suwDeviceName : getString(R.string.default_device_name)));
subtitle.setText(TextUtils.isEmpty(suwDeviceName)
? getString(R.string.allset_description_fallback)
: getString(R.string.allset_description_generic, suwDeviceName));
TextView settings = findViewById(R.id.navigation_settings);
settings.setTextColor(accentColor);