commit bdbfd5bb3a25caaa438237d1ffbf5b5f7b051521
author Tony Wickham <twickham@google.com> Tue Jan 31 22:38:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 22:38:37 2017 +0000
tree 3512a098ef37694ff806adcd48f43b8742645d0a
parent cf23ef30001dc9de940f40af8a0a0b83ec0e58ae
parent 1f0b5347b8aeb1f796c7d68ca4ee06660cbb1a2c

Merge "Use notification icon views' tags to store NotificationInfo." into ub-launcher3-master

src/com/android/launcher3/notification/NotificationFooterLayout.java

diff --git a/src/com/android/launcher3/notification/NotificationFooterLayout.java b/src/com/android/launcher3/notification/NotificationFooterLayout.java
index 07178ce..58789f6 100644
--- a/src/com/android/launcher3/notification/NotificationFooterLayout.java
+++ b/src/com/android/launcher3/notification/NotificationFooterLayout.java
@@ -36,10 +36,8 @@
 import com.android.launcher3.popup.PopupContainerWithArrow;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A {@link LinearLayout} that contains only icons of notifications.
@@ -57,7 +55,6 @@
 
     private final List<NotificationInfo> mNotifications = new ArrayList<>();
     private final List<NotificationInfo> mOverflowNotifications = new ArrayList<>();
-    private final Map<View, NotificationInfo> mViewsToInfos = new HashMap<>();
 
     LinearLayout.LayoutParams mIconLayoutParams;
     private LinearLayout mIconRow;
@@ -115,7 +112,6 @@
      */
     public void commitNotificationInfos() {
         mIconRow.removeAllViews();
-        mViewsToInfos.clear();
 
         for (int i = 0; i < mNotifications.size(); i++) {
             NotificationInfo info = mNotifications.get(i);
@@ -141,8 +137,8 @@
             icon.setAlpha(0);
             icon.animate().alpha(1);
         }
+        icon.setTag(info);
         mIconRow.addView(icon, addIndex, mIconLayoutParams);
-        mViewsToInfos.put(icon, info);
     }
 
     private void updateOverflowText(TextView overflowTextView) {
@@ -165,7 +161,7 @@
         moveAndScaleIcon.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
-                callback.onIconAnimationEnd(mViewsToInfos.get(firstNotification));
+                callback.onIconAnimationEnd((NotificationInfo) firstNotification.getTag());
             }
         });
         animation.play(moveAndScaleIcon);
@@ -207,11 +203,10 @@
             if (child instanceof TextView) {
                 overflowView = (TextView) child;
             } else {
-                NotificationInfo childInfo = mViewsToInfos.get(child);
+                NotificationInfo childInfo = (NotificationInfo) child.getTag();
                 if (!notifications.contains(childInfo.notificationKey)) {
                     mIconRow.removeView(child);
                     mNotifications.remove(childInfo);
-                    mViewsToInfos.remove(child);
                     if (!mOverflowNotifications.isEmpty()) {
                         NotificationInfo notification = mOverflowNotifications.remove(0);
                         mNotifications.add(notification);