Merge "Fixed that notifications weren't updating to the display size anymore" (678b7039) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationData.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -588,7 +588,7 @@ public class NotificationData {
	}		}

	public boolean areGutsExposed() {		public boolean areGutsExposed() {
	return row != null && row.getGuts().isExposed();		return row != null && row.getGuts() != null && row.getGuts().isExposed();
	}		}

	public boolean isChildInGroup() {		public boolean isChildInGroup() {

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -121,8 +121,6 @@ import com.android.internal.logging.MetricsLogger;
	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.internal.statusbar.IStatusBarService;		import com.android.internal.statusbar.IStatusBarService;
	import com.android.internal.statusbar.StatusBarIcon;		import com.android.internal.statusbar.StatusBarIcon;
	import com.android.internal.widget.MessagingGroup;
	import com.android.internal.widget.MessagingMessage;
	import com.android.keyguard.KeyguardUpdateMonitor;		import com.android.keyguard.KeyguardUpdateMonitor;
	import com.android.keyguard.KeyguardUpdateMonitorCallback;		import com.android.keyguard.KeyguardUpdateMonitorCallback;
	import com.android.keyguard.ViewMediatorCallback;		import com.android.keyguard.ViewMediatorCallback;
	@@ -1116,8 +1114,6 @@ public class StatusBar extends SystemUI implements DemoMode,

	@Override		@Override
	public void onDensityOrFontScaleChanged() {		public void onDensityOrFontScaleChanged() {
	MessagingMessage.dropCache();
	MessagingGroup.dropCache();
	// TODO: Remove this.		// TODO: Remove this.
	if (mBrightnessMirrorController != null) {		if (mBrightnessMirrorController != null) {
	mBrightnessMirrorController.onDensityOrFontScaleChanged();		mBrightnessMirrorController.onDensityOrFontScaleChanged();

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

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,8 @@ import android.widget.TextView;

	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.internal.statusbar.IStatusBarService;		import com.android.internal.statusbar.IStatusBarService;
			import com.android.internal.widget.MessagingGroup;
			import com.android.internal.widget.MessagingMessage;
	import com.android.keyguard.KeyguardUpdateMonitor;		import com.android.keyguard.KeyguardUpdateMonitor;
	import com.android.systemui.Dependency;		import com.android.systemui.Dependency;
	import com.android.systemui.InitController;		import com.android.systemui.InitController;
	@@ -62,9 +64,11 @@ import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
	import com.android.systemui.statusbar.notification.row.NotificationGutsManager.OnSettingsClickListener;		import com.android.systemui.statusbar.notification.row.NotificationGutsManager.OnSettingsClickListener;
	import com.android.systemui.statusbar.notification.row.NotificationInfo.CheckSaveListener;		import com.android.systemui.statusbar.notification.row.NotificationInfo.CheckSaveListener;
	import com.android.systemui.statusbar.notification.stack.NotificationListContainer;		import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
			import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.KeyguardMonitor;		import com.android.systemui.statusbar.policy.KeyguardMonitor;

	public class StatusBarNotificationPresenter implements NotificationPresenter {		public class StatusBarNotificationPresenter implements NotificationPresenter,
			ConfigurationController.ConfigurationListener {

	private final LockscreenGestureLogger mLockscreenGestureLogger =		private final LockscreenGestureLogger mLockscreenGestureLogger =
	Dependency.get(LockscreenGestureLogger.class);		Dependency.get(LockscreenGestureLogger.class);
	@@ -168,9 +172,13 @@ public class StatusBarNotificationPresenter implements NotificationPresenter {

	onUserSwitched(mLockscreenUserManager.getCurrentUserId());		onUserSwitched(mLockscreenUserManager.getCurrentUserId());
	});		});
			Dependency.get(ConfigurationController.class).addCallback(this);
	}		}

			@Override
	public void onDensityOrFontScaleChanged() {		public void onDensityOrFontScaleChanged() {
			MessagingMessage.dropCache();
			MessagingGroup.dropCache();
	if (!KeyguardUpdateMonitor.getInstance(mContext).isSwitchingUser()) {		if (!KeyguardUpdateMonitor.getInstance(mContext).isSwitchingUser()) {
	mEntryManager.updateNotificationsOnDensityOrFontScaleChanged();		mEntryManager.updateNotificationsOnDensityOrFontScaleChanged();
	} else {		} else {