Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip restoring one handed settings if not supported on device"

Browse Source
This commit is contained in:
Winson Chung
2020-11-06 17:01:04 +00:00
committed by Android (Google) Code Review
parent 7f1f6e47ea cee4f5ed8e
commit f74e31b6f8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTestCase.java
View File

@@ -46,6 +46,8 @@ public abstract class OneHandedTestCase {
@Before
public void setupSettings() {
assumeTrue(SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false));
final Context testContext =
InstrumentationRegistry.getInstrumentation().getTargetContext();
final DisplayManager dm = testContext.getSystemService(DisplayManager.class);
@@ -74,13 +76,13 @@ public abstract class OneHandedTestCase {
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1);
}
@Before
public void assumeOneHandedModeSupported() {
assumeTrue(SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false));
}
@After
public void restoreSettings() {
if (mContext == null) {
// Return early if one-handed mode is not supported
return;
}
Settings.Secure.putInt(getContext().getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, sOrigEnabled ? 1 : 0);
Settings.Secure.putInt(mContext.getContentResolver(),