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

Browse Source 
am: 06fe24341c

* commit '06fe24341cd07cee044527cab61345355802fa54':
  Notification: Fix bug with sliding action list

Change-Id: Ib59010775d30fff796fc03ee9ed1881f3be0849e
This commit is contained in:
Adrian Roos
2016-05-27 21:27:31 +00:00
committed by android-build-merger
parent cac03c5cdf 06fe24341c
commit 389c4e67e9
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( return mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.notification_action_list_height); com.android.internal.R.dimen.notification_action_list_height);
} }
int hint;
if (mHeadsUpChild != null) { if (mHeadsUpChild != null) {
return mHeadsUpChild.getHeight(); hint = mHeadsUpChild.getHeight();
} else { } else {
return mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize( hint = mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.notification_action_list_height); com.android.internal.R.dimen.notification_action_list_height);
} }
if (mExpandedChild != null) {
hint = Math.min(hint, mExpandedChild.getHeight());
}
return hint;
} }
private void updateContentTransformation() { private void updateContentTransformation() {