Merge "Waiting for reinflating the notifications until the user switched" (25e98e3c) · Commits · e / os / android_frameworks_base

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

+25 −11

Original line number	Diff line number	Diff line
		@@ -715,6 +715,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		private NotificationIconAreaController mNotificationIconAreaController;
		private ConfigurationListener mConfigurationListener;
		private InflationExceptionHandler mInflationExceptionHandler = this::handleInflationException;
		private boolean mReinflateNotificationsOnUserSwitched;

		private void recycleAllVisibilityObjects(ArraySet<NotificationVisibility> array) {
		final int N = array.size();
		@@ -1274,16 +1275,10 @@ public class StatusBar extends SystemUI implements DemoMode,

		protected void onDensityOrFontScaleChanged() {
		// start old BaseStatusBar.onDensityOrFontScaleChanged().
		ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
		for (int i = 0; i < activeNotifications.size(); i++) {
		Entry entry = activeNotifications.get(i);
		boolean exposedGuts = mNotificationGutsExposed != null
		&& entry.row.getGuts() == mNotificationGutsExposed;
		entry.row.onDensityOrFontScaleChanged();
		if (exposedGuts) {
		mNotificationGutsExposed = entry.row.getGuts();
		bindGuts(entry.row, mGutsMenuItem);
		}
		if (!KeyguardUpdateMonitor.getInstance(mContext).isSwitchingUser()) {
		updateNotificationsOnDensityOrFontScaleChanged();
		} else {
		mReinflateNotificationsOnUserSwitched = true;
		}
		// end old BaseStatusBar.onDensityOrFontScaleChanged().
		mScrimController.onDensityOrFontScaleChanged();
		@@ -1308,6 +1303,20 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}

		private void updateNotificationsOnDensityOrFontScaleChanged() {
		ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
		for (int i = 0; i < activeNotifications.size(); i++) {
		Entry entry = activeNotifications.get(i);
		boolean exposedGuts = mNotificationGutsExposed != null
		&& entry.row.getGuts() == mNotificationGutsExposed;
		entry.row.onDensityOrFontScaleChanged();
		if (exposedGuts) {
		mNotificationGutsExposed = entry.row.getGuts();
		bindGuts(entry.row, mGutsMenuItem);
		}
		}
		}

		private void inflateSignalClusters() {
		reinflateSignalCluster(mKeyguardStatusBar);
		}
		@@ -3598,7 +3607,12 @@ public class StatusBar extends SystemUI implements DemoMode,
		if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId);
		animateCollapsePanels();
		updatePublicMode();
		updateNotifications();
		mNotificationData.filterAndSort();
		if (mReinflateNotificationsOnUserSwitched) {
		updateNotificationsOnDensityOrFontScaleChanged();
		mReinflateNotificationsOnUserSwitched = false;
		}
		updateNotificationShade();
		clearCurrentMediaNotification();
		setLockscreenUser(newUserId);
		}