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

Commit d4a34924 authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix top level "Gestures" not appearing in search result"

parents 72b25d65 9c4e2d67

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

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle 
        for (AbstractPreferenceController controller : mGestureControllers) {

            isAvailable = isAvailable || controller.isAvailable();

        }

        return isAvailable ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;

        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    /**

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

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.gestures;



import static com.android.settings.core.BasePreferenceController.AVAILABLE;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;
@@ -81,7 +83,7 @@ public class GesturesSettingsPreferenceControllerTest { 
        });

        ReflectionHelpers.setField(mController, "mGestureControllers", mControllers);



        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);

    }



    @Test