Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: Ibbc0b965e9b0676cefc78570f5ec46c6bbc30330
This commit is contained in:
Edgar Wang
2021-07-19 13:12:40 +00:00
committed by Automerger Merge Worker
3 changed files with 9 additions and 9 deletions

View File

@@ -78,7 +78,7 @@ public class DoubleTwistPreferenceControllerTest {
when(mContext.getResources().getString(anyInt())).thenReturn("test");
when(mContext.getSystemService(Context.SENSOR_SERVICE)).thenReturn(mSensorManager);
when(mSensorManager.getSensorList(anyInt())).thenReturn(sensorList);
when(sensorList.get(0).getName()).thenReturn("test");
when(sensorList.get(0).getStringType()).thenReturn("test");
when(sensorList.get(0).getVendor()).thenReturn("test");
assertThat(mController.isAvailable()).isTrue();
@@ -97,7 +97,7 @@ public class DoubleTwistPreferenceControllerTest {
when(mContext.getResources().getString(anyInt())).thenReturn("test");
when(mContext.getSystemService(Context.SENSOR_SERVICE)).thenReturn(mSensorManager);
when(mSensorManager.getSensorList(anyInt())).thenReturn(sensorList);
when(sensorList.get(0).getName()).thenReturn("not_test");
when(sensorList.get(0).getStringType()).thenReturn("not_test");
assertThat(mController.isAvailable()).isFalse();
}
@@ -105,9 +105,9 @@ public class DoubleTwistPreferenceControllerTest {
@Test
public void isSuggestionCompleted_doubleTwist_trueWhenNotAvailable() {
SettingsShadowResources.overrideResource(
R.string.gesture_double_twist_sensor_name, "nonexistant name");
R.string.gesture_double_twist_sensor_type, "nonexistent type");
SettingsShadowResources.overrideResource(
R.string.gesture_double_twist_sensor_vendor, "nonexistant vendor");
R.string.gesture_double_twist_sensor_vendor, "nonexistent vendor");
assertThat(DoubleTwistPreferenceController.isSuggestionComplete(
RuntimeEnvironment.application, null /* prefs */))