Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev
* changes: Update key visual changes for one handed mode settings Remove redundant swipe down notification and one handed sub settings
This commit is contained in:
Jason Chang
Android (Google) Code Review
@@ -0,0 +1,108 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.widget.RadioButtonPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class OneHandedActionPullDownPrefControllerTest {
|
||||
|
||||
private static final String KEY = "gesture_one_handed_action_pull_screen_down";
|
||||
|
||||
private Context mContext;
|
||||
private OneHandedSettingsUtils mUtils;
|
||||
private OneHandedActionPullDownPrefController mController;
|
||||
private RadioButtonPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mUtils = new OneHandedSettingsUtils(mContext);
|
||||
mController = new OneHandedActionPullDownPrefController(mContext, KEY);
|
||||
mPreference = new RadioButtonPreference(mContext);
|
||||
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_showNotificationEnabled_shouldUnchecked() {
|
||||
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, true);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_showNotificationDisabled_shouldChecked() {
|
||||
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, false);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setOneHandedModeDisabled_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setNavi3ButtonMode_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
mUtils.setNavigationBarMode(mContext, "0" /* 3 button */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setNaviGesturalMode_shouldEnabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_unsetSupportOneHandedModeProperty_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.widget.RadioButtonPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class OneHandedActionShowNotificationPrefControllerTest {
|
||||
|
||||
private static final String KEY = "gesture_one_handed_action_show_notification";
|
||||
|
||||
private Context mContext;
|
||||
private OneHandedSettingsUtils mUtils;
|
||||
private OneHandedActionShowNotificationPrefController mController;
|
||||
private RadioButtonPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mUtils = new OneHandedSettingsUtils(mContext);
|
||||
mController = new OneHandedActionShowNotificationPrefController(mContext, KEY);
|
||||
mPreference = new RadioButtonPreference(mContext);
|
||||
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_setGesturalMode_shouldEnabled() {
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isEnabled()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_ShowNotificationEnabled_shouldChecked() {
|
||||
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, true);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_showNotificationDisabled_shouldUnchecked() {
|
||||
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, false);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setOneHandedModeDisabled_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setNavi3ButtonMode_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
mUtils.setNavigationBarMode(mContext, "0" /* 3 button */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_unsetSupportOneHandedModeProperty_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import android.content.Context;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
@@ -47,21 +46,9 @@ public class OneHandedEnablePreferenceControllerTest {
|
||||
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_setBoolean_checkIsTrueOrFalse() {
|
||||
mController.setChecked(false);
|
||||
assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isFalse();
|
||||
assertThat(OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext)).isTrue();
|
||||
|
||||
mController.setChecked(true);
|
||||
assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isTrue();
|
||||
assertThat(OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setSupportOneHandedModeProperty_shouldAvailable() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
@@ -70,16 +57,6 @@ public class OneHandedEnablePreferenceControllerTest {
|
||||
@Test
|
||||
public void getAvailabilityStatus_unsetSupportOneHandedModeProperty_shouldUnsupported() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_set3ButtonModeProperty_shouldUnsupported() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
setNavigationBarMode(mContext, "0" /* 3-button */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
@@ -100,18 +77,4 @@ public class OneHandedEnablePreferenceControllerTest {
|
||||
assertThat(mController.getSummary())
|
||||
.isEqualTo(mContext.getText(R.string.switch_off_text));
|
||||
}
|
||||
|
||||
/**
|
||||
* Set NavigationBar mode flag to Settings provider.
|
||||
* @param context App context
|
||||
* @param value Navigation bar mode:
|
||||
* 0 = 3 button
|
||||
* 1 = 2 button
|
||||
* 2 = fully gestural
|
||||
* @return true if the value was set, false on database errors.
|
||||
*/
|
||||
private boolean setNavigationBarMode(Context context, String value) {
|
||||
return Settings.Secure.putStringForUser(context.getContentResolver(),
|
||||
Settings.Secure.NAVIGATION_MODE, value, UserHandle.myUserId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class OneHandedMainSwitchPreferenceControllerTest {
|
||||
|
||||
private static final String KEY = "gesture_one_handed_mode_enabled_main_switch";
|
||||
|
||||
private Context mContext;
|
||||
private OneHandedSettingsUtils mUtils;
|
||||
private OneHandedMainSwitchPreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mUtils = new OneHandedSettingsUtils(mContext);
|
||||
mController = new OneHandedMainSwitchPreferenceController(mContext, KEY);
|
||||
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_setBoolean_checkIsTrueOrFalse() {
|
||||
mController.setChecked(false);
|
||||
assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isFalse();
|
||||
|
||||
mController.setChecked(true);
|
||||
assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_setSupportOneHandedModeProperty_shouldAvailable() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_unsetSupportOneHandedModeProperty_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_set3ButtonMode_shouldDisabled() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
mUtils.setNavigationBarMode(mContext, "0" /* 3-button mode */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
}
|
||||
@@ -1,111 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class OneHandedTimeoutPreferenceControllerTest {
|
||||
|
||||
private static final String KEY = "gesture_one_handed_timeout";
|
||||
|
||||
private Context mContext;
|
||||
private OneHandedTimeoutPreferenceController mController;
|
||||
private ListPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mController = new OneHandedTimeoutPreferenceController(mContext, KEY);
|
||||
mPreference = new ListPreference(mContext);
|
||||
mPreference.setKey(KEY);
|
||||
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_disableOneHanded_shouldUnavailable() {
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_enableOneHanded_switchShouldEnabled() {
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isEnabled()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_disableOneHanded_switchShouldDisabled() {
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isEnabled()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_setTimeoutNever_shouldReturnNeverSummary() {
|
||||
final String[] timeoutTitles = mContext.getResources().getStringArray(
|
||||
R.array.one_handed_timeout_title);
|
||||
|
||||
OneHandedSettingsUtils.setTimeoutValue(mContext,
|
||||
OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
|
||||
|
||||
assertThat(mController.getSummary()).isEqualTo(
|
||||
timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.NEVER.ordinal()]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_setTimeoutShort_shouldReturnShortSummary() {
|
||||
final String[] timeoutTitles = mContext.getResources().getStringArray(
|
||||
R.array.one_handed_timeout_title);
|
||||
|
||||
OneHandedSettingsUtils.setTimeoutValue(mContext,
|
||||
OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
|
||||
|
||||
assertThat(mController.getSummary()).isEqualTo(String.format(
|
||||
mContext.getResources().getString(R.string.screen_timeout_summary),
|
||||
timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));
|
||||
}
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class SwipeBottomToNotificationPreferenceControllerTest {
|
||||
|
||||
private static final String KEY = "gesture_swipe_bottom_to_notification";
|
||||
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private Context mContext;
|
||||
|
||||
private SwipeBottomToNotificationPreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mController = new SwipeBottomToNotificationPreferenceController(mContext, KEY);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_toggledOn_enablesSwipeBottomToNotification() {
|
||||
mController.setChecked(true);
|
||||
|
||||
assertThat(OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext)).isTrue();
|
||||
assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_toggledOff_disablesSwipeBottomToNotification() {
|
||||
mController.setChecked(false);
|
||||
|
||||
assertThat(OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_oneHandedUnsupported_returnsUnsupport() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(
|
||||
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_oneHandedSupported_returnsAvailable() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
setNavigationBarMode(mContext, "2" /* fully gestural */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_set3ButtonModeProperty_returnsUnsupport() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
setNavigationBarMode(mContext, "0" /* 3-button */);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_gestureEnabled_returnsOnSummary() {
|
||||
mController.setChecked(true);
|
||||
|
||||
assertThat(mController.getSummary()).isEqualTo(
|
||||
mContext.getText(R.string.gesture_setting_on));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_gestureDisabled_returnsOffSummary() {
|
||||
mController.setChecked(false);
|
||||
|
||||
assertThat(mController.getSummary()).isEqualTo(
|
||||
mContext.getText(R.string.gesture_setting_off));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isChecked_getDefaultConfig_returnFalse() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
Settings.Secure.resetToDefaults(mContext.getContentResolver(),
|
||||
Settings.Secure.ONE_HANDED_MODE_ENABLED);
|
||||
|
||||
assertThat(mController.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
/**
|
||||
* Set NavigationBar mode flag to Settings provider.
|
||||
* @param context App context
|
||||
* @param value Navigation bar mode:
|
||||
* 0 = 3 button
|
||||
* 1 = 2 button
|
||||
* 2 = fully gestural
|
||||
* @return true if the value was set, false on database errors.
|
||||
*/
|
||||
private boolean setNavigationBarMode(Context context, String value) {
|
||||
return Settings.Secure.putStringForUser(context.getContentResolver(),
|
||||
Settings.Secure.NAVIGATION_MODE, value, UserHandle.myUserId());
|
||||
}
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.SystemProperties;
|
||||
import android.provider.SearchIndexableResource;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class SwipeBottomToNotificationSettingsTest {
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private Context mContext;
|
||||
|
||||
private SwipeBottomToNotificationSettings mSettings = new SwipeBottomToNotificationSettings();
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getPreferenceScreenResId_shouldReturnsXml() {
|
||||
assertThat(mSettings.getPreferenceScreenResId())
|
||||
.isEqualTo(R.xml.swipe_bottom_to_notification_settings);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void searchIndexProvider_shouldIndexResource() {
|
||||
final List<SearchIndexableResource> indexRes =
|
||||
SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
|
||||
mContext, true /* enabled */);
|
||||
|
||||
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPageSearchEnabled_oneHandedUnsupported_shouldReturnFalse() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "false");
|
||||
|
||||
final Object obj = ReflectionHelpers.callInstanceMethod(
|
||||
SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
|
||||
ReflectionHelpers.ClassParameter.from(Context.class, mContext));
|
||||
|
||||
final boolean isEnabled = (Boolean) obj;
|
||||
assertThat(isEnabled).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPageSearchEnabled_oneHandedDisabled_shouldReturnTrue() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
|
||||
|
||||
final Object obj = ReflectionHelpers.callInstanceMethod(
|
||||
SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
|
||||
ReflectionHelpers.ClassParameter.from(Context.class, mContext));
|
||||
|
||||
final boolean isEnabled = (Boolean) obj;
|
||||
assertThat(isEnabled).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPageSearchEnabled_oneHandedEnabled_shouldReturnFalse() {
|
||||
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
|
||||
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
|
||||
|
||||
final Object obj = ReflectionHelpers.callInstanceMethod(
|
||||
SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
|
||||
ReflectionHelpers.ClassParameter.from(Context.class, mContext));
|
||||
|
||||
final boolean isEnabled = (Boolean) obj;
|
||||
assertThat(isEnabled).isFalse();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user