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

Commit fa1465c5 authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix Bug reports Dismiss button should not be the primary action style."

parents bf43d47b 9c92c17a

res/layout-sw720dp/item_doc_header_message.xml

+45 −30
Original line number Diff line number Diff line
@@ -13,13 +13,23 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<com.google.android.material.card.MaterialCardView

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="4dp"

    android:elevation="0dp"

    android:duplicateParentState="true"

    app:cardElevation="0dp"

    app:strokeWidth="1dp"

    app:strokeColor="?android:strokeColor">



    <RelativeLayout

        android:animateLayoutChanges="true"

        android:id="@+id/message_container"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

    android:layout_marginTop="@dimen/list_item_padding"

    android:layout_marginBottom="0dp"

        android:minHeight="?android:attr/listPreferredItemHeightSmall">



        <ImageView
@@ -27,8 +37,9 @@ 
            android:id="@+id/message_icon"

            android:layout_height="@dimen/icon_size"

            android:layout_width="@dimen/icon_size"

        android:layout_marginStart="@dimen/list_item_padding"

        android:layout_marginEnd="12dp"

            android:layout_marginStart="0dp"

            android:layout_marginEnd="10dp"

            android:layout_marginTop="4dp"

            android:scaleType="centerInside"/>



        <TextView
@@ -36,6 +47,9 @@ 
            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_toEndOf="@+id/message_icon"

            android:layout_marginStart="0dp"

            android:layout_marginEnd="8dp"

            android:layout_marginTop="12dp"

            android:selectAllOnFocus="true"/>



        <Button
@@ -45,5 +59,6 @@ 
            android:layout_alignEnd="@+id/message_textview"

            android:layout_below="@+id/message_textview"

            android:text="@android:string/ok"

        style="?attr/materialButtonStyle"/>

            style="@style/DialogTextButton"/>

    </RelativeLayout>

</com.google.android.material.card.MaterialCardView>

res/layout/item_doc_header_message.xml

+45 −28
Original line number Diff line number Diff line
@@ -13,7 +13,19 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<com.google.android.material.card.MaterialCardView

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="4dp"

    android:elevation="0dp"

    android:duplicateParentState="true"

    app:cardElevation="0dp"

    app:strokeWidth="1dp"

    app:strokeColor="?android:strokeColor">



    <RelativeLayout

        android:animateLayoutChanges="true"

        android:id="@+id/message_container"

        android:layout_height="wrap_content"
@@ -26,7 +38,8 @@ 
            android:layout_height="@dimen/icon_size"

            android:layout_width="@dimen/icon_size"

            android:layout_marginStart="0dp"

        android:layout_marginEnd="@dimen/list_item_padding"

            android:layout_marginEnd="10dp"

            android:layout_marginTop="4dp"

            android:scaleType="centerInside"/>



        <TextView
@@ -34,6 +47,9 @@ 
            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_toEndOf="@+id/message_icon"

            android:layout_marginStart="0dp"

            android:layout_marginEnd="8dp"

            android:layout_marginTop="12dp"

            android:selectAllOnFocus="true"/>



        <Button
@@ -43,5 +59,6 @@ 
            android:layout_alignEnd="@+id/message_textview"

            android:layout_below="@+id/message_textview"

            android:text="@android:string/ok"

        style="?attr/materialButtonStyle"/>

            style="@style/DialogTextButton"/>

    </RelativeLayout>

</com.google.android.material.card.MaterialCardView>