summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2020-08-15 01:08:08 +0000
committer Suprabh Shukla <suprabh@google.com> 2020-08-15 02:12:15 +0000
commit58ff6d6a31aeea8d24a45cde20e389de332d9c4f (patch)
tree2af2c70bdee38dfeb8d81a080d37663a63c6ab04
parent99119cbc67b268c1104d3e454accad65ee8a92e2 (diff)
Revert "Re-add notification history tunable"
This reverts commit 99119cbc67b268c1104d3e454accad65ee8a92e2. Reason for revert: fixing apct/device_boot_health_check_extra breakage Bug: 164544701 Change-Id: Ib0aa74d53a614eaf51dc0859cbd434e0a0913344
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java15
2 files changed, 6 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 0bcebf9f83df..d2f8a39cc8fb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -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);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
index 344ad4a00c34..e724e65e98a2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
@@ -95,16 +95,11 @@ public class NotificationStackScrollLayoutController {
mNotificationRoundnessManager.setOnRoundingChangedCallback(mView::invalidate);
mView.addOnExpandedHeightChangedListener(mNotificationRoundnessManager::setExpanded);
- 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);
+ mTunerService.addTunable((key, newValue) -> {
+ if (key.equals(Settings.Secure.NOTIFICATION_DISMISS_RTL)) {
+ mView.updateDismissRtlSetting("1".equals(newValue));
+ }
+ }, HIGH_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL);
}
public void addOnExpandedHeightChangedListener(BiConsumer<Float, Float> listener) {