Merge "SysUI: Sort status bar notification icons" into lmp-dev (8e2128ba) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -1559,8 +1559,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		}

		for (View remove : toRemove) {
		mNotificationIcons.removeView(remove);
		final int toRemoveCount = toRemove.size();
		for (int i = 0; i < toRemoveCount; i++) {
		mNotificationIcons.removeView(toRemove.get(i));
		}

		for (int i=0; i<toShow.size(); i++) {
		@@ -1569,6 +1570,18 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mNotificationIcons.addView(v, i, params);
		}
		}

		// Resort notification icons
		final int childCount = mNotificationIcons.getChildCount();
		for (int i = 0; i < childCount; i++) {
		View actual = mNotificationIcons.getChildAt(i);
		StatusBarIconView expected = toShow.get(i);
		if (actual == expected) {
		continue;
		}
		mNotificationIcons.removeView(expected);
		mNotificationIcons.addView(expected, i);
		}
		}

		@Override