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

Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev

Browse Source
This commit is contained in:
Bill Lin
2021-03-23 01:22:38 +00:00
committed by Android (Google) Code Review
parent 01f77d8e00 dd2654493f
commit 9f046e55b6
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public class SwipeBottomToNotificationPreferenceController extends TogglePrefere
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Secure.getInt(mContext.getContentResolver(),
SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, ON) == ON; SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, OFF) == ON;
} }
@Override @Override

13
tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java
View File

@@ -58,7 +58,7 @@ public class SwipeBottomToNotificationPreferenceControllerTest {
mController.setChecked(true); mController.setChecked(true);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1)).isEqualTo(1); SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0)).isEqualTo(1);
} }
@Test @Test
@@ -66,7 +66,7 @@ public class SwipeBottomToNotificationPreferenceControllerTest {
mController.setChecked(false); mController.setChecked(false);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1)).isEqualTo(0); SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0)).isEqualTo(0);
} }
@Test @Test
@@ -109,4 +109,13 @@ public class SwipeBottomToNotificationPreferenceControllerTest {
assertThat(mController.getSummary()).isEqualTo( assertThat(mController.getSummary()).isEqualTo(
mContext.getText(R.string.gesture_setting_off)); mContext.getText(R.string.gesture_setting_off));
} }
@Test
public void getDefaultConfig_returnsOffState() {
SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
Settings.Secure.resetToDefaults(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED);
assertThat(mController.isChecked()).isFalse();
}
} }