Merge "Add Panic button sound preference to panic gesture settings page."
This commit is contained in:
committed by
Android (Google) Code Review
commit
e9c717b6c6
@@ -16,8 +16,8 @@
|
||||
|
||||
package com.android.settings.gestures;
|
||||
|
||||
import static com.android.settings.gestures.EmergencySosGesturePreferenceController.OFF;
|
||||
import static com.android.settings.gestures.EmergencySosGesturePreferenceController.ON;
|
||||
import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
|
||||
import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
@@ -39,19 +39,19 @@ import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = SettingsShadowResources.class)
|
||||
public class EmergencySosGesturePreferenceControllerTest {
|
||||
public class PanicGesturePreferenceControllerTest {
|
||||
|
||||
|
||||
private Context mContext;
|
||||
private ContentResolver mContentResolver;
|
||||
private EmergencySosGesturePreferenceController mController;
|
||||
private static final String PREF_KEY = "gesture_emergency_sos_button";
|
||||
private PanicGesturePreferenceController mController;
|
||||
private static final String PREF_KEY = "gesture_panic_button";
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mContentResolver = mContext.getContentResolver();
|
||||
mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
|
||||
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
|
||||
}
|
||||
|
||||
@After
|
||||
@@ -62,7 +62,7 @@ public class EmergencySosGesturePreferenceControllerTest {
|
||||
@Test
|
||||
public void isAvailable_configIsTrue_shouldReturnTrue() {
|
||||
SettingsShadowResources.overrideResource(
|
||||
R.bool.config_show_emergency_sos_gesture_settings,
|
||||
R.bool.config_show_panic_gesture_settings,
|
||||
Boolean.TRUE);
|
||||
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
@@ -71,7 +71,7 @@ public class EmergencySosGesturePreferenceControllerTest {
|
||||
@Test
|
||||
public void isAvailable_configIsTrue_shouldReturnFalse() {
|
||||
SettingsShadowResources.overrideResource(
|
||||
R.bool.config_show_emergency_sos_gesture_settings,
|
||||
R.bool.config_show_panic_gesture_settings,
|
||||
Boolean.FALSE);
|
||||
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
@@ -81,7 +81,7 @@ public class EmergencySosGesturePreferenceControllerTest {
|
||||
public void isChecked_configIsNotSet_shouldReturnTrue() {
|
||||
// Set the setting to be enabled.
|
||||
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, ON);
|
||||
mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
|
||||
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
|
||||
|
||||
assertThat(mController.isChecked()).isTrue();
|
||||
}
|
||||
@@ -90,15 +90,15 @@ public class EmergencySosGesturePreferenceControllerTest {
|
||||
public void isChecked_configIsSet_shouldReturnFalse() {
|
||||
// Set the setting to be disabled.
|
||||
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, OFF);
|
||||
mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
|
||||
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
|
||||
|
||||
assertThat(mController.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSliceableCorrectKey_returnsTrue() {
|
||||
final EmergencySosGesturePreferenceController controller =
|
||||
new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
|
||||
final PanicGesturePreferenceController controller =
|
||||
new PanicGesturePreferenceController(mContext, PREF_KEY);
|
||||
assertThat(controller.isSliceable()).isTrue();
|
||||
}
|
||||
|
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* 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.gestures.PanicGesturePreferenceController.OFF;
|
||||
import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = SettingsShadowResources.class)
|
||||
public class PanicGestureSoundPreferenceControllerTest {
|
||||
|
||||
private Context mContext;
|
||||
private ContentResolver mContentResolver;
|
||||
private PanicGestureSoundPreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mContentResolver = mContext.getContentResolver();
|
||||
mController = new PanicGestureSoundPreferenceController(mContext, "test_key");
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
SettingsShadowResources.reset();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isAvailable_configIsTrue_shouldReturnTrue() {
|
||||
SettingsShadowResources.overrideResource(
|
||||
R.bool.config_show_panic_gesture_settings,
|
||||
Boolean.TRUE);
|
||||
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isAvailable_configIsTrue_shouldReturnFalse() {
|
||||
SettingsShadowResources.overrideResource(
|
||||
R.bool.config_show_panic_gesture_settings,
|
||||
Boolean.FALSE);
|
||||
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isChecked_configIsSet_shouldReturnTrue() {
|
||||
// Set the setting to be enabled.
|
||||
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, ON);
|
||||
|
||||
assertThat(mController.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isChecked_configIsSetToFalse_shouldReturnFalse() {
|
||||
// Set the setting to be disabled.
|
||||
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, OFF);
|
||||
|
||||
assertThat(mController.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSliceable_returnsFalse() {
|
||||
assertThat(mController.isSliceable()).isFalse();
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user