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

Merge "Camera lift preference now saves correctly"

Browse Source
This commit is contained in:
Daniel Sheng
2017-05-08 18:07:03 +00:00
committed by Android (Google) Code Review
parent 0ba42b0eac 7b9e3fdd08
commit e18b787084
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
View File

@@ -57,7 +57,7 @@ public class CameraLiftTriggerPreferenceController extends GesturePreferenceCont
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean enabled = (boolean) newValue; boolean enabled = (boolean) newValue;
Settings.Secure.putInt(mContext.getContentResolver(), 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; return true;
} }

22
tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
View File

@@ -100,4 +100,26 @@ public class CameraLiftTriggerPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isTrue(); 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);
}
} }