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

Merge "Directly focus button in touchmode coretests" into oc-dev

Browse Source
This commit is contained in:
Evan Rosky
2017-06-01 23:21:25 +00:00
committed by Android (Google) Code Review
parent 90a008a0a2 03e6b30f14
commit 6797a20a86
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/tests/coretests/src/android/widget/touchmode/TouchModeFocusableTest.java
View File

@@ -16,16 +16,15 @@
package android.widget.touchmode;
import android.widget.layout.linear.LLEditTextThenButton;
import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
import static android.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
import android.test.ActivityInstrumentationTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.view.KeyEvent;
import android.widget.Button;
import android.widget.EditText;
import android.widget.layout.linear.LLEditTextThenButton;
/**
* Some views, like edit texts, can keep and gain focus even when in touch mode.
@@ -64,7 +63,8 @@ public class TouchModeFocusableTest extends ActivityInstrumentationTestCase<LLEd
@LargeTest
public void testClickEditTextGivesItFocus() {
// go down to button
sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
getActivity().runOnUiThread(() -> mButton.requestFocus());
getInstrumentation().waitForIdleSync();
assertTrue("button should have focus", mButton.isFocused());
assertInTouchModeAfterClick(this, mEditText);
@@ -77,11 +77,12 @@ public class TouchModeFocusableTest extends ActivityInstrumentationTestCase<LLEd
// isn't focusable in touch mode.
@LargeTest
public void testEnterTouchModeGivesFocusBackToFocusableInTouchMode() {
sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
getActivity().runOnUiThread(() -> mButton.requestFocus());
getInstrumentation().waitForIdleSync();
assertTrue("button should have focus",
mButton.isFocused());
assertInTouchModeAfterClick(this, mButton);
assertTrue("should be in touch mode", mButton.isInTouchMode());
assertNull("nothing should have focus", getActivity().getCurrentFocus());