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

Merge "Rename panic gesture to emergency gesture in Settings"

Browse Source
This commit is contained in:
Fan Zhang
2020-10-28 17:02:21 +00:00
committed by Android (Google) Code Review
parent de36a60bd5 f797a48af6
commit 005b47249e
9 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java → tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
View File

@@ -16,8 +16,9 @@
package com.android.settings.gestures;
import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.OFF;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.ON;
import static com.google.common.truth.Truth.assertThat;
@@ -44,25 +45,25 @@ import org.robolectric.shadows.ShadowPackageManager;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class PanicGesturePreferenceControllerTest {
public class EmergencyGesturePreferenceControllerTest {
private static final String TEST_PKG_NAME = "test_pkg";
private static final String TEST_CLASS_NAME = "name";
private static final Intent SETTING_INTENT = new Intent(
PanicGesturePreferenceController.ACTION_PANIC_SETTINGS).setPackage(TEST_PKG_NAME);
private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
.setPackage(TEST_PKG_NAME);
private Context mContext;
private ContentResolver mContentResolver;
private ShadowPackageManager mPackageManager;
private PanicGesturePreferenceController mController;
private static final String PREF_KEY = "gesture_panic_button";
private EmergencyGesturePreferenceController mController;
private static final String PREF_KEY = "gesture_emergency_button";
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
}
@After
@@ -80,14 +81,14 @@ public class PanicGesturePreferenceControllerTest {
mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
SettingsShadowResources.overrideResource(
R.bool.config_show_panic_gesture_settings,
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
SettingsShadowResources.overrideResource(
R.string.panic_gesture_settings_package,
R.string.emergency_gesture_settings_package,
TEST_PKG_NAME);
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.mIntent).isNotNull();
}
@@ -95,16 +96,16 @@ public class PanicGesturePreferenceControllerTest {
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
SettingsShadowResources.overrideResource(
R.bool.config_show_panic_gesture_settings,
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_configIsTrue_shouldReturnFalse() {
public void isAvailable_configIsFalse_shouldReturnFalse() {
SettingsShadowResources.overrideResource(
R.bool.config_show_panic_gesture_settings,
R.bool.config_show_emergency_gesture_settings,
Boolean.FALSE);
assertThat(mController.isAvailable()).isFalse();
@@ -114,7 +115,7 @@ public class PanicGesturePreferenceControllerTest {
public void isChecked_configIsNotSet_shouldReturnTrue() {
// Set the setting to be enabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, ON);
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.isChecked()).isTrue();
}
@@ -123,15 +124,15 @@ public class PanicGesturePreferenceControllerTest {
public void isChecked_configIsSet_shouldReturnFalse() {
// Set the setting to be disabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, OFF);
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void isSliceableCorrectKey_returnsTrue() {
final PanicGesturePreferenceController controller =
new PanicGesturePreferenceController(mContext, PREF_KEY);
final EmergencyGesturePreferenceController controller =
new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(controller.isSliceable()).isTrue();
}

14
tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java → tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java
View File

@@ -16,8 +16,8 @@
package com.android.settings.gestures;
import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
import static com.android.settings.gestures.EmergencyGestureSoundPreferenceController.OFF;
import static com.android.settings.gestures.EmergencyGestureSoundPreferenceController.ON;
import static com.google.common.truth.Truth.assertThat;
@@ -39,17 +39,17 @@ import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class PanicGestureSoundPreferenceControllerTest {
public class EmergencyGestureSoundPreferenceControllerTest {
private Context mContext;
private ContentResolver mContentResolver;
private PanicGestureSoundPreferenceController mController;
private EmergencyGestureSoundPreferenceController mController;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mController = new PanicGestureSoundPreferenceController(mContext, "test_key");
mController = new EmergencyGestureSoundPreferenceController(mContext, "test_key");
}
@After
@@ -60,7 +60,7 @@ public class PanicGestureSoundPreferenceControllerTest {
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
SettingsShadowResources.overrideResource(
R.bool.config_show_panic_gesture_settings,
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
assertThat(mController.isAvailable()).isTrue();
@@ -69,7 +69,7 @@ public class PanicGestureSoundPreferenceControllerTest {
@Test
public void isAvailable_configIsTrue_shouldReturnFalse() {
SettingsShadowResources.overrideResource(
R.bool.config_show_panic_gesture_settings,
R.bool.config_show_emergency_gesture_settings,
Boolean.FALSE);
assertThat(mController.isAvailable()).isFalse();