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

Commit 62ad0db6 authored by Mindy Pereira's avatar Mindy Pereira Committed by Android Git Automerger
Browse files

am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 

Merge commit '6fbc5d9c' into gingerbread-plus-aosp

* commit '6fbc5d9c':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
parents b619e333 6fbc5d9c

core/java/android/widget/HorizontalScrollView.java

+4 −0
Original line number Diff line number Diff line
@@ -551,6 +551,10 @@ public class HorizontalScrollView extends FrameLayout { 
                                mEdgeGlowLeft.onRelease();

                            }

                        }

                        if (mEdgeGlowLeft != null

                                && (!mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished())) {

                            invalidate();

                        }

                    }

                }

                break;

core/java/android/widget/ScrollView.java

+4 −0
Original line number Diff line number Diff line
@@ -546,6 +546,10 @@ public class ScrollView extends FrameLayout { 
                                mEdgeGlowTop.onRelease();

                            }

                        }

                        if (mEdgeGlowTop != null

                                && (!mEdgeGlowTop.isFinished() || !mEdgeGlowBottom.isFinished())) {

                            invalidate();

                        }

                    }

                }

                break;