diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52fae3da49b..703b74ca13a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10845,20 +10845,22 @@
     <!-- 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>
 
-    <!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_title" product="default" translatable="false">One-Handed</string>
-    <!-- Preference Switch for enabling one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_mode_enabled" product="default" translatable="false">Enable one-handed mode</string>
-    <!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_app_taps_to_exit" product="default" translatable="false">Activity launch to exit</string>
-    <!-- Timeout(Never) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_timeout_title" product="default" translatable="false">Timeout</string>
-    <!-- Timeout(Short) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_timeout_short" product="default" translatable="false">4 seconds</string>
-    <!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_timeout_medium" product="default" translatable="false">8 seconds</string>
-    <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] [DO NOT TRANSLATE]-->
-    <string name="one_handed_timeout_long" product="default" translatable="false">12 seconds</string>
+    <!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_title">One-Handed mode</string>
+    <!-- Preference Switch for enabling one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_mode_enabled">Use one-handed mode</string>
+    <!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_app_taps_to_exit">Exit when switching apps</string>
+    <!-- Timeout(Never) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_title">Timeout</string>
+    <!-- Timeout(Short) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_short">4 seconds</string>
+    <!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_medium">8 seconds</string>
+    <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->
+    <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]-->
     <string name="ambient_display_summary">To check time, notifications, and other info, double-tap your screen.</string>
diff --git a/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
index 8bb56509c14..50446d3ce41 100644
--- a/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
+++ b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
@@ -83,7 +83,11 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll
 
     @Override
     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
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
index df683c09dd8..7fc10bbfed1 100644
--- a/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
@@ -83,7 +83,7 @@ public class OneHandedTimeoutPreferenceControllerTest {
     }
 
     @Test
-    public void getSummary_setTimeout_shouldReturnSummary() {
+    public void getSummary_setTimeoutNever_shouldReturnNeverSummary() {
         final String[] timeoutTitles = mContext.getResources().getStringArray(
                 R.array.one_handed_timeout_title);
 
@@ -92,11 +92,18 @@ public class OneHandedTimeoutPreferenceControllerTest {
 
         assertThat(mController.getSummary()).isEqualTo(
                 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.OneHandedTimeout.SHORT.getValue());
 
-        assertThat(mController.getSummary()).isEqualTo(
-                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]);
+        assertThat(mController.getSummary()).isEqualTo(String.format(
+                mContext.getResources().getString(R.string.one_handed_timeout_summary),
+                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));
     }
 }