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

Commit d222ed60 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed the templates for the notifcation actions 

Change-Id: Iac6296cc487a61e1601facb4603a7d96923d490f
parent 5a175d9d

core/res/res/layout/notification_material_action.xml

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

    android:layout_height="48dp"

    android:layout_gravity="center"

    android:layout_marginStart="8dp"

    android:layout_marginStart="4dp"

    android:textColor="@color/secondary_text_material_light"

    android:singleLine="true"

    android:ellipsize="end"

core/res/res/layout/notification_material_action_list.xml

+4 −3
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/actions_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        android:layout_height="wrap_content"

        android:layout_marginStart="-16dp"

        android:layout_marginEnd="-16dp">

    <LinearLayout

            android:id="@+id/actions"

            android:layout_width="match_parent"

            android:layout_height="56dp"

            android:paddingEnd="8dp"

            android:paddingEnd="4dp"

            android:orientation="horizontal"

            android:visibility="gone"

            android:background="#ffeeeeee"

core/res/res/layout/notification_template_material_big_picture.xml

+4 −12
Original line number Diff line number Diff line
@@ -27,9 +27,10 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="top"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:paddingStart="@dimen/notification_content_margin_start"

            android:paddingEnd="@dimen/notification_content_margin_end"

            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:clipToPadding="false"

            android:orientation="vertical"

            >

        <LinearLayout
@@ -56,18 +57,9 @@ 
                android:layout_height="1dp"

                android:layout_marginStart="-16dp"

                android:layout_marginEnd="-16dp"

                android:clipChildren="false"

                android:id="@+id/action_divider"

                android:visibility="gone"

                android:background="@drawable/notification_template_divider" />

        <include

                layout="@layout/notification_material_action_list"

                android:id="@+id/actions"

                android:layout_marginStart="-16dp"

                android:layout_marginEnd="-16dp"

                android:clipChildren="false"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />

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

    </LinearLayout>

</FrameLayout>

core/res/res/layout/notification_template_material_big_text.xml

+4 −12
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top"

        android:layout_marginStart="@dimen/notification_content_margin_start"

        android:paddingStart="@dimen/notification_content_margin_start"

        android:paddingEnd="@dimen/notification_content_margin_end"

        android:layout_marginTop="@dimen/notification_content_margin_top"

        android:layout_marginEnd="@dimen/notification_content_margin_end"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:minHeight="@dimen/notification_min_content_height"

        android:orientation="vertical"

        >
@@ -67,18 +67,10 @@ 
            android:layout_height="1dp"

            android:layout_marginStart="-16dp"

            android:layout_marginEnd="-16dp"

            android:clipChildren="false"

            android:id="@+id/action_divider"

            android:visibility="gone"

            android:background="@drawable/notification_template_divider" />

        <include

            layout="@layout/notification_material_action_list"

            android:layout_marginStart="-16dp"

            android:layout_marginEnd="-16dp"

            android:clipChildren="false"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            />

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

    </LinearLayout>

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

</FrameLayout>

core/res/res/layout/notification_template_material_inbox.xml

+4 −12
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top"

        android:layout_marginStart="@dimen/notification_content_margin_start"

        android:paddingStart="@dimen/notification_content_margin_start"

        android:paddingEnd="@dimen/notification_content_margin_end"

        android:layout_marginTop="@dimen/notification_content_margin_top"

        android:layout_marginEnd="@dimen/notification_content_margin_end"

        android:minHeight="@dimen/notification_min_content_height"

        android:clipToPadding="false"

        android:orientation="vertical"

        >

        <include layout="@layout/notification_template_part_line1" />
@@ -134,17 +135,8 @@ 
            android:visibility="gone"

            android:layout_marginStart="-16dp"

            android:layout_marginEnd="-16dp"

            android:clipChildren="false"

            android:background="@drawable/notification_template_divider" />

        <include

            layout="@layout/notification_material_action_list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="-16dp"

            android:layout_marginEnd="-16dp"

            android:clipChildren="false"

            android:layout_weight="0"

            />

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

    </LinearLayout>

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

</FrameLayout>