Merge "Fix save()/restore() issues in the OpenGL renderer."

2010-08-17 18:40:50 -07:00
parent cdff2f2424 8fb954263d
commit 4ae784f126
8 changed files with 87 additions and 26 deletions
--- a/core/java/android/widget/ScrollBarDrawable.java
+++ b/core/java/android/widget/ScrollBarDrawable.java
@@ -111,8 +111,7 @@ public class ScrollBarDrawable extends Drawable {
        }

        Rect r = getBounds();
-        if (canvas.quickReject(r.left, r.top, r.right, r.bottom, 
-                Canvas.EdgeType.AA)) {
+        if (canvas.quickReject(r.left, r.top, r.right, r.bottom, Canvas.EdgeType.AA)) {
            return;
        }
        if (drawTrack) {