From 24220aae0940d763efde4078fa1c50b115addc4f Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Wed, 14 Apr 2021 13:36:16 -0400
Subject: [PATCH] CallStyle actions have minimum width

This ensures that the major action buttons have a minimum visual emphasis in the layout.

Bug: 179178086
Test: manual
Change-Id: I58744ada45d789a9acb53b0f4965354835595b19
---
 core/java/android/app/Notification.java | 3 +++
 core/java/android/view/View.java        | 1 +
 core/res/res/values/dimens.xml          | 3 +++
 core/res/res/values/symbols.xml         | 1 +
 4 files changed, 8 insertions(+)

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 7ce0c7060b054..d255616403855 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -6103,6 +6103,9 @@ public class Notification implements Parcelable
                     button.setImageViewIcon(R.id.action0, action.getIcon());
                     boolean priority = action.getExtras().getBoolean(CallStyle.KEY_ACTION_PRIORITY);
                     button.setBoolean(R.id.action0, "setWrapModePriority", priority);
+                    int minWidthDimen =
+                            priority ? R.dimen.call_notification_system_action_min_width : 0;
+                    button.setIntDimen(R.id.action0, "setMinimumWidth", minWidthDimen);
                 }
             } else {
                 button.setTextViewText(R.id.action0, processTextSpans(
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index d6b5a2c299e94..1d112bb2dfd98 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -26005,6 +26005,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      *
      * @attr ref android.R.styleable#View_minWidth
      */
+    @RemotableViewMethod
     public void setMinimumWidth(int minWidth) {
         mMinWidth = minWidth;
         requestLayout();
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 0e436e36b4742..43c0ec979281b 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -242,6 +242,9 @@
          this = conversation_content_start (80dp) - button inset (4dp) - action padding (12dp) -->
     <dimen name="call_notification_collapsible_indent">64dp</dimen>
 
+    <!-- The minimum width of the system actions added to the CallStyle notifications. -->
+    <dimen name="call_notification_system_action_min_width">100dp</dimen>
+
     <!-- The size of icons for visual actions in the notification_material_action_list -->
     <dimen name="notification_actions_icon_size">56dp</dimen>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d69c7f8f95876..42687b5cf1a14 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3126,6 +3126,7 @@
   <java-symbol type="color" name="call_notification_decline_color"/>
   <java-symbol type="color" name="call_notification_answer_color"/>
   <java-symbol type="dimen" name="call_notification_collapsible_indent"/>
+  <java-symbol type="dimen" name="call_notification_system_action_min_width"/>
   <java-symbol type="drawable" name="ic_call_answer" />
   <java-symbol type="drawable" name="ic_call_answer_video" />
   <java-symbol type="drawable" name="ic_call_decline" />