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

Merge "Fix broken android.view.DisabledTest." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-10 01:43:52 +00:00
committed by Android (Google) Code Review
parent 5262ae9b87 54e221a4df
commit d5d4ffebdd
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/tests/coretests/src/android/view/DisabledTest.java
View File

@@ -16,15 +16,15 @@
package android.view; package android.view;
import com.android.frameworks.coretests.R;
import android.test.TouchUtils;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.ActivityInstrumentationTestCase; import android.test.ActivityInstrumentationTestCase;
import android.widget.Button; import android.test.TouchUtils;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.Button;
import com.android.frameworks.coretests.R;
/** /**
* Exercises {@link android.view.View}'s disabled property. * Exercises {@link android.view.View}'s disabled property.
@@ -45,18 +45,23 @@ public class DisabledTest extends ActivityInstrumentationTestCase<Disabled> {
final Disabled a = getActivity(); final Disabled a = getActivity();
mDisabled = (Button) a.findViewById(R.id.disabledButton); mDisabled = (Button) a.findViewById(R.id.disabledButton);
mDisabled.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
mClicked = true;
}
});
mDisabledParent = a.findViewById(R.id.clickableParent); mDisabledParent = a.findViewById(R.id.clickableParent);
mDisabledParent.setOnClickListener(new View.OnClickListener() { getInstrumentation().runOnMainSync(
public void onClick(View v) { new Runnable() {
mParentClicked = true; @Override
} public void run() {
}); mDisabled.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
mClicked = true;
}
});
mDisabledParent.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
mParentClicked = true;
}
});
}
});
} }
@Override @Override