Merge "Update new string for One-Handed feature"

2020-05-26 10:08:23 +00:00
parent e0d2fbf9e9 cc35ece032
commit 6c8fd325ee
3 changed files with 31 additions and 18 deletions
--- 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