diff --git a/res/values/strings.xml b/res/values/strings.xml index b45ce58cc3c..7f6ce5fb5d2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10916,8 +10916,6 @@ 8 seconds 12 seconds - - After %1$s of inactivity reachability diff --git a/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java index 50446d3ce41..90ff9a649cc 100644 --- a/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java +++ b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java @@ -87,7 +87,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll 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())); + R.string.screen_timeout_summary), mTimeoutMap.get(getTimeoutValue())); } @Override diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java index 7fc10bbfed1..baf834744e9 100644 --- a/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java @@ -103,7 +103,7 @@ public class OneHandedTimeoutPreferenceControllerTest { OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()); 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()])); } }