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

Update new string for One-Handed feature

Browse Source 
According One-handed mode string review doc to change strings.

Bug: 151993111

Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.gestures.OneHandedTimeoutPreferenceControllerTest"

Change-Id: I7dc961387c1e14b25438e051ce6b1cc70fb59417
This commit is contained in:
Jason Chang
2020-05-15 19:27:44 +08:00
parent 123bcc41c9
commit cc35ece032
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/values/strings.xml
View File

@@ -10845,20 +10845,22 @@
<!-- Preference and settings suggestion title text for ambient display double tap (device) [CHAR LIMIT=60]--> <!-- Preference and settings suggestion title text for ambient display double tap (device) [CHAR LIMIT=60]-->
<string name="ambient_display_title" product="device">Double-tap to check device</string> <string name="ambient_display_title" product="device">Double-tap to check device</string>
<!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] -->
<string name="one_handed_title" product="default" translatable="false">One-Handed</string> <string name="one_handed_title">One-Handed mode</string>
<!-- Preference Switch for enabling one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Preference Switch for enabling one handed [CHAR LIMIT=60] -->
<string name="one_handed_mode_enabled" product="default" translatable="false">Enable one-handed mode</string> <string name="one_handed_mode_enabled">Use one-handed mode</string>
<!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] -->
<string name="one_handed_app_taps_to_exit" product="default" translatable="false">Activity launch to exit</string> <string name="one_handed_app_taps_to_exit">Exit when switching apps</string>
<!-- Timeout(Never) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Timeout(Never) title for one handed [CHAR LIMIT=60] -->
<string name="one_handed_timeout_title" product="default" translatable="false">Timeout</string> <string name="one_handed_timeout_title">Timeout</string>
<!-- Timeout(Short) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Timeout(Short) title for one handed [CHAR LIMIT=60] -->
<string name="one_handed_timeout_short" product="default" translatable="false">4 seconds</string> <string name="one_handed_timeout_short">4 seconds</string>
<!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] -->
<string name="one_handed_timeout_medium" product="default" translatable="false">8 seconds</string> <string name="one_handed_timeout_medium">8 seconds</string>
<!-- Timeout(Long) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]--> <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->
<string name="one_handed_timeout_long" product="default" translatable="false">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>
<!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]--> <!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]-->
<string name="ambient_display_summary">To check time, notifications, and other info, double-tap your screen.</string> <string name="ambient_display_summary">To check time, notifications, and other info, double-tap your screen.</string>

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

@@ -83,7 +83,11 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mTimeoutMap.get(getTimeoutValue()); if (OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext) == 0) {
return mContext.getResources().getString(R.string.screensaver_settings_summary_never);
}
return String.format(mContext.getResources().getString(
R.string.one_handed_timeout_summary), mTimeoutMap.get(getTimeoutValue()));
} }
@Override @Override

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

@@ -83,7 +83,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
} }
@Test @Test
public void getSummary_setTimeout_shouldReturnSummary() { public void getSummary_setTimeoutNever_shouldReturnNeverSummary() {
final String[] timeoutTitles = mContext.getResources().getStringArray( final String[] timeoutTitles = mContext.getResources().getStringArray(
R.array.one_handed_timeout_title); R.array.one_handed_timeout_title);
@@ -92,11 +92,18 @@ public class OneHandedTimeoutPreferenceControllerTest {
assertThat(mController.getSummary()).isEqualTo( assertThat(mController.getSummary()).isEqualTo(
timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.NEVER.ordinal()]); timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.NEVER.ordinal()]);
}
@Test
public void getSummary_setTimeoutShort_shouldReturnShortSummary() {
final String[] timeoutTitles = mContext.getResources().getStringArray(
R.array.one_handed_timeout_title);
OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()); OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
assertThat(mController.getSummary()).isEqualTo( assertThat(mController.getSummary()).isEqualTo(String.format(
timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]); mContext.getResources().getString(R.string.one_handed_timeout_summary),
timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));
} }
} }