am ec790410: am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev

* commit 'ec7904102036c27381a3d3281a9b2ef193690e7e':
  Potential fix for bug 7352816
This commit is contained in:
Michael Jurka
2012-10-18 08:54:29 -07:00
committed by Android Git Automerger

View File

@@ -185,6 +185,16 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
final Activity activity = (Activity) RecentsPanelView.this.getContext(); final Activity activity = (Activity) RecentsPanelView.this.getContext();
final SystemUIApplication app = (SystemUIApplication) activity.getApplication(); final SystemUIApplication app = (SystemUIApplication) activity.getApplication();
if (app.isWaitingForWindowAnimationStart()) { 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; mItemToAnimateInWhenWindowAnimationIsFinished = holder;
final int translation = -getResources().getDimensionPixelSize( final int translation = -getResources().getDimensionPixelSize(
R.dimen.status_bar_recents_app_icon_translate_distance); R.dimen.status_bar_recents_app_icon_translate_distance);