Fix some error prone warnings in support-core-ui.
Test: ./gradlew support-core-ui:assembleErrorProne
Change-Id: I8838285544e5e13a32dd53dfacb0d59d00283955
diff --git a/core-ui/java/android/support/v4/view/ViewPager.java b/core-ui/java/android/support/v4/view/ViewPager.java
index d43233f..60b1ee5 100644
--- a/core-ui/java/android/support/v4/view/ViewPager.java
+++ b/core-ui/java/android/support/v4/view/ViewPager.java
@@ -917,7 +917,7 @@
// of travel has on the overall snap duration.
float distanceInfluenceForSnapDuration(float f) {
f -= 0.5f; // center the values about 0.
- f *= 0.3f * Math.PI / 2.0f;
+ f *= 0.3f * (float) Math.PI / 2.0f;
return (float) Math.sin(f);
}
@@ -2287,7 +2287,7 @@
endDrag();
mLeftEdge.onRelease();
mRightEdge.onRelease();
- needsInvalidate = mLeftEdge.isFinished() | mRightEdge.isFinished();
+ needsInvalidate = mLeftEdge.isFinished() || mRightEdge.isFinished();
return needsInvalidate;
}
diff --git a/core-ui/java/android/support/v4/widget/AutoScrollHelper.java b/core-ui/java/android/support/v4/widget/AutoScrollHelper.java
index 74e488a..d0407be 100644
--- a/core-ui/java/android/support/v4/widget/AutoScrollHelper.java
+++ b/core-ui/java/android/support/v4/widget/AutoScrollHelper.java
@@ -492,8 +492,8 @@
final int verticalDirection = scroller.getVerticalDirection();
final int horizontalDirection = scroller.getHorizontalDirection();
- return verticalDirection != 0 && canTargetScrollVertically(verticalDirection)
- || horizontalDirection != 0 && canTargetScrollHorizontally(horizontalDirection);
+ return (verticalDirection != 0 && canTargetScrollVertically(verticalDirection))
+ || (horizontalDirection != 0 && canTargetScrollHorizontally(horizontalDirection));
}
/**
diff --git a/core-ui/java/android/support/v4/widget/DrawerLayout.java b/core-ui/java/android/support/v4/widget/DrawerLayout.java
index c3cb8f7..8b1ce1e 100644
--- a/core-ui/java/android/support/v4/widget/DrawerLayout.java
+++ b/core-ui/java/android/support/v4/widget/DrawerLayout.java
@@ -17,7 +17,6 @@
package android.support.v4.widget;
-import android.support.annotation.RequiresApi;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@@ -35,6 +34,7 @@
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.view.AbsSavedState;
@@ -887,8 +887,7 @@
final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
final View child = getChildAt(i);
- if (!isDrawerOpen && !isDrawerView(child)
- || isDrawerOpen && child == drawerView) {
+ if ((!isDrawerOpen && !isDrawerView(child)) || (isDrawerOpen && child == drawerView)) {
// Drawer is closed and this is a content view or this is an
// open drawer view, so it should be visible.
ViewCompat.setImportantForAccessibility(child,
@@ -2130,10 +2129,10 @@
int left;
if (checkDrawerViewAbsoluteGravity(releasedChild, Gravity.LEFT)) {
- left = xvel > 0 || xvel == 0 && offset > 0.5f ? 0 : -childWidth;
+ left = xvel > 0 || (xvel == 0 && offset > 0.5f) ? 0 : -childWidth;
} else {
final int width = getWidth();
- left = xvel < 0 || xvel == 0 && offset > 0.5f ? width - childWidth : width;
+ left = xvel < 0 || (xvel == 0 && offset > 0.5f) ? width - childWidth : width;
}
mDragger.settleCapturedViewAt(left, releasedChild.getTop());
@@ -2378,7 +2377,7 @@
}
}
- final class ChildAccessibilityDelegate extends AccessibilityDelegateCompat {
+ static final class ChildAccessibilityDelegate extends AccessibilityDelegateCompat {
@Override
public void onInitializeAccessibilityNodeInfo(View child,
AccessibilityNodeInfoCompat info) {
diff --git a/core-ui/java/android/support/v4/widget/ViewDragHelper.java b/core-ui/java/android/support/v4/widget/ViewDragHelper.java
index cd16c08..c222c17 100644
--- a/core-ui/java/android/support/v4/widget/ViewDragHelper.java
+++ b/core-ui/java/android/support/v4/widget/ViewDragHelper.java
@@ -681,7 +681,7 @@
private float distanceInfluenceForSnapDuration(float f) {
f -= 0.5f; // center the values about 0.
- f *= 0.3f * Math.PI / 2.0f;
+ f *= 0.3f * (float) Math.PI / 2.0f;
return (float) Math.sin(f);
}
@@ -1039,12 +1039,10 @@
final int targetTop = oldTop + (int) dy;
final int newTop = mCallback.clampViewPositionVertical(toCapture, targetTop,
(int) dy);
- final int horizontalDragRange = mCallback.getViewHorizontalDragRange(
- toCapture);
- final int verticalDragRange = mCallback.getViewVerticalDragRange(toCapture);
- if ((horizontalDragRange == 0 || horizontalDragRange > 0
- && newLeft == oldLeft) && (verticalDragRange == 0
- || verticalDragRange > 0 && newTop == oldTop)) {
+ final int hDragRange = mCallback.getViewHorizontalDragRange(toCapture);
+ final int vDragRange = mCallback.getViewVerticalDragRange(toCapture);
+ if ((hDragRange == 0 || (hDragRange > 0 && newLeft == oldLeft))
+ && (vDragRange == 0 || (vDragRange > 0 && newTop == oldTop))) {
break;
}
}