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

Commit 5241bfed authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5457264 from e8b5fce4 to qt-release

Change-Id: I956cdf42ed0b60ce0277f27fd4638ce8075eeafa
parents fa456ec9 e8b5fce4
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -45,9 +45,24 @@ filegroup {
    name: "DocumentsUI-srcs",
    srcs: [
        "src/**/*.java",
	":statslog-docsui-java-gen",
    ],
}

java_library {
    name: "docsui-statsd",
    srcs: [
        ":statslog-docsui-java-gen",
    ],
}

genrule {
    name: "statslog-docsui-java-gen",
    tools: ["stats-log-api-gen"],
    cmd: "$(location stats-log-api-gen) --java $(out) --module docsui --javaPackage com.android.documentsui --javaClass DocumentsStatsLog",
    out: ["com/android/documentsui/DocumentsStatsLog.java"],
}

android_library {
    name: "DocumentsUI-res-lib",

@@ -78,7 +93,7 @@ android_app {
    manifest: "AndroidManifest.xml",

    srcs: [
        "src/**/*.java",
        ":DocumentsUI-srcs",
    ],

    resource_dirs: [
+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_PRIVILEGED_MODULE := true

LOCAL_STATIC_JAVA_LIBRARIES += guava \
        apache-commons-compress
        apache-commons-compress \
        docsui-statsd

LOCAL_STATIC_ANDROID_LIBRARIES := \
        androidx.legacy_legacy-support-core-ui \
+16 −9
Original line number Diff line number Diff line
@@ -35,21 +35,30 @@
            android:minHeight="?android:attr/actionBarSize"
            android:fitsSystemWindows="true"
            app:titleEnabled="false"
            app:contentScrim="?android:colorBackground"
            app:statusBarScrim="@android:color/transparent"
            app:layout_scrollFlags="scroll|exitUntilCollapsed">

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical">

                <android.widget.Space
                    android:layout_width="match_parent"
                    android:layout_height="?android:attr/actionBarSize"/>

                <com.android.documentsui.inspector.HeaderView
                    android:id="@+id/inspector_header_view"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/inspector_header_height"
                    app:layout_collapseMode="parallax"/>
            </LinearLayout>

            <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?android:attr/actionBarSize"
                android:background="@drawable/gradient_actionbar_background"
                android:background="?android:attr/colorBackground"
                android:theme="?actionBarTheme"
                app:title="@string/inspector_title"
                app:layout_collapseMode="pin">
@@ -61,7 +70,7 @@
        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:behavior_overlapTop="40dp"
        app:behavior_overlapTop="10dp"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <LinearLayout
@@ -69,8 +78,6 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:background="@drawable/bottom_sheet_dialog_background"
            android:layout_marginTop="4dp"
            android:elevation="8dp"
            android:paddingBottom="5dp">

            <com.android.documentsui.inspector.DetailsView
+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@
        android:paddingTop="25dp"
        android:paddingBottom="25dp"
        android:layout_gravity="center_vertical"
        android:clickable="false"
        android:textAppearance="?attr/textAppearanceHeadline6"
        android:textAlignment="viewStart"
        android:textIsSelectable="true"/>
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@
        android:layout_height="wrap_content"
        android:layout_width="0dp"
        android:layout_weight="1"
        android:clickable="false"
        android:textIsSelectable="true"
        android:textAlignment="viewStart"
        android:textAppearance="@style/InspectorKeySubTitle">
Loading