PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stanley Wang
2018-12-04 05:56:01 +00:00
committed by Android (Google) Code Review
parent 72b25d65d3 9c4e2d6767
commit d4a3492422
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/gestures/GesturesSettingPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
for (AbstractPreferenceController controller : mGestureControllers) { for (AbstractPreferenceController controller : mGestureControllers) {
isAvailable = isAvailable || controller.isAvailable(); isAvailable = isAvailable || controller.isAvailable();
} }
return isAvailable ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
/** /**
@@ -101,4 +101,4 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
} }
return mContext.getText(R.string.language_input_gesture_summary_off); return mContext.getText(R.string.language_input_gesture_summary_off);
} }
} }

4
tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
@@ -81,7 +83,7 @@ public class GesturesSettingsPreferenceControllerTest {
}); });
ReflectionHelpers.setField(mController, "mGestureControllers", mControllers); ReflectionHelpers.setField(mController, "mGestureControllers", mControllers);
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
} }
@Test @Test