commit a6ee4bd1bc9b892915cd94d4b0ea343ede5f7ebb
author Selim Cinek <cinek@google.com> Wed Sep 20 22:52:29 2017 +0000
committer Selim Cinek <cinek@google.com> Wed Sep 20 23:03:12 2017 +0000
tree 8d8a873cbbbabdca7ba761b74d0fa3093222dea3
parent 299b3302ef6ea5094f094e92f384853aa012172b

Revert "Increased the text size for colorized notifications"

This reverts commit 299b3302ef6ea5094f094e92f384853aa012172b.

Change-Id: Id887bd37f8f7b0c1ff48c339c9d59491f65cae84
Bug: 35925915
Fixes: 66067974

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index b48f15c1..7bc1a39 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -64,10 +64,10 @@
 import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem;
 import com.android.systemui.statusbar.NotificationGuts.GutsContent;
 import com.android.systemui.statusbar.notification.AboveShelfChangedListener;
+import com.android.systemui.statusbar.notification.AboveShelfObserver;
 import com.android.systemui.statusbar.notification.HybridNotificationView;
 import com.android.systemui.statusbar.notification.NotificationInflater;
 import com.android.systemui.statusbar.notification.NotificationUtils;
-import com.android.systemui.statusbar.notification.NotificationViewWrapper;
 import com.android.systemui.statusbar.notification.VisualStabilityManager;
 import com.android.systemui.statusbar.phone.NotificationGroupManager;
 import com.android.systemui.statusbar.phone.StatusBar;
@@ -421,9 +421,6 @@
         } else {
             minHeight = mNotificationMinHeight;
         }
-        NotificationViewWrapper collapsedWrapper = layout.getVisibleWrapper(
-                NotificationContentView.VISIBLE_TYPE_CONTRACTED);
-        minHeight += collapsedWrapper.getMinHeightIncrease(mUseIncreasedCollapsedHeight);
         boolean headsUpCustom = layout.getHeadsUpChild() != null &&
                 layout.getHeadsUpChild().getId()
                         != com.android.internal.R.id.status_bar_latest_event_content;
@@ -435,11 +432,6 @@
         } else {
             headsUpheight = mMaxHeadsUpHeight;
         }
-        NotificationViewWrapper headsUpWrapper = layout.getVisibleWrapper(
-                NotificationContentView.VISIBLE_TYPE_HEADSUP);
-        if (headsUpWrapper != null) {
-            headsUpheight += headsUpWrapper.getMinHeightIncrease(mUseIncreasedCollapsedHeight);
-        }
         layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight,
                 mNotificationAmbientHeight);
     }