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

Merge "fix(#Magnification): check window magnification supported for context before unit tests" into udc-qpr-dev am: c2bc4c95fa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23247820

Change-Id: Id928f7c2e45138c1a115db651f5bcc74c2d0b7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roy Chou
2023-05-18 01:55:43 +00:00
committed by Automerger Merge Worker
parent 11a6cc3ecd c2bc4c95fa
commit 2e78a495fd
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.accessibility; package com.android.systemui.accessibility;
import static android.content.pm.PackageManager.FEATURE_WINDOW_MAGNIFICATION;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.content.res.Configuration.ORIENTATION_UNDEFINED; import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
@@ -96,6 +97,7 @@ import com.android.systemui.utils.os.FakeHandler;
import com.google.common.util.concurrent.AtomicDouble; import com.google.common.util.concurrent.AtomicDouble;
import org.junit.After; import org.junit.After;
import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -147,8 +149,15 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
private View.OnTouchListener mTouchListener; private View.OnTouchListener mTouchListener;
private MotionEventHelper mMotionEventHelper = new MotionEventHelper(); private MotionEventHelper mMotionEventHelper = new MotionEventHelper();
/**
* return whether window magnification is supported for current test context.
*/
private boolean isWindowModeSupported() {
return getContext().getPackageManager().hasSystemFeature(FEATURE_WINDOW_MAGNIFICATION);
}
@Before @Before
public void setUp() throws RemoteException { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = Mockito.spy(getContext()); mContext = Mockito.spy(getContext());
mHandler = new FakeHandler(TestableLooper.get(this).getLooper()); mHandler = new FakeHandler(TestableLooper.get(this).getLooper());
@@ -202,6 +211,9 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
return null; return null;
}).when(mSpyView).setOnTouchListener( }).when(mSpyView).setOnTouchListener(
any(View.OnTouchListener.class)); any(View.OnTouchListener.class));
// skip test if window magnification is not supported to prevent fail results. (b/279820875)
Assume.assumeTrue(isWindowModeSupported());
} }
@After @After