Notification: Fix bug with sliding action list

Fixes a bug where the action bar was not where it
was supposed to be if the expanded notification
was smaller than the collapsed + action height.

Bug: 28767094
Change-Id: I30c0ae430d4d5f9e88a02f5143094e90cf31b620
This commit is contained in:
Adrian Roos
2016-05-26 12:06:40 -07:00
parent aba6e2c78f
commit bb73e9c65a

View File

@@ -402,12 +402,17 @@ public class NotificationContentView extends FrameLayout {
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() {