Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde3aaa6 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "CallStyle actions have minimum width" into sc-dev am: eba7be78 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14189046

Change-Id: I43632b360f2bb542dee4d7a8ae32b738de0cb4d2
parents 09dfdfe9 eba7be78

core/java/android/app/Notification.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -6103,6 +6103,9 @@ public class Notification implements Parcelable 
                    button.setImageViewIcon(R.id.action0, action.getIcon());

                    button.setImageViewIcon(R.id.action0, action.getIcon());

                    boolean priority = action.getExtras().getBoolean(CallStyle.KEY_ACTION_PRIORITY);

                    boolean priority = action.getExtras().getBoolean(CallStyle.KEY_ACTION_PRIORITY);

                    button.setBoolean(R.id.action0, "setWrapModePriority", 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 {

            } else {

                button.setTextViewText(R.id.action0, processTextSpans(

                button.setTextViewText(R.id.action0, processTextSpans(

core/java/android/view/View.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -26005,6 +26005,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     *

     * @attr ref android.R.styleable#View_minWidth

     * @attr ref android.R.styleable#View_minWidth

     */

     */

    @RemotableViewMethod

    public void setMinimumWidth(int minWidth) {

    public void setMinimumWidth(int minWidth) {

        mMinWidth = minWidth;

        mMinWidth = minWidth;

        requestLayout();

        requestLayout();

core/res/res/values/dimens.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -242,6 +242,9 @@ 
         this = conversation_content_start (80dp) - button inset (4dp) - action padding (12dp) -->

         this = conversation_content_start (80dp) - button inset (4dp) - action padding (12dp) -->

    <dimen name="call_notification_collapsible_indent">64dp</dimen>

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

    <!-- The size of icons for visual actions in the notification_material_action_list -->

    <dimen name="notification_actions_icon_size">56dp</dimen>

    <dimen name="notification_actions_icon_size">56dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -3127,6 +3127,7 @@ 
  <java-symbol type="color" name="call_notification_decline_color"/>

  <java-symbol type="color" name="call_notification_decline_color"/>

  <java-symbol type="color" name="call_notification_answer_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_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" />

  <java-symbol type="drawable" name="ic_call_answer_video" />

  <java-symbol type="drawable" name="ic_call_answer_video" />

  <java-symbol type="drawable" name="ic_call_decline" />

  <java-symbol type="drawable" name="ic_call_decline" />