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

Commit 09483ce1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make some layout values in action button in notification configurable"

parents 3ef92108 c3ae4db1

core/res/res/layout/notification_material_action.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,16 +16,14 @@ 
  -->



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

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

    style="@android:style/NotificationAction"

    android:id="@+id/action0"

    android:layout_width="wrap_content"

    android:layout_height="48dp"

    android:layout_gravity="center"

    android:gravity="start|center_vertical"

    android:layout_marginStart="4dp"

    android:textColor="@color/notification_default_color"

    android:singleLine="true"

    android:textAlignment="viewStart"

    android:ellipsize="end"

    android:background="@drawable/notification_material_action_background"

    />

core/res/res/layout/notification_material_action_list.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
        android:id="@+id/actions_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/notification_action_list_margin_top"

        android:layout_gravity="bottom">

    <com.android.internal.widget.NotificationActionListLayout

            android:id="@+id/actions"
@@ -27,6 +28,7 @@ 
            android:orientation="horizontal"

            android:gravity="center_vertical"

            android:visibility="gone"

            android:background="@color/notification_action_list_background_color"

            >

        <!-- actions will be added here -->

    </com.android.internal.widget.NotificationActionListLayout>

core/res/res/layout/notification_material_action_tombstone.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



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

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

    style="@android:style/NotificationTombstoneAction"

    android:id="@+id/action0"

    android:layout_width="wrap_content"

    android:layout_height="48dp"

core/res/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -146,10 +146,14 @@ 


    <color name="notification_default_color">#757575</color> <!-- Gray 600 -->



    <color name="notification_action_button_text_color">@color/notification_default_color</color>



    <color name="notification_progress_background_color">@color/secondary_text_material_light</color>



    <color name="notification_action_list">#ffeeeeee</color>



    <color name="notification_action_list_background_color">@null</color>



    <!-- Keyguard colors -->

    <color name="keyguard_avatar_frame_color">#ffffffff</color>

    <color name="keyguard_avatar_frame_shadow_color">#80000000</color>

core/res/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -200,6 +200,9 @@ 
    <!-- The height of the notification action list -->

    <dimen name="notification_action_list_height">60dp</dimen>



    <!-- The margin of the notification action list at the top -->

    <dimen name="notification_action_list_margin_top">0dp</dimen>



    <!-- The height of the notification action list -->

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