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

Commit dab739ac authored May 30, 2017 by Daniel Sheng

Camera lift settings are now default-on.

Bug: 62102062
Test: make RunSettingsRoboTests

Changing camera lift trigger setting to default-on.

Change-Id: Id4918ce3ecf82271989741cce54729e8fd49ae52

parent 5999ea8f

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,8 @@ public class CameraLiftTriggerPreferenceController extends GesturePreferenceCont
		@Override
		protected boolean isSwitchPrefEnabled() {
		final int triggerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0);
		Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED,
		Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT);
		return triggerEnabled == 1;
		}
		}

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,15 @@ public class CameraLiftTriggerPreferenceControllerTest {
		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void testSwitchEnabled_defaultConfig_shouldReturnTrue() {
		final Context context = RuntimeEnvironment.application;
		mController = new CameraLiftTriggerPreferenceController(context, null,
		KEY_CAMERA_LIFT_TRIGGER);

		assertThat(mController.isSwitchPrefEnabled()).isTrue();
		}

		@Test
		public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
		// Set the setting to be enabled.