Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409091c5 authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

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

am: e866cd48

Change-Id: If482eb0f2229193145e2157ae76d09249e0c433b
parents 24f6fc8b e866cd48

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+12 −0
Original line number Diff line number Diff line
@@ -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("");

    }



}