From 9cfe959a23ccf5323f8d29af00d21a9efdcf7573 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Wed, 15 Jul 2020 17:20:03 +0800
Subject: [PATCH] Fix the description under timeout isn't translated completely

Reuse existing string instead of using new string for one-handed
timeout description.

Bug: 159298092

Test: manual
Change-Id: I903998dc58218f67d37fa449ef1a6a0615637bb5
---
 res/values/strings.xml                                          | 2 --
 .../settings/gestures/OneHandedTimeoutPreferenceController.java | 2 +-
 .../gestures/OneHandedTimeoutPreferenceControllerTest.java      | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

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 @@
     <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>
     <!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] -->
     <string name="keywords_one_handed">reachability</string>
 
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()]));
     }
 }