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

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

Merge "Add smart reply container to all notification templates"

parents 7d0e1f80 37ad73d0

core/res/res/layout/notification_template_material_base.xml

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ 
            android:layout_height="@dimen/notification_progress_bar_height"

            android:layout_marginTop="@dimen/notification_progress_margin_top"

            layout="@layout/notification_template_progress" />

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_content_margin_bottom" />

    </LinearLayout>

    <include layout="@layout/notification_template_right_icon" />

</FrameLayout>

core/res/res/layout/notification_template_material_big_base.xml

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ 
            android:id="@+id/notification_material_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginBottom="@dimen/notification_content_margin_bottom" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

</FrameLayout>

core/res/res/layout/notification_template_material_big_picture.xml

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginBottom="@dimen/notification_content_margin_bottom" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

</FrameLayout>

core/res/res/layout/notification_template_material_big_text.xml

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ 
                android:id="@+id/notification_material_reply_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginBottom="@dimen/notification_content_margin_bottom" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

    <include layout="@layout/notification_template_right_icon" />

core/res/res/layout/notification_template_material_inbox.xml

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ 
                android:id="@+id/notification_material_reply_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginBottom="@dimen/notification_content_margin_bottom" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

    <include layout="@layout/notification_template_right_icon" />