From 8c427208032bceaea98706bbb15a23484b8c83e0 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Tue, 21 Apr 2020 23:17:45 +0800
Subject: [PATCH] =?UTF-8?q?Fixed=20One-Handed=20preference=20item=E2=80=99?=
 =?UTF-8?q?s=20second=20line=20should=20show=20on/off=20status=20in=20Sett?=
 =?UTF-8?q?ings=20>=20System=20>=20Gesture=20>=20One-Handed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To override getSummary() method to display on/off status in
One-Handed preference item’s second line.

Bug: 154600203

Test: manual
Change-Id: Ic9a5b74fbca041a08e712d5529b66e672f0c74ab
---
 .../OneHandedEnablePreferenceController.java    |  8 ++++++++
 ...OneHandedEnablePreferenceControllerTest.java | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java b/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
index 4f6ea81242a..216c111e9d6 100644
--- a/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
+++ b/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
@@ -18,6 +18,7 @@ package com.android.settings.gestures;
 
 import android.content.Context;
 
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.TogglePreferenceController;
 
@@ -46,4 +47,11 @@ public class OneHandedEnablePreferenceController extends TogglePreferenceControl
     public boolean isChecked() {
         return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext);
     }
+
+    @Override
+    public CharSequence getSummary() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? mContext.getText(R.string.switch_on_text)
+                : mContext.getText(R.string.switch_off_text);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
index e007b7b5790..f514d580ee6 100644
--- a/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
@@ -60,4 +61,20 @@ public class OneHandedEnablePreferenceControllerTest {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE);
     }
+
+    @Test
+    public void getSummary_enabledOneHanded_shouldDisplayOnSummary() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getText(R.string.switch_on_text));
+    }
+
+    @Test
+    public void getSummary_disabledOneHanded_shouldDisplayOffSummary() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getText(R.string.switch_off_text));
+    }
 }