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

Remove first icon from notification footer after it animates.

Browse Source 
Before, we had a hack where the notifation view would tell the
footer to trim its notifications, which is inefficient and ugly
since we already know exactly what notification to remove. So
now we move the relevant removal logic (keeping things like the
overflow text in sync) to a removeViewFromIconRow() that is
used after the icon animates as well as when trimming notifications.

Bug: 32410600
Change-Id: I19e54e0c28daea869b45649c7f5c74843412bb86
This commit is contained in:
Tony Wickham
2017-01-27 13:18:30 -08:00
parent 9f0fa84439
commit 6d66c1cfeb
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ public class NotificationFooterLayout extends LinearLayout {
private LinearLayout mIconRow;
private int mBackgroundColor;
private int mTextColor;
private TextView mOverflowView;
public NotificationFooterLayout(Context context) {
this(context, null, 0);
@@ -120,10 +121,10 @@ public class NotificationFooterLayout extends LinearLayout {
}
if (!mOverflowNotifications.isEmpty()) {
TextView overflowText = new TextView(getContext());
overflowText.setTextColor(mTextColor);
updateOverflowText(overflowText);
mIconRow.addView(overflowText, mIconLayoutParams);
mOverflowView = new TextView(getContext());
mOverflowView.setTextColor(mTextColor);
updateOverflowText();
mIconRow.addView(mOverflowView, mIconLayoutParams);
}
}
@@ -142,8 +143,8 @@ public class NotificationFooterLayout extends LinearLayout {
mIconRow.addView(icon, addIndex, mIconLayoutParams);
}
private void updateOverflowText(TextView overflowTextView) {
overflowTextView.setText(getResources().getString(R.string.deep_notifications_overflow,
private void updateOverflowText() {
mOverflowView.setText(getResources().getString(R.string.deep_notifications_overflow,
mOverflowNotifications.size()));
}
@@ -162,6 +163,7 @@ public class NotificationFooterLayout extends LinearLayout {
@Override
public void onAnimationEnd(Animator animation) {
callback.onIconAnimationEnd((NotificationInfo) firstNotification.getTag());
removeViewFromIconRow(firstNotification);
}
});
animation.play(moveAndScaleIcon);
@@ -178,7 +180,6 @@ public class NotificationFooterLayout extends LinearLayout {
public void onAnimationEnd(Animator animation) {
// We have to set the translation X to 0 when the new main notification
// is removed from the footer.
// TODO: remove it here instead of expecting trimNotifications to do so.
child.setTranslationX(0);
}
});
@@ -187,6 +188,38 @@ public class NotificationFooterLayout extends LinearLayout {
animation.start();
}
private void removeViewFromIconRow(View child) {
mIconRow.removeView(child);
mNotifications.remove((NotificationInfo) child.getTag());
if (!mOverflowNotifications.isEmpty()) {
NotificationInfo notification = mOverflowNotifications.remove(0);
mNotifications.add(notification);
addNotificationIconForInfo(notification, true /* fromOverflow */);
}
if (mOverflowView != null) {
if (mOverflowNotifications.isEmpty()) {
mIconRow.removeView(mOverflowView);
mOverflowView = null;
} else {
updateOverflowText();
}
}
if (mIconRow.getChildCount() == 0) {
// There are no more icons in the secondary view, so hide it.
PopupContainerWithArrow popup = PopupContainerWithArrow.getOpen(
Launcher.getLauncher(getContext()));
int newHeight = getResources().getDimensionPixelSize(
R.dimen.notification_footer_collapsed_height);
AnimatorSet collapseSecondary = LauncherAnimUtils.createAnimatorSet();
collapseSecondary.play(popup.animateTranslationYBy(getHeight() - newHeight, 0));
collapseSecondary.play(LauncherAnimUtils.animateViewHeight(
this, getHeight(), newHeight));
collapseSecondary.setDuration(getResources().getInteger(
R.integer.config_removeNotificationViewDuration));
collapseSecondary.start();
}
}
public void trimNotifications(List<String> notifications) {
if (!isAttachedToWindow() || mIconRow.getChildCount() == 0) {
return;
@@ -205,35 +238,9 @@ public class NotificationFooterLayout extends LinearLayout {
} else {
NotificationInfo childInfo = (NotificationInfo) child.getTag();
if (!notifications.contains(childInfo.notificationKey)) {
mIconRow.removeView(child);
mNotifications.remove(childInfo);
if (!mOverflowNotifications.isEmpty()) {
NotificationInfo notification = mOverflowNotifications.remove(0);
mNotifications.add(notification);
addNotificationIconForInfo(notification, true /* fromOverflow */);
}
removeViewFromIconRow(child);
}
}
}
if (overflowView != null) {
if (mOverflowNotifications.isEmpty()) {
mIconRow.removeView(overflowView);
} else {
updateOverflowText(overflowView);
}
}
if (mIconRow.getChildCount() == 0) {
// There are no more icons in the secondary view, so hide it.
PopupContainerWithArrow popup = PopupContainerWithArrow.getOpen(
Launcher.getLauncher(getContext()));
int newHeight = getResources().getDimensionPixelSize(
R.dimen.notification_footer_collapsed_height);
AnimatorSet collapseSecondary = LauncherAnimUtils.createAnimatorSet();
collapseSecondary.play(popup.animateTranslationYBy(getHeight() - newHeight,
getResources().getInteger(R.integer.config_removeNotificationViewDuration)));
collapseSecondary.play(LauncherAnimUtils.animateViewHeight(
this, getHeight(), newHeight));
collapseSecondary.start();
}
}
}