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

Browse Source 
am: 389c4e67e9

* commit '389c4e67e950899547a83ed73c3c26053bc8e8cb':
  Notification: Fix bug with sliding action list

Change-Id: I1f88be59b92aa86b9a130b21cc3ebce4afd670b7
This commit is contained in:
Adrian Roos
2016-05-27 21:33:05 +00:00
committed by android-build-merger
parent be120aad74 389c4e67e9
commit 1ad9fa08fe
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() {