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

Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev am: a083c8f83a

Browse Source 
am: 0a19be5607

Change-Id: I1363402c842b3910febb6f7495eb372680bd053a
This commit is contained in:
Jason Monk
2017-08-04 17:50:27 +00:00
committed by android-build-merger
parent fd3326f3d3 0a19be5607
commit 67cd788e92
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java
View File

@@ -15,7 +15,9 @@
package com.android.systemui.statusbar.phone; package com.android.systemui.statusbar.phone;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Rect; import android.graphics.Rect;
import android.support.annotation.VisibleForTesting;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -42,8 +44,13 @@ public class NearestTouchFrame extends FrameLayout {
private View mTouchingChild; private View mTouchingChild;
public NearestTouchFrame(Context context, AttributeSet attrs) { public NearestTouchFrame(Context context, AttributeSet attrs) {
this(context, attrs, context.getResources().getConfiguration());
}
@VisibleForTesting
NearestTouchFrame(Context context, AttributeSet attrs, Configuration c) {
super(context, attrs); super(context, attrs);
mIsActive = context.getResources().getConfiguration().smallestScreenWidthDp < 600; mIsActive = c.smallestScreenWidthDp < 600;
} }
@Override @Override

26
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NearestTouchFrameTest.java
View File

@@ -18,10 +18,12 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.res.Configuration;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper.RunWithLooper; import android.testing.TestableLooper.RunWithLooper;
@@ -43,7 +45,29 @@ public class NearestTouchFrameTest extends SysuiTestCase {
@Before @Before
public void setup() { public void setup() {
mNearestTouchFrame = new NearestTouchFrame(mContext, null); Configuration c = new Configuration(mContext.getResources().getConfiguration());
c.smallestScreenWidthDp = 500;
mNearestTouchFrame = new NearestTouchFrame(mContext, null, c);
}
@Test
public void testNoActionOnLargeDevices() {
Configuration c = new Configuration(mContext.getResources().getConfiguration());
c.smallestScreenWidthDp = 700;
mNearestTouchFrame = new NearestTouchFrame(mContext, null, c);
View left = mockViewAt(0, 0, 10, 10);
View right = mockViewAt(20, 0, 10, 10);
mNearestTouchFrame.addView(left);
mNearestTouchFrame.addView(right);
mNearestTouchFrame.onMeasure(0, 0);
MotionEvent ev = MotionEvent.obtain(0, 0, 0,
12 /* x */, 5 /* y */, 0);
mNearestTouchFrame.onTouchEvent(ev);
verify(left, never()).onTouchEvent(eq(ev));
ev.recycle();
} }
@Test @Test