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

Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: 9a93a1dbe9

Browse Source 
am: 84586334b2

Change-Id: Ic2818dc965defb3b2df3192604cedbfcddf36714
This commit is contained in:
Mehdi Alizadeh
2018-05-16 16:53:44 -07:00
committed by android-build-merger
parent ec5a3f9c01 84586334b2
commit 6ed77203e8
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
View File

@@ -27,7 +27,7 @@ import android.content.pm.ResolveInfo;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.R;
import com.android.internal.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -57,8 +57,7 @@ public class SwipeUpPreferenceControllerTest {
public void setUp() {
SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
true);
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_swipe_up_gesture_default, true);
SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_default, true);
mContext = RuntimeEnvironment.application;
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
@@ -107,8 +106,7 @@ public class SwipeUpPreferenceControllerTest {
@Test
public void testIsChecked_defaultIsFalse_shouldReturnFalse() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_swipe_up_gesture_default, false);
SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_default, false);
assertThat(mController.isChecked()).isFalse();
}