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

Commit f83ebd5d authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge changes I0f5b0c92,Icbb05955 

* changes:
  Fine tune the UI about header message
  Revert "Fix Bugreport disclaimer shouldn't move when switching between tile"
parents 4bfeb7c3 1f50c724

res/layout-sw720dp/column_headers.xml

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="@dimen/doc_header_height"

    android:background="@drawable/sort_widget_background"

    android:paddingStart="20dp"

    android:paddingEnd="20dp"

    android:visibility="gone">



    <LinearLayout

res/layout-sw720dp/item_doc_header_message.xml

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<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:minHeight="?android:attr/listPreferredItemHeightSmall">



        <ImageView

            android:contentDescription="@null"

            android:id="@+id/message_icon"

            android:layout_height="@dimen/icon_size"

            android:layout_width="@dimen/icon_size"

            android:layout_marginStart="0dp"

            android:layout_marginEnd="10dp"

            android:layout_marginTop="4dp"

            android:scaleType="centerInside"/>



        <TextView

            android:id="@+id/message_textview"

            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

            android:id="@+id/button_dismiss"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_alignEnd="@+id/message_textview"

            android:layout_below="@+id/message_textview"

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

            style="@style/DialogTextButton"/>

    </RelativeLayout>

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

res/layout/item_doc_header_message.xml

+48 −41
Original line number Diff line number Diff line
@@ -13,9 +13,15 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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



<FrameLayout

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

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

    android:id="@+id/item_root"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="4dp"
@@ -62,3 +68,4 @@ 
                style="@style/DialogTextButton"/>

        </RelativeLayout>

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

</FrameLayout>

res/layout/item_doc_list.xml

+6 −5
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ 
        <FrameLayout

            android:id="@android:id/icon"

            android:pointerIcon="hand"

            android:layout_width="56dp"

            android:layout_width="@dimen/list_item_width"

            android:layout_height="@dimen/list_item_height"

            android:paddingBottom="@dimen/list_item_icon_padding"

            android:paddingTop="@dimen/list_item_icon_padding"

            android:paddingEnd="16dp"

            android:paddingStart="0dp" >

            android:paddingStart="@dimen/list_item_padding" >



            <ImageView

                android:id="@+id/icon_mime"
@@ -53,8 +53,8 @@ 


            <ImageView

                android:id="@+id/icon_thumb"

                android:layout_width="@dimen/list_icon_thumb_size"

                android:layout_height="@dimen/list_icon_thumb_size"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:contentDescription="@null"

                android:scaleType="centerCrop" />
@@ -74,7 +74,8 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:orientation="vertical"

            android:layout_gravity="center_vertical">

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/list_item_padding" >



            <TextView

                android:id="@android:id/title"

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    <!-- Material design rounded radius -->

    <dimen name="material_round_radius">2dp</dimen>



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

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

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

    <dimen name="icon_size">40dp</dimen>

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

    <dimen name="root_icon_size">24dp</dimen>
@@ -38,7 +39,6 @@ 
    <dimen name="grid_item_margin">6dp</dimen>

    <dimen name="grid_padding_horiz">4dp</dimen>

    <dimen name="grid_padding_vert">4dp</dimen>

    <dimen name="list_icon_thumb_size">40dp</dimen>

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

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

    <dimen name="list_item_padding">16dp</dimen>