Refactoring to AnimatedEvent.
Change-Id: I87ce63201120dc687eccd63024801cc2c19bebd6
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index 53c02cb..9b1315a 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -132,10 +132,7 @@
mHistoryButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ReferenceCountedTrigger postHideStackAnimationTrigger = new ReferenceCountedTrigger(v.getContext());
- postHideStackAnimationTrigger.increment();
- EventBus.getDefault().send(new ShowHistoryEvent(postHideStackAnimationTrigger));
- postHideStackAnimationTrigger.decrement();
+ EventBus.getDefault().send(new ShowHistoryEvent());
}
});
addView(mHistoryButton);
@@ -576,8 +573,8 @@
public final void onBusEvent(ShowHistoryEvent event) {
// Hide the history button when the history view is shown
hideHistoryButton(getResources().getInteger(R.integer.recents_history_transition_duration),
- event.postHideStackAnimationTrigger);
- event.postHideStackAnimationTrigger.addLastDecrementRunnable(new Runnable() {
+ event.getAnimationTrigger());
+ event.addPostAnimationCallback(new Runnable() {
@Override
public void run() {
setAlpha(0f);
@@ -589,7 +586,7 @@
// Show the history button when the history view is hidden
setAlpha(1f);
showHistoryButton(getResources().getInteger(R.integer.recents_history_transition_duration),
- event.postHideHistoryAnimationTrigger);
+ event.getAnimationTrigger());
}
public final void onBusEvent(ShowHistoryButtonEvent event) {
@@ -609,10 +606,9 @@
* Shows the history button.
*/
private void showHistoryButton(final int duration) {
- ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(getContext());
- postAnimationTrigger.increment();
+ ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger();
showHistoryButton(duration, postAnimationTrigger);
- postAnimationTrigger.decrement();
+ postAnimationTrigger.flushLastDecrementRunnables();
}
private void showHistoryButton(final int duration,
@@ -638,10 +634,9 @@
* Hides the history button.
*/
private void hideHistoryButton(int duration) {
- ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(getContext());
- postAnimationTrigger.increment();
+ ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger();
hideHistoryButton(duration, postAnimationTrigger);
- postAnimationTrigger.decrement();
+ postAnimationTrigger.flushLastDecrementRunnables();
}
private void hideHistoryButton(int duration,