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

Commit 132a9367 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-41... 

release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875

Change-Id: Ife60f8a1dfb213542c57b1f3f64bf61ad89da7ff
parents 997c123b b576ce9b

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 


        <!--  Preserve original launcher activity from Nougat. -->

        <activity-alias

            android:name=".Launcher"

            android:name=".LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/launcher_label"

            android:icon="@drawable/launcher_icon" >

proguard.flags

+4 −0
Original line number Diff line number Diff line
@@ -16,3 +16,7 @@ 
-keep public class android.support.v4.view.accessibility.AccessibilityNodeInfoCompat {

   public static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat obtain();

}



-keepclassmembers public class com.android.documentsui.inspector.InspectorController {

    *;

}
 
 No newline at end of file

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