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

Merge "Fix the height of NotificationContentView when there's no actions but bubble button" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-15 01:12:51 +00:00
committed by Android (Google) Code Review
parent 7abd8bc893 a49c4c7b6d
commit f93b70108e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
View File

@@ -1369,6 +1369,8 @@ public class NotificationContentView extends FrameLayout implements Notification
} }
ImageView bubbleButton = layout.findViewById(com.android.internal.R.id.bubble_button); ImageView bubbleButton = layout.findViewById(com.android.internal.R.id.bubble_button);
View actionContainer = layout.findViewById(com.android.internal.R.id.actions_container); View actionContainer = layout.findViewById(com.android.internal.R.id.actions_container);
LinearLayout actionListMarginTarget = layout.findViewById(
com.android.internal.R.id.notification_action_list_margin_target);
if (bubbleButton == null || actionContainer == null) { if (bubbleButton == null || actionContainer == null) {
return; return;
} }
@@ -1393,6 +1395,16 @@ public class NotificationContentView extends FrameLayout implements Notification
bubbleButton.setOnClickListener(mContainingNotification.getBubbleClickListener()); bubbleButton.setOnClickListener(mContainingNotification.getBubbleClickListener());
bubbleButton.setVisibility(VISIBLE); bubbleButton.setVisibility(VISIBLE);
actionContainer.setVisibility(VISIBLE); actionContainer.setVisibility(VISIBLE);
// Set notification_action_list_margin_target's bottom margin to 0 when showing bubble
if (actionListMarginTarget != null) {
ViewGroup.LayoutParams lp = actionListMarginTarget.getLayoutParams();
if (lp instanceof ViewGroup.MarginLayoutParams) {
final ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) lp;
if (mlp.bottomMargin > 0) {
mlp.setMargins(mlp.leftMargin, mlp.topMargin, mlp.rightMargin, 0);
}
}
}
} else { } else {
bubbleButton.setVisibility(GONE); bubbleButton.setVisibility(GONE);
} }