Merge "Notification: Fix bug with sliding action list" into nyc-dev
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index ed6d76a..d6c02e4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -403,12 +403,17 @@
return mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.notification_action_list_height);
}
+ int hint;
if (mHeadsUpChild != null) {
- return mHeadsUpChild.getHeight();
+ hint = mHeadsUpChild.getHeight();
} else {
- return mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.notification_action_list_height);
+ hint = mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_action_list_height);
}
+ if (mExpandedChild != null) {
+ hint = Math.min(hint, mExpandedChild.getHeight());
+ }
+ return hint;
}
private void updateContentTransformation() {