diff options
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 6ef680bacfb6..f9692dad0a30 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3680,7 +3680,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // flag coming from the child that initiated the invalidate if (view != null) { if ((view.mViewFlags & FADING_EDGE_MASK) != 0 && - view.getSolidColor() == 0 && !view.isOpaque()) { + view.getSolidColor() == 0) { opaqueFlag = DIRTY; } if ((view.mPrivateFlags & DIRTY_MASK) != DIRTY) { diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index d92588cbc646..17b3bdad7115 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -477,8 +477,7 @@ public class HorizontalScrollView extends FrameLayout { break; case MotionEvent.ACTION_POINTER_DOWN: { final int index = ev.getActionIndex(); - final float x = ev.getX(index); - mLastMotionX = x; + mLastMotionX = ev.getX(index); mActivePointerId = ev.getPointerId(index); break; } @@ -1446,6 +1445,7 @@ public class HorizontalScrollView extends FrameLayout { super.setOverScrollMode(mode); } + @SuppressWarnings({"SuspiciousNameCombination"}) @Override public void draw(Canvas canvas) { super.draw(canvas); |