Merge "CallStyle actions have minimum width" into sc-dev

This commit is contained in:
Jeff DeCew
2021-04-20 13:46:14 +00:00
committed by Android (Google) Code Review
4 changed files with 8 additions and 0 deletions

View File

@@ -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(

View File

@@ -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();

View File

@@ -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>

View File

@@ -3127,6 +3127,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" />