Merge "Revert "Re-add notification history tunable"" (18bb6545) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3355,8 +3355,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd

		@ShadeViewRefactor(RefactorComponent.COORDINATOR)
		void onViewAddedInternal(ExpandableView child) {
		updateHideSensitiveForChild(child);
		child.setOnHeightChangedListener(mOnChildHeightChangedListener);
		updateHideSensitiveForChild(child);
		generateAddAnimation(child, false /* fromMoreCard */);
		updateAnimationState(child);
		updateChronometerForChild(child);

+5 −10

Original line number	Diff line number	Diff line
		@@ -95,16 +95,11 @@ public class NotificationStackScrollLayoutController {
		mNotificationRoundnessManager.setOnRoundingChangedCallback(mView::invalidate);
		mView.addOnExpandedHeightChangedListener(mNotificationRoundnessManager::setExpanded);

		mTunerService.addTunable(
		(key, newValue) -> {
		mTunerService.addTunable((key, newValue) -> {
		if (key.equals(Settings.Secure.NOTIFICATION_DISMISS_RTL)) {
		mView.updateDismissRtlSetting("1".equals(newValue));
		} else if (key.equals(Settings.Secure.NOTIFICATION_HISTORY_ENABLED)) {
		updateFooter();
		}
		},
		Settings.Secure.NOTIFICATION_DISMISS_RTL,
		Settings.Secure.NOTIFICATION_HISTORY_ENABLED);
		}, HIGH_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL);
		}

		public void addOnExpandedHeightChangedListener(BiConsumer<Float, Float> listener) {