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

Commit 57daa9d7 authored by Anthony Chen's avatar Anthony Chen Committed by Android (Google) Code Review
Browse files

Merge "Allow notification actions to be configured."

parents bea4e834 cdfd43a2

core/res/res/layout/notification_material_media_action.xml

+4 −3
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@ 
  ~ limitations under the License

  -->



<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"

<ImageButton

    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@android:style/Widget.Material.Button.Borderless.Small"

    android:id="@+id/action0"

    android:layout_width="48dp"

    android:layout_height="48dp"

    android:layout_width="@dimen/media_notification_action_button_size"

    android:layout_height="@dimen/media_notification_action_button_size"

    android:paddingBottom="8dp"

    android:paddingTop="8dp"

    android:paddingStart="8dp"

core/res/res/layout/notification_template_material_big_media.xml

+1 −7
Original line number Diff line number Diff line
@@ -56,15 +56,9 @@ 
        </LinearLayout>

        <LinearLayout

            android:id="@+id/media_actions"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="-21dp"

            android:paddingStart="8dp"

            android:paddingBottom="12dp"

            android:gravity="top"

            android:orientation="horizontal"

            android:layoutDirection="ltr"

            >

            style="@style/NotificationMediaActionContainer" >

            <!-- media buttons will be added here -->

        </LinearLayout>

    </LinearLayout>

core/res/res/layout/notification_template_material_media.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="bottom|end"

            android:layout_marginStart="10dp"

            android:layout_marginBottom="12dp"

            android:layout_marginBottom="@dimen/media_notification_actions_padding_bottom"

            android:layoutDirection="ltr"

            android:orientation="horizontal"

            >

core/res/res/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -231,6 +231,15 @@ 
    <!-- The small size of the image if the height drawing doesn't work anymore -->

    <dimen name="media_notification_expanded_image_small_size">72dp</dimen>



    <!-- The size of the media actions in the media notification. -->

    <dimen name="media_notification_action_button_size">48dp</dimen>



    <!-- The bottom padding for the media actions container. -->

    <dimen name="media_notification_actions_padding_bottom">12dp</dimen>



    <!-- The maximum size of the image in the expanded media notification -->

    <dimen name="media_notification_expanded_image_max_size">94dp</dimen>



    <!-- The maximum size of the image in the expanded media notification -->

    <dimen name="media_notification_expanded_image_margin_bottom">20dp</dimen>

core/res/res/values/styles.xml

+12 −1
Original line number Diff line number Diff line
@@ -1492,4 +1492,15 @@ please see styles_device_defaults.xml. 
        <item name="background">@drawable/autofill_dataset_picker_background</item>

    </style>



    <!-- The style for the container of media actions in a notification. -->

    <!-- @hide -->

    <style name="NotificationMediaActionContainer">

        <item name="layout_width">wrap_content</item>

        <item name="layout_height">wrap_content</item>

        <item name="layout_marginTop">-21dp</item>

        <item name="paddingStart">8dp</item>

        <item name="paddingBottom">@dimen/media_notification_actions_padding_bottom</item>

        <item name="gravity">top</item>

    </style>



</resources>