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

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

Merge "Fix Bugreport disclaimer shouldn't move when switching between tile and list view."

parents 3b617862 a2b84bbe

res/layout-sw720dp/column_headers.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    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

0 → 100644
+49 −0
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.

-->

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

    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

        android:contentDescription="@null"

        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: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: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="?attr/materialButtonStyle"/>

</RelativeLayout>

res/layout/item_doc_header_message.xml

+1 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        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_marginStart="0dp"

        android:layout_marginEnd="@dimen/list_item_padding"

        android:scaleType="centerInside"/>
@@ -33,8 +33,6 @@ 
        android:id="@+id/message_textview"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginStart="0dp"

        android:layout_marginEnd="@dimen/list_item_padding"

        android:layout_toEndOf="@+id/message_icon"

        android:selectAllOnFocus="true"/>

res/layout/item_doc_list.xml

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

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

            android:pointerIcon="hand"

            android:layout_width="@dimen/list_item_width"

            android:layout_width="56dp"

            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="@dimen/list_item_padding" >

            android:paddingStart="0dp" >



            <ImageView

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


            <ImageView

                android:id="@+id/icon_thumb"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_width="@dimen/list_icon_thumb_size"

                android:layout_height="@dimen/list_icon_thumb_size"

                android:contentDescription="@null"

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

            android:layout_weight="1"

            android:orientation="vertical"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/list_item_padding" >

            android:layout_gravity="center_vertical">



            <TextView

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

res/values/dimens.xml

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

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



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

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

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

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

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

    <dimen name="root_icon_size">24dp</dimen>
@@ -39,6 +38,7 @@ 
    <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>