From 4a0393e0d985c6e2eccf4ae2cad07d4c1e499c69 Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Wed, 21 Oct 2020 14:33:04 -0400
Subject: [PATCH] Remove unused flag in NotificationHeaderView

Test: SystemUITests
Change-Id: Ie21b0d9d113c8356279b4ae1b1dc7787c1a95d02
---
 core/java/android/view/NotificationHeaderView.java    | 11 -----------
 .../notification/row/NotificationContentView.java     |  1 -
 2 files changed, 12 deletions(-)

diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java
index 12ea936e96a10..a21b3a6fb7b4c 100644
--- a/core/java/android/view/NotificationHeaderView.java
+++ b/core/java/android/view/NotificationHeaderView.java
@@ -55,7 +55,6 @@ public class NotificationHeaderView extends ViewGroup {
     private CachingIconView mIcon;
     private View mProfileBadge;
     private View mFeedbackIcon;
-    private boolean mShowWorkBadgeAtEnd;
     private int mHeaderTextMarginEnd;
     private Drawable mBackground;
     private boolean mEntireHeaderClickable;
@@ -290,16 +289,6 @@ public class NotificationHeaderView extends ViewGroup {
         updateTouchListener();
     }
 
-    /**
-     * Sets whether or not the work badge appears at the end of the NotificationHeaderView.
-     * The expand button will always be closer to the end.
-     */
-    public void setShowWorkBadgeAtEnd(boolean showWorkBadgeAtEnd) {
-        if (showWorkBadgeAtEnd != mShowWorkBadgeAtEnd) {
-            mShowWorkBadgeAtEnd = showWorkBadgeAtEnd;
-        }
-    }
-
     /**
      * Sets the margin end for the text portion of the header, excluding right-aligned elements
      * @param headerTextMarginEnd margin size
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
index 160b6f78d9a36..71e1d12b610ee 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
@@ -336,7 +336,6 @@ public class NotificationContentView extends FrameLayout {
                                     ? contractedHeader.getPaddingLeft()
                                     : paddingEnd,
                             contractedHeader.getPaddingBottom());
-                    contractedHeader.setShowWorkBadgeAtEnd(false);
                     return true;
                 }
             }