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

Commit 9fca181f authored by Austin Kolander's avatar Austin Kolander Committed by android-build-merger
Browse files

Merge "Added support for inspector actions." into arc-apps

am: 7f539542

Change-Id: I6a3fdd8e1d02f8e6293fcc223b5fa086860b2c20
parents 256ebb86 7f539542
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CACHE_CONTENT" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />

    <application
        android:name=".DocumentsApplication"
+0 −4
Original line number Diff line number Diff line
@@ -16,7 +16,3 @@
-keep public class android.support.v4.view.accessibility.AccessibilityNodeInfoCompat {
   public static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat obtain();
}
 No newline at end of file

-keepclassmembers public class com.android.documentsui.inspector.InspectorController {
    *;
}
 No newline at end of file
+164 B
Loading image diff...
+156 B
Loading image diff...
+21 −5
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@
        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"
@@ -34,12 +35,27 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"/>

        <com.android.documentsui.inspector.actions.ActionView
            android:paddingTop="10dp"
            android:id="@+id/inspector_show_in_provider_view"
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"/>

        <com.android.documentsui.inspector.actions.ActionView
            android:paddingTop="10dp"
            android:id="@+id/inspector_app_defaults_view"
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"/>

        <com.android.documentsui.inspector.DebugView
            android:id="@+id/inspector_debug_view"
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone" />

    </LinearLayout>
</ScrollView>
 No newline at end of file
Loading