Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d7796c1 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1

parents ccdeb60c 2243e555

core/java/android/view/ViewGroup.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

core/java/android/widget/HorizontalScrollView.java

+2 −2
Original line number Diff line number Diff line
@@ -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);