commit c70636175c92e9682469f3a56db2c1d1cbbc66fd
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 31 19:21:51 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 31 19:21:51 2020 +0000
tree 8cf6f9f588c4495f7baa02b0801604553790d07b
parent b51f33f4cde98b8b278e778daa6c4eeeae865614
parent c4064004e732a6b9fd11d37fe9de7722dead047e

Merge "Disable conversation strip" into rvc-dev

packages/SystemUI/res/layout/people_strip.xml

diff --git a/packages/SystemUI/res/layout/people_strip.xml b/packages/SystemUI/res/layout/people_strip.xml
index f5ed103..7dcc46c 100644
--- a/packages/SystemUI/res/layout/people_strip.xml
+++ b/packages/SystemUI/res/layout/people_strip.xml
@@ -57,6 +57,7 @@
             android:padding="8dp"
             android:scaleType="fitCenter"
             android:forceHasOverlappingRendering="false"
+            android:visibility="gone"
         />
 
         <ImageView
@@ -65,6 +66,7 @@
             android:padding="8dp"
             android:scaleType="fitCenter"
             android:forceHasOverlappingRendering="false"
+            android:visibility="gone"
         />
 
         <ImageView
@@ -73,6 +75,7 @@
             android:padding="8dp"
             android:scaleType="fitCenter"
             android:forceHasOverlappingRendering="false"
+            android:visibility="gone"
         />
 
         <ImageView
@@ -81,6 +84,7 @@
             android:padding="8dp"
             android:scaleType="fitCenter"
             android:forceHasOverlappingRendering="false"
+            android:visibility="gone"
         />
 
         <ImageView
@@ -89,6 +93,7 @@
             android:padding="8dp"
             android:scaleType="fitCenter"
             android:forceHasOverlappingRendering="false"
+            android:visibility="gone"
         />
 
     </LinearLayout>

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java
index 5fd11fd..d38bc9f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java
@@ -67,6 +67,7 @@
 
     private static final String TAG = "NotifSectionsManager";
     private static final boolean DEBUG = false;
+    private static final boolean ENABLE_SNOOZED_CONVERSATION_HUB = false;
 
     private final ActivityStarter mActivityStarter;
     private final StatusBarStateController mStatusBarStateController;
@@ -193,7 +194,9 @@
             mPeopleHubSubscription.unsubscribe();
         }
         mPeopleHubView = reinflateView(mPeopleHubView, layoutInflater, R.layout.people_strip);
-        mPeopleHubSubscription = mPeopleHubViewAdapter.bindView(mPeopleHubViewBoundary);
+        if (ENABLE_SNOOZED_CONVERSATION_HUB) {
+            mPeopleHubSubscription = mPeopleHubViewAdapter.bindView(mPeopleHubViewBoundary);
+        }
 
         if (mMediaControlsView != null) {
             mKeyguardMediaPlayer.unbindView();