Merge "Fixed bitmap comparison to restrict it to the commit button." into pi-dev
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java b/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java
index 4e7947e..92ac389 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java
@@ -78,10 +78,15 @@
* {@link UiBot#takeScreenshot()} instead.
*/
public Bitmap takeScreenshot() {
- final View rootView = findViewById(android.R.id.content).getRootView();
+ return takeScreenshot(findViewById(android.R.id.content).getRootView());
+ }
+ /**
+ * Takes a screenshot from the a view.
+ */
+ public Bitmap takeScreenshot(View view) {
final Rect srcRect = new Rect();
- syncRunOnUiThread(() -> rootView.getGlobalVisibleRect(srcRect));
+ syncRunOnUiThread(() -> view.getGlobalVisibleRect(srcRect));
final Bitmap dest = Bitmap.createBitmap(
srcRect.width(), srcRect.height(), Bitmap.Config.ARGB_8888);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
index a7a09f6..7eb3a37 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
@@ -1072,7 +1072,7 @@
// Take a screenshot to make sure button doesn't disappear.
final String commitBefore = mUiBot.assertShownByRelativeId(ID_COMMIT).getText();
assertThat(commitBefore.toUpperCase()).isEqualTo("COMMIT");
- final Bitmap screenshotBefore = mActivity.takeScreenshot();
+ final Bitmap screenshotBefore = mActivity.takeScreenshot(mActivity.mCommit);
// Save it...
mActivity.syncRunOnUiThread(() -> mActivity.mCommit.performClick());
@@ -1082,13 +1082,13 @@
// Make sure save button is showning (it was removed on earlier versions of the feature)
final String commitAfter = mUiBot.assertShownByRelativeId(ID_COMMIT).getText();
assertThat(commitAfter.toUpperCase()).isEqualTo("COMMIT");
- final Bitmap screenshotAfter = mActivity.takeScreenshot();
+ final Bitmap screenshotAfter = mActivity.takeScreenshot(mActivity.mCommit);
// ... and assert results
final SaveRequest saveRequest = sReplier.getNextSaveRequest();
assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_INPUT), "108");
- Helper.assertBitmapsAreSame("screenshot", screenshotBefore, screenshotAfter);
+ Helper.assertBitmapsAreSame("commit-button", screenshotBefore, screenshotAfter);
}
@Override