Revert "SystemUI: Improve HeadsUp expanding performance."

This reverts commit e57896a.

Author: codex-corp

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

@@ -514,6 +514,7 @@ private void startExpanding(View v, int expandType) {
         }
         mExpanding = true;
         if (DEBUG) Log.d(TAG, "scale type " + expandType + " beginning on view: " + v);
+        mCallback.setUserLockedChild(v, true);
         setView(v);
         setGlow(GLOW_BASE);
         mScaler.setView(v);
@@ -525,18 +526,13 @@ private void startExpanding(View v, int expandType) {
             if (DEBUG) Log.d(TAG, "working on a non-expandable child");
             mNaturalHeight = mOldHeight;
         }
-        mCallback.setUserLockedChild(v, true);
         if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight +
                     " mNaturalHeight: " + mNaturalHeight);
         if (v != null && v.getParent() != null) {
             v.getParent().requestDisallowInterceptTouchEvent(true);
         }
     }
 
-    public float getNaturalHeight() {
-        return mNaturalHeight;
-    }
-
     private void finishExpanding(boolean force) {
         if (!mExpanding) return;
 

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java

@@ -207,11 +207,6 @@ public void setUserExpandedChild(View v, boolean userExpanded) {
     public void setUserLockedChild(View v, boolean userLocked) {
         if (mHeadsUp != null && mHeadsUp.row == v) {
             mHeadsUp.row.setUserLocked(userLocked);
-
-            setMinimumHeight(userLocked
-                    ? (int) mExpandHelper.getNaturalHeight() + mContentHolder.getPaddingTop()
-                            + mContentHolder.getPaddingBottom()
-                    : 0);
         }
     }