From c4064004e732a6b9fd11d37fe9de7722dead047e Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Tue, 31 Mar 2020 11:54:26 -0400
Subject: [PATCH] Disable conversation strip

Fixes: 149070144
Fixes: 149001624
Test: manual
Change-Id: I9dd9d949e937bfe288a0bbad2800ce8672d54a6f
---
 packages/SystemUI/res/layout/people_strip.xml                | 5 +++++
 .../notification/stack/NotificationSectionsManager.java      | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/people_strip.xml b/packages/SystemUI/res/layout/people_strip.xml
index f5ed1032df6ce..7dcc46c3ca091 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>
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 5fd11fd3ef14e..d38bc9f7a84d7 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 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section
 
     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 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section
             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();