Merge "Camera lift preference now saves correctly" (e18b7870) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ public class CameraLiftTriggerPreferenceController extends GesturePreferenceCont
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		boolean enabled = (boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, enabled ? 0 : 1);
		Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, enabled ? 1 : 0);
		return true;
		}

+22 −0

Original line number	Diff line number	Diff line
		@@ -100,4 +100,26 @@ public class CameraLiftTriggerPreferenceControllerTest {

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

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

		assertThat(Settings.Secure.getInt(context.getContentResolver(),
		CAMERA_LIFT_TRIGGER_ENABLED, 0)).isEqualTo(1);
		}

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

		assertThat(Settings.Secure.getInt(context.getContentResolver(),
		CAMERA_LIFT_TRIGGER_ENABLED, 1)).isEqualTo(0);
		}
		}