aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tony Wickham
2017-01-31 22:38:36 +00:00
committed by Android (Google) Code Review
parent cf23ef3000 1f0b5347b8
commit bdbfd5bb3a
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/launcher3/notification/NotificationFooterLayout.java
View File

@@ -36,10 +36,8 @@ import com.android.launcher3.graphics.IconPalette;
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 @@ public class NotificationFooterLayout extends LinearLayout {
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 class NotificationFooterLayout extends LinearLayout {
*/
public void commitNotificationInfos() {
mIconRow.removeAllViews();
mViewsToInfos.clear();
for (int i = 0; i < mNotifications.size(); i++) {
NotificationInfo info = mNotifications.get(i);
@@ -141,8 +137,8 @@ public class NotificationFooterLayout extends LinearLayout {
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 @@ public class NotificationFooterLayout extends LinearLayout {
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 @@ public class NotificationFooterLayout extends LinearLayout {
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);