summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <winsonc@google.com> 2015-12-04 15:48:04 -0800
committer Winson Chung <winsonc@google.com> 2015-12-11 15:56:39 +0000
commit7b3ccf54cb541cca40d44634c2ded1ff42ef4d07 (patch)
treea2b8fb92baeb8332f6e278a73ac3ebe340f0c309
parent49795ca7ed630efa04c6c4ad8cc5e799bd35a76f (diff)
Removing old focus animation on the header bar.
Change-Id: I892fda95ec5e74ee779283a5873210f301fbe778
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java1
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java35
2 files changed, 0 insertions, 36 deletions
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 cfffc5f95daf..1e2227e3a77a 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -658,7 +658,6 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
}
SystemServicesProxy ssp = Recents.getSystemServices();
- mHeaderView.onTaskViewFocusChanged(isFocused, animated);
if (isFocused) {
if (requestViewFocus && !isFocused()) {
requestFocus();
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
index 6a1f6d19722b..d8220fd16c28 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -56,8 +56,6 @@ import com.android.systemui.recents.model.Task;
public class TaskViewHeader extends FrameLayout
implements View.OnClickListener, View.OnLongClickListener {
- private static final float FOCUS_TRANSLATION_Z = 4f;
-
Task mTask;
// Header views
@@ -74,7 +72,6 @@ public class TaskViewHeader extends FrameLayout
Drawable mDarkDismissDrawable;
RippleDrawable mBackground;
GradientDrawable mBackgroundColorDrawable;
- ObjectAnimator mFocusAnimator;
String mDismissContentDescription;
// Static highlight that we draw at the top of each view
@@ -248,9 +245,6 @@ public class TaskViewHeader extends FrameLayout
mApplicationIcon.setImageDrawable(null);
mApplicationIcon.setOnClickListener(null);
mMoveTaskButton.setOnClickListener(null);
-
- // Stop any focus animations
- Utilities.cancelAnimationWithoutCallbacks(mFocusAnimator);
}
/** Updates the resize task bar button. */
@@ -349,35 +343,6 @@ public class TaskViewHeader extends FrameLayout
mCornerRadius, mCornerRadius, mDimLayerPaint);
}
- /** Notifies the associated TaskView has been focused. */
- void onTaskViewFocusChanged(boolean focused, boolean animateFocusedState) {
- boolean isRunning = false;
- if (mFocusAnimator != null) {
- isRunning = mFocusAnimator.isRunning();
- }
- Utilities.cancelAnimationWithoutCallbacks(mFocusAnimator);
-
- if (focused) {
- if (animateFocusedState) {
- // Bump up the translation
- mFocusAnimator = ObjectAnimator.ofFloat(this, "translationZ", FOCUS_TRANSLATION_Z);
- mFocusAnimator.setDuration(200);
- mFocusAnimator.start();
- } else {
- setTranslationZ(FOCUS_TRANSLATION_Z);
- }
- } else {
- if (isRunning) {
- // Restore the translation
- mFocusAnimator = ObjectAnimator.ofFloat(this, "translationZ", 0f);
- mFocusAnimator.setDuration(150);
- mFocusAnimator.start();
- } else {
- setTranslationZ(0f);
- }
- }
- }
-
@Override
public void onClick(View v) {
if (v == mApplicationIcon) {