diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-18 08:48:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-18 08:48:41 -0700 |
| commit | 341aa8e0e8753ddb5eca22311e7d671e0518f326 (patch) | |
| tree | 47f73937f9395b298b6bdac6dc9ca25701732ec4 | |
| parent | a4c356cad7de0ef30faeaeadacd21b6eae913541 (diff) | |
| parent | a924076b4f4f8bb77142c928cb7ca24f684c2818 (diff) | |
| download | frameworks_base-341aa8e0e8753ddb5eca22311e7d671e0518f326.zip frameworks_base-341aa8e0e8753ddb5eca22311e7d671e0518f326.tar.gz frameworks_base-341aa8e0e8753ddb5eca22311e7d671e0518f326.tar.bz2 | |
Merge "Potential fix for bug 7352816" into jb-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 57d2ed3..9f0bcf5 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -185,6 +185,16 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener final Activity activity = (Activity) RecentsPanelView.this.getContext(); final SystemUIApplication app = (SystemUIApplication) activity.getApplication(); if (app.isWaitingForWindowAnimationStart()) { + if (mItemToAnimateInWhenWindowAnimationIsFinished != null) { + for (View v : + new View[] { holder.iconView, holder.labelView, holder.calloutLine }) { + if (v != null) { + v.setAlpha(1f); + v.setTranslationX(0f); + v.setTranslationY(0f); + } + } + } mItemToAnimateInWhenWindowAnimationIsFinished = holder; final int translation = -getResources().getDimensionPixelSize( R.dimen.status_bar_recents_app_icon_translate_distance); |