Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c am: b35bd449a7

Browse Source 
am: 93276bd754

* commit '93276bd754577b79ddf76801f3e28c62a142ad09':
  Notification: Fix bug with sliding action list

Change-Id: I95013ba75ade60334bcd9ac7eeab7903e5df28fa
This commit is contained in:
Adrian Roos
2016-05-27 23:58:06 +00:00
committed by android-build-merger
parent 1061a06e34 93276bd754
commit 6f9031778e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -403,12 +403,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() {