commit 7b7ca3cdf25bee73aa9e58aaaf6ce75fe81bd045
author Chris Craik <ccraik@google.com> Fri Jul 11 13:32:19 2014 -0700
committer Chris Craik <ccraik@google.com> Fri Jul 11 19:02:28 2014 -0700
tree 92d4a2a1f2907e06ab62410b18b591248f4bc1ff
parent 325503caef80ebce0da3e4d5fa2ac3f917dd1b1d

Disable setOutline() functionality, pending full removal

bug:15283203
Change-Id: Ibf127fecfcda835117c6087180c64f622b3041e4

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
index 125b018..5524e15 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -27,6 +27,7 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewOutlineProvider;
 import android.view.ViewPropertyAnimator;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.FrameLayout;
@@ -66,7 +67,6 @@
     boolean mClipViewInStack;
     Rect mTmpRect = new Rect();
     Paint mLayerPaint = new Paint();
-    Outline mOutline = new Outline();
 
     TaskThumbnailView mThumbnailView;
     TaskBarView mBarView;
@@ -115,6 +115,15 @@
         setClipToOutline(true);
         setDim(getDim());
         setFooterHeight(getFooterHeight());
+        setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public boolean getOutline(View view, Outline outline) {
+                int height = getHeight() - mMaxFooterHeight + mFooterHeight;
+                outline.setRoundRect(0, 0, getWidth(), height,
+                        mConfig.taskViewRoundedCornerRadiusPx);
+                return true;
+            }
+        });
     }
 
     @Override
@@ -149,20 +158,6 @@
         mThumbnailView.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY));
         setMeasuredDimension(width, height);
-        updateOutline();
-    }
-
-    /** Updates the outline to match whether the lock-to-app button is visible or not. */
-    void updateOutline() {
-        int height = getMeasuredHeight();
-        if (height == 0) return;
-
-        // Account for the current footer height
-        height = height - mMaxFooterHeight + mFooterHeight;
-
-        mOutline.setRoundRect(0, 0, getMeasuredWidth(), height,
-                mConfig.taskViewRoundedCornerRadiusPx);
-        setOutline(mOutline);
     }
 
     /** Set callback */
@@ -548,7 +543,7 @@
     /** Sets the footer height. */
     public void setFooterHeight(int height) {
         mFooterHeight = height;
-        updateOutline();
+        invalidateOutline();
         invalidate(0, getMeasuredHeight() - mMaxFooterHeight, getMeasuredWidth(),
                 getMeasuredHeight());
     }