base: Improve notification header toggle

* Actually toggle on runtime (no restart required now)
* Solve a bug where notification headers would sometimes shortly show
* Improve some code, unregister click listeners when headers are
  invisible

Change-Id: I5a72f01e438b0c769476383dc834d162b6356f11

Author: idoybh

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt

@@ -160,11 +160,14 @@ class NotificationSectionsManager @Inject internal constructor(
                 silentHeaderView, layoutInflater, R.layout.status_bar_notification_section_header
         ).apply {
             if (mShowHeaders) {
+                setVisibility(View.VISIBLE)
                 setHeaderText(R.string.notification_section_header_gentle)
                 setOnHeaderClickListener { onGentleHeaderClick() }
                 setOnClearAllClickListener { onClearGentleNotifsClick(it) }
             } else {
                 setVisibility(View.GONE)
+                setOnHeaderClickListener(null)
+                setOnClearAllClickListener(null)
             }
 
             if (mCenterHeaders) {
@@ -177,10 +180,12 @@ class NotificationSectionsManager @Inject internal constructor(
                 alertingHeaderView, layoutInflater, R.layout.status_bar_notification_section_header
         ).apply {
             if (mShowHeaders) {
+                setVisibility(View.VISIBLE)
                 setHeaderText(R.string.notification_section_header_alerting)
                 setOnHeaderClickListener { onGentleHeaderClick() }
             } else {
                 setVisibility(View.GONE)
+                setOnHeaderClickListener(null)
             }
 
             if (mCenterHeaders) {
@@ -191,13 +196,15 @@ class NotificationSectionsManager @Inject internal constructor(
         }
         peopleHubSubscription?.unsubscribe()
         peopleHubSubscription = null
-        peopleHeaderView = reinflateView(peopleHeaderView, layoutInflater, R.layout.people_strip
-        ).apply {
-            if (!mShowHeaders) {
-                setVisibility(View.GONE)
-            } else {
-                setOnHeaderClickListener(View.OnClickListener { onPeopleHeaderClick() })
-            }
+        peopleHeaderView = reinflateView(peopleHeaderView, layoutInflater, R.layout.people_strip)
+                .apply {
+                    if (!mShowHeaders) {
+                        setVisibility(View.GONE)
+                        setOnHeaderClickListener(null)
+                    } else {
+                        setVisibility(View.VISIBLE)
+                        setOnHeaderClickListener(View.OnClickListener { onPeopleHeaderClick() })
+                    }
 
             if (mCenterHeaders) {
                 setLabelGravity(Gravity.CENTER or Gravity.CENTER_VERTICAL)
@@ -212,10 +219,12 @@ class NotificationSectionsManager @Inject internal constructor(
                 incomingHeaderView, layoutInflater, R.layout.status_bar_notification_section_header
         ).apply {
             if (mShowHeaders) {
+                setVisibility(View.VISIBLE)
                 setHeaderText(R.string.notification_section_header_incoming)
                 setOnHeaderClickListener { onGentleHeaderClick() }
             } else {
                 setVisibility(View.GONE)
+                setOnHeaderClickListener(null)
             }
 
             if (mCenterHeaders) {
@@ -229,6 +238,14 @@ class NotificationSectionsManager @Inject internal constructor(
                         .also(keyguardMediaController::attach)
     }
 
+    fun setHeadersVisibility(visible: Boolean) {
+        if  (mShowHeaders != visible) {
+            mShowHeaders = visible
+            reinflateViews(LayoutInflater.from(parent.context))
+            if (visible) updateSectionBoundaries("headers toggled on")
+        }
+    }
+
     override fun beginsSection(view: View, previous: View?): Boolean =
             view === silentHeaderView ||
             view === mediaControlsView ||
@@ -342,6 +359,7 @@ class NotificationSectionsManager @Inject internal constructor(
         // target, but won't be once they are moved / removed after the pass has completed.
 
         val showHeaders = statusBarStateController.state != StatusBarState.KEYGUARD
+                && mShowHeaders
         val usingPeopleFiltering = sectionsFeatureManager.isFilteringEnabled()
         val usingMediaControls = sectionsFeatureManager.isMediaControlsEnabled()
 

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

@@ -42,6 +42,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Outline;
@@ -51,7 +52,9 @@
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -548,6 +551,34 @@ public void getOutline(View view, Outline outline) {
                 updateDecorViews(useDarkText);
             };
 
+    private CustomSettingsObserver mCustomSettingsObserver = new CustomSettingsObserver(new Handler());
+    private class CustomSettingsObserver extends ContentObserver {
+        CustomSettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.NOTIFICATION_HEADERS),
+                    false, this, UserHandle.USER_ALL);
+        }
+
+        void stop() {
+            mContext.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            update();
+        }
+
+        void update() {
+            boolean enabled = Settings.System.getIntForUser(getContext().getContentResolver(),
+                    Settings.System.NOTIFICATION_HEADERS, 1, UserHandle.USER_CURRENT) == 1;
+            mSectionsManager.setHeadersVisibility(enabled);
+        }
+    }
+
     @Inject
     public NotificationStackScrollLayout(
             @Named(VIEW_CONTEXT) Context context,
@@ -870,6 +901,7 @@ protected void onAttachedToWindow() {
         ((SysuiStatusBarStateController) Dependency.get(StatusBarStateController.class))
                 .addCallback(mStateListener, SysuiStatusBarStateController.RANK_STACK_SCROLLER);
         Dependency.get(ConfigurationController.class).addCallback(this);
+        mCustomSettingsObserver.observe();
     }
 
     @Override
@@ -878,6 +910,7 @@ protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         Dependency.get(StatusBarStateController.class).removeCallback(mStateListener);
         Dependency.get(ConfigurationController.class).removeCallback(this);
+        mCustomSettingsObserver.stop();
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt

@@ -95,7 +95,7 @@ class PeopleHubView(context: Context, attrs: AttributeSet) :
         }
     }
 
-    fun setOnHeaderClickListener(listener: OnClickListener) = label.setOnClickListener(listener)
+    fun setOnHeaderClickListener(listener: OnClickListener?) = label.setOnClickListener(listener)
 
     private inner class PersonDataListenerImpl(val avatarView: ImageView) :
             DataListener<PersonViewModel?> {