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

Commit d83d2ca8 authored by Julian Mancini's avatar Julian Mancini Committed by android-build-merger
Browse files

Merge "Add a way to update UI from DocInfo" into arc-apps 

am: 8db11bf5

Change-Id: I603f4c28c060c936395612ca023085221a26e824
parents 125efe62 8db11bf5

res/layout/document_inspector_fragment.xml

+10 −0
Original line number Diff line number Diff line
@@ -18,4 +18,14 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <com.android.documentsui.inspector.HeaderView

        android:id="@+id/inspector_header_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/inspector_header_height"/>



    <com.android.documentsui.inspector.DetailsView

        android:id="@+id/inspector_details_view"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

</LinearLayout>

res/layout/document_inspector_segment.xml

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

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

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="20sp">

    <TextView

        android:id="@+id/data_title"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:textSize="14sp" />

    <TextView

        android:id="@+id/data_info"

        android:layout_width="0dp"

        android:layout_weight="3"

        android:layout_height="wrap_content"

        android:textSize="14sp" />

</LinearLayout>
 
 No newline at end of file

res/layout/inspector_header.xml

+22 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 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:layout_width="match_parent"

    android:layout_height="match_parent">

    <ImageView

        android:id="@+id/inspector_thumbnail"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:visibility="gone"/>

        android:layout_height="match_parent"

        android:background="@android:color/black" />

    <TextView

        android:id="@+id/inspector_file_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignLeft="@id/inspector_thumbnail"

        android:layout_alignTop="@id/inspector_thumbnail"

        android:layout_alignRight="@id/inspector_thumbnail"

        android:layout_alignBottom="@id/inspector_thumbnail"

        android:gravity="start">

    </TextView>

        android:textSize="20dp"

        android:layout_alignBottom="@+id/inspector_thumbnail"

        android:paddingBottom="20dp"

        android:paddingLeft="18dp"

        android:textColor="@android:color/white" />

</RelativeLayout>
 
 No newline at end of file

res/layout/inspector_text.xml→res/layout/table_row.xml

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

<!--

    Copyright (C) 2017 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.

-->

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

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:paddingTop="20dp"

    android:paddingLeft="18dp">



    <TextView

        android:id="@+id/inspector_text_title"

        android:id="@+id/key"

        android:layout_height="wrap_content"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:textColor="#000000">

        android:textColor="@android:color/black"

        android:textSize="14dp">

    </TextView>



    <TextView

        android:id="@+id/inspector_text_info"

        android:id="@+id/value"

        android:layout_height="wrap_content"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:textColor="#d3d3d3">

        android:textColor="@color/inspector_value"

        android:textSize="14dp">

    </TextView>

</LinearLayout>
 
 No newline at end of file

res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -71,4 +71,6 @@ 
    <color name="scroll_thumb_pressed">#ff8c8c8c</color>

    <color name="scroll_thumb">#ffbebebe</color>

    <color name="scroll_track">#fff0f0f0</color>



    <color name="inspector_value">#ff939393</color>

</resources>