OSDN Git Service

Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev
authorWinson Chung <winsonc@google.com>
Tue, 19 Aug 2014 20:47:04 +0000 (20:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:03:42 +0000 (04:03 +0000)
1  2 
packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java

@@@ -223,12 -233,17 +234,17 @@@ class TaskViewHeader extends FrameLayou
      }
  
      /** Animates this task bar as it exits recents */
-     void startLaunchTaskAnimation(Runnable preAnimRunnable, final Runnable postAnimRunnable) {
+     void startLaunchTaskAnimation(Runnable preAnimRunnable, final Runnable postAnimRunnable,
+             boolean isFocused) {
+         if (isFocused) {
+             onTaskViewFocusChanged(false);
+         }
          // Animate the task bar out of the first task view
          animate()
 -                .translationY(-getMeasuredHeight())
 +                .alpha(0f)
                  .setStartDelay(0)
 -                .setInterpolator(mConfig.fastOutLinearInInterpolator)
 +                .setInterpolator(mConfig.linearOutSlowInInterpolator)
                  .setDuration(mConfig.taskBarExitAnimDuration)
                  .withStartAction(preAnimRunnable)
                  .withEndAction(new Runnable() {