commit 743d5c95f3a107639c0ff22f099cab2624da3e27
author Winson Chung <winsonc@google.com> Fri Jun 13 10:14:53 2014 -0700
committer Winson Chung <winsonc@google.com> Fri Jun 13 15:27:47 2014 -0700
tree 50a702c7226f40a3a51d758e39951667238bf0f7
parent ad6f276670443ac8f9b73497dae185bb005c3a76

Clipping the task bar against the task view.

- Skipping nav bar scrim animation when animating without window transitions

Change-Id: I8652f3956971f07bb410b801bf627d51c5e987cd

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 ffd4135..f84d564 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -29,7 +29,6 @@
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewParent;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.FrameLayout;
 import com.android.systemui.R;
@@ -76,6 +75,18 @@
                     updateDimOverlayFromScale();
                 }
             };
+    Runnable mEnableThumbnailClip = new Runnable() {
+        @Override
+        public void run() {
+            mThumbnailView.updateTaskBarClip(mBarView);
+        }
+    };
+    Runnable mDisableThumbnailClip = new Runnable() {
+        @Override
+        public void run() {
+            mThumbnailView.disableClipTaskBarView();
+        }
+    };
 
 
     public TaskView(Context context) {
@@ -105,8 +116,8 @@
         mClipViewInStack = true;
 
         // Bind the views
-        mThumbnailView = (TaskThumbnailView) findViewById(R.id.task_view_thumbnail);
         mBarView = (TaskBarView) findViewById(R.id.task_view_bar);
+        mThumbnailView = (TaskThumbnailView) findViewById(R.id.task_view_thumbnail);
 
         if (mTaskDataLoaded) {
             onTaskDataLoaded(false);
@@ -276,7 +287,7 @@
                     @Override
                     public void run() {
                         // Animate the task bar of the first task view
-                        mBarView.animateOnEnterRecents(0);
+                        mBarView.animateOnEnterRecents(0, mEnableThumbnailClip);
                         setVisibility(View.VISIBLE);
                     }
                 });
@@ -290,19 +301,23 @@
                         .setInterpolator(mConfig.linearOutSlowInInterpolator)
                         .setDuration(475)
                         .withLayer()
+                        .withEndAction(mEnableThumbnailClip)
                         .start();
             }
 
         } else if (mConfig.launchedFromAppWithThumbnail) {
             if (ctx.isFrontMost) {
                 // Animate the task bar of the first task view
-                mBarView.animateOnEnterRecents(mConfig.taskBarEnterAnimDelay);
+                mBarView.animateOnEnterRecents(mConfig.taskBarEnterAnimDelay, mEnableThumbnailClip);
+
                 // Animate the dim into view as well
                 ObjectAnimator anim = ObjectAnimator.ofInt(this, "dim", getDimOverlayFromScale());
                 anim.setStartDelay(mConfig.taskBarEnterAnimDelay);
                 anim.setDuration(mConfig.taskBarEnterAnimDuration);
                 anim.setInterpolator(mConfig.fastOutLinearInInterpolator);
                 anim.start();
+            } else {
+                mEnableThumbnailClip.run();
             }
 
         } else if (mConfig.launchedFromHome) {
@@ -318,6 +333,7 @@
                     .setInterpolator(mConfig.quintOutInterpolator)
                     .setDuration(mConfig.taskViewEnterFromHomeDuration)
                     .withLayer()
+                    .withEndAction(mEnableThumbnailClip)
                     .start();
         }
     }
@@ -347,7 +363,8 @@
 
     /** Animates this task view as it exits recents */
     public void animateOnLaunchingTask(final Runnable r) {
-        mBarView.animateOnLaunchingTask(r);
+        // Disable the thumbnail clip and animate the bar out
+        mBarView.animateOnLaunchingTask(mDisableThumbnailClip, r);
 
         // Animate the dim
         if (mDim > 0) {