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: b35bd449a7

* commit 'b35bd449a709b1ccef0d70e3f804f938cee77c89':
  Notification: Fix bug with sliding action list

Change-Id: Ibbce96ec8af7a6e20689e45e02fb66516c1a1064
This commit is contained in:
Adrian Roos
2016-05-27 21:30:55 +00:00
committed by android-build-merger
parent 8f65100c07 b35bd449a7
commit 93276bd754
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() {