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: I40870263f8b3d25bbd7f353259fde14ae0cf63c0
This commit is contained in:
Adrian Roos
2016-05-27 21:27:32 +00:00
committed by android-build-merger
parent ca0e846528 06fe24341c
commit b35bd449a7
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() {