Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev

am: 8e13218ec8

Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05

src/com/android/settings/gestures/GesturesSettingPreferenceController.java

@@ -64,6 +64,7 @@ public class GesturesSettingPreferenceController extends AbstractPreferenceContr
     public void updateState(Preference preference) {
         if (!mFeatureProvider.isSensorAvailable(mContext)) {
             preference.setSummary("");
+            return;
         }
         final ContentResolver contentResolver = mContext.getContentResolver();
         final boolean assistGestureEnabled = Settings.Secure.getInt(

tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java

@@ -119,4 +119,16 @@ public class GesturesSettingsPreferenceControllerTest {
         verify(mActivity).getString(R.string.language_input_gesture_summary_on_non_assist);
     }
 
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void updateState_sensorNotAvailable_shouldSetToEmptyStatus() {
+        final FakeFeatureFactory featureFactory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
+        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
+                .thenReturn(false);
+
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("");
+    }
+
 }