summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2018-02-06 18:06:01 -0800
committerSelim Cinek <cinek@google.com>2018-02-20 22:48:42 +0000
commited64a14cf71c61a69a37a6509758dcaae3168f39 (patch)
treeb8fd8e2abb223b1375c90b8d63d5f0fcc1f7d08b /core/java/android
parent76b9bb78df83ed5e82af7dee227cbf80bd49cf2c (diff)
Removed the notification action background
Also added conditional paddings when inline replying, such that the layout looks good. This refactors the overall layout design and ensures that smart replies and other content that is on the bottom are always visible. Bug: 69168591 Test: add notification, reply, no action background Change-Id: I83d3f0d2512f0cf8c8b9db0edc7b27cbb109aeb9
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Notification.java14
1 files changed, 3 insertions, 11 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 28ecd9803d28..3797cac729cf 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4587,7 +4587,8 @@ public class Notification implements Parcelable
big.setViewVisibility(R.id.notification_material_reply_text_3, View.GONE);
big.setTextViewText(R.id.notification_material_reply_text_3, null);
- big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target, 0);
+ big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target,
+ R.dimen.notification_content_margin);
}
private RemoteViews applyStandardTemplateWithActions(int layoutId) {
@@ -4608,16 +4609,7 @@ public class Notification implements Parcelable
if (N > 0) {
big.setViewVisibility(R.id.actions_container, View.VISIBLE);
big.setViewVisibility(R.id.actions, View.VISIBLE);
- if (p.ambient) {
- big.setInt(R.id.actions, "setBackgroundColor", Color.TRANSPARENT);
- } else if (isColorized()) {
- big.setInt(R.id.actions, "setBackgroundColor", getActionBarColor());
- } else {
- big.setInt(R.id.actions, "setBackgroundColor", mContext.getColor(
- R.color.notification_action_list));
- }
- big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target,
- R.dimen.notification_action_list_height);
+ big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target, 0);
if (N>MAX_ACTION_BUTTONS) N=MAX_ACTION_BUTTONS;
for (int i=0; i<N; i++) {
Action action = mActions.get(i);