Fix error-prone warning in ExploreByTouchHelper
ExploreByTouchHelper was not checking the return value of Rect#intersect.
This change adds that check.
Test: ./gradlew support-core-ui:assembleErrorProne
Change-Id: I75411be1b17d57e6df874201f8bbd2405786aa77
diff --git a/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy b/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy
index 77a58f8..6a5a694 100644
--- a/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy
+++ b/buildSrc/src/main/groovy/android/support/SupportLibraryPlugin.groovy
@@ -184,8 +184,6 @@
libraryVariant.getJavaCompile().setToolChain(toolChain);
libraryVariant.getJavaCompile().options.compilerArgs += [
- // TODO(aurimas): remove this once all these warnings are fixed.
- '-Xep:RectIntersectReturnValueIgnored:WARN',
'-XDcompilePolicy=simple', // Workaround for b/36098770
// Enforce the following checks.
diff --git a/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java b/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java
index 7ca0054..780d34e 100644
--- a/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java
+++ b/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java
@@ -877,11 +877,13 @@
if (mHost.getLocalVisibleRect(mTempVisibleRect)) {
mTempVisibleRect.offset(mTempGlobalRect[0] - mHost.getScrollX(),
mTempGlobalRect[1] - mHost.getScrollY());
- mTempScreenRect.intersect(mTempVisibleRect);
- node.setBoundsInScreen(mTempScreenRect);
+ final boolean intersects = mTempScreenRect.intersect(mTempVisibleRect);
+ if (intersects) {
+ node.setBoundsInScreen(mTempScreenRect);
- if (isVisibleToUser(mTempScreenRect)) {
- node.setVisibleToUser(true);
+ if (isVisibleToUser(mTempScreenRect)) {
+ node.setVisibleToUser(true);
+ }
}
}