Revert "SystemUI: Show the alarm icon on QS as well"

Will need to be reimplemented if needed after QPR3

This reverts commit ced39973ad12c32c4b65b05c8dba7a66e28906f6.

Change-Id: I684281a125347eabae087ad90e2cee05567bfeef

2 files changed, 9 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
index 2ac17179e72a..467df1994d44 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
@@ -127,6 +127,8 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
     protected void onViewAttached() {
         mPrivacyIconsController.onParentVisible();
         mPrivacyIconsController.setChipVisibilityListener(this);
+        mIconContainer.addIgnoredSlot(
+                getResources().getString(com.android.internal.R.string.status_bar_alarm_clock));
         mIconContainer.setShouldRestrictIcons(false);
         mStatusBarIconController.addIconGroup(mIconManager);
 
diff --git a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
index 0d3234f66e96..e406be1ea0a3 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
@@ -282,6 +282,13 @@ class LargeScreenShadeHeaderController @Inject constructor(
             .setQSCarrierGroup(qsCarrierGroup)
             .build()
 
+        if (!combinedHeaders) {
+            // In the new header, we display alarm icon but we ignore it when not using the new
+            // headers.
+            iconContainer.addIgnoredSlot(
+                    context.getString(com.android.internal.R.string.status_bar_alarm_clock)
+            )
+        }
         if (combinedHeaders) {
             privacyIconsController.onParentVisible()
         }