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

Revert "Remove Gesture settings as inline results"

Browse Source 
This reverts commit 4ec4969b33.

Change-Id: I5b0012174864bba8b196220ee29863a9a58faa69
This commit is contained in:
Matthew Fritze
2017-02-14 22:02:13 +00:00
parent 4ec4969b33
commit 5a67ccd04e
12 changed files with 157 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
View File

@@ -93,4 +93,23 @@ public class DoubleTapPowerPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new DoubleTapPowerPreferenceController(context, null);
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new DoubleTapPowerPreferenceController(context, null);
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("camera_double_tap_power_gesture_disabled");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(0)).isEqualTo(true);
assertThat(payload.valueMap.get(1)).isEqualTo(false);
}
}

15
tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
View File

@@ -81,4 +81,19 @@ public class DoubleTapScreenPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("doze_pulse_on_double_tap");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

15
tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
View File

@@ -113,4 +113,19 @@ public class DoubleTwistPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("camera_double_twist_to_flip_enabled");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

15
tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
View File

@@ -83,4 +83,19 @@ public class PIckupGesturePreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("doze_pulse_on_pick_up");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

15
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
View File

@@ -89,4 +89,19 @@ public class SwipeToNotificationPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("system_navigation_keys_enabled");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

10
tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
View File

@@ -72,6 +72,14 @@ public class DatabaseIndexingUtilsTest {
assertThat(map).isNull();
}
@Test
public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsNotNull() {
String className = "com.android.settings.gestures.GestureSettings";
Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
assertThat(map).isNotNull();
}
@Test
public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
String className = "com.android.settings.DisplaySettings";
@@ -88,7 +96,7 @@ public class DatabaseIndexingUtilsTest {
}
@Test
public void testGetPayloadFromMap_MatchingKey_ReturnsPayload() {
public void testGetPayloadFromMap_MatchingKey_ReturnsPayloa() {
final String key = "key";
PreferenceController prefController = new PreferenceController(mContext) {
@Override