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

Merge "Fix the description under timeout isn't translated completely"

Browse Source
This commit is contained in:
Jason Chang
2020-07-17 06:18:12 +00:00
committed by Android (Google) Code Review
parent 7595874e63 9cfe959a23
commit 8ece863482
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -10922,8 +10922,6 @@
<string name="one_handed_timeout_medium">8 seconds</string> <string name="one_handed_timeout_medium">8 seconds</string>
<!-- Timeout(Long) title for one handed [CHAR LIMIT=60] --> <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->
<string name="one_handed_timeout_long">12 seconds</string> <string name="one_handed_timeout_long">12 seconds</string>
<!-- Timeout summary [CHAR LIMIT=60] -->
<string name="one_handed_timeout_summary"><xliff:g id="timeout" example="4 seconds">After %1$s of inactivity</xliff:g></string>
<!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] --> <!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] -->
<string name="keywords_one_handed">reachability</string> <string name="keywords_one_handed">reachability</string>

2
src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
View File

@@ -87,7 +87,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
return mContext.getResources().getString(R.string.screensaver_settings_summary_never); return mContext.getResources().getString(R.string.screensaver_settings_summary_never);
} }
return String.format(mContext.getResources().getString( return String.format(mContext.getResources().getString(
R.string.one_handed_timeout_summary), mTimeoutMap.get(getTimeoutValue())); R.string.screen_timeout_summary), mTimeoutMap.get(getTimeoutValue()));
} }
@Override @Override

2
tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
View File

@@ -103,7 +103,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()); OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
assertThat(mController.getSummary()).isEqualTo(String.format( assertThat(mController.getSummary()).isEqualTo(String.format(
mContext.getResources().getString(R.string.one_handed_timeout_summary), mContext.getResources().getString(R.string.screen_timeout_summary),
timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()])); timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));
} }
} }