Merge "Re-add notification history tunable" (6c12c5d9) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.statusbar.notification;

		import android.annotation.Nullable;
		import android.util.ArraySet;

		import com.android.systemui.dagger.SysUISingleton;
		@@ -36,11 +37,11 @@ public class DynamicPrivacyController implements KeyguardStateController.Callbac
		private final KeyguardStateController mKeyguardStateController;
		private final NotificationLockscreenUserManager mLockscreenUserManager;
		private final StatusBarStateController mStateController;
		private ArraySet<Listener> mListeners = new ArraySet<>();
		private final ArraySet<Listener> mListeners = new ArraySet<>();

		private boolean mLastDynamicUnlocked;
		private boolean mCacheInvalid;
		private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
		@Nullable private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

		@Inject
		DynamicPrivacyController(NotificationLockscreenUserManager notificationLockscreenUserManager,
		@@ -96,8 +97,7 @@ public class DynamicPrivacyController implements KeyguardStateController.Callbac
		* contents aren't revealed yet?
		*/
		public boolean isInLockedDownShade() {
		if (!mStatusBarKeyguardViewManager.isShowing()
		\|\| !mKeyguardStateController.isMethodSecure()) {
		if (!isStatusBarKeyguardShowing() \|\| !mKeyguardStateController.isMethodSecure()) {
		return false;
		}
		int state = mStateController.getState();
		@@ -110,6 +110,10 @@ public class DynamicPrivacyController implements KeyguardStateController.Callbac
		return true;
		}

		private boolean isStatusBarKeyguardShowing() {
		return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isShowing();
		}

		public void setStatusBarKeyguardViewManager(
		StatusBarKeyguardViewManager statusBarKeyguardViewManager) {
		mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

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

+1 −1

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

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

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -94,11 +94,16 @@ 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();
		}
		}, HIGH_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL);
		},
		Settings.Secure.NOTIFICATION_DISMISS_RTL,
		Settings.Secure.NOTIFICATION_HISTORY_ENABLED);
		}

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