Snap for 6849520 from 229b9b3dc9ec3a406b6af1687b7fc8b561c37bdb to sc-d1-release (7e6ec992) · Commits · e / os / android_packages_apps_DocumentsUI

res/layout/item_doc_header_message.xml

+3 −9

Original line number	Diff line number	Diff line
		@@ -99,20 +99,14 @@
		android:layout_width="match_parent"
		android:orientation="vertical">

		<View
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:layout_marginStart="8dp"
		android:layout_marginEnd="8dp"
		android:background="?android:strokeColor"/>

		<Button
		android:id="@+id/action_button"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_marginStart="48dp"
		android:layout_gravity="start"
		android:layout_marginEnd="16dp"
		android:layout_gravity="end"
		style="@style/DialogTextButton"/>

		</LinearLayout>

		</LinearLayout>

res/layout/item_doc_list.xml

+123 −131

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		<?xml version="1.0" encoding="utf-8"?><!--
		Copyright (C) 2013 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		@@ -15,8 +14,12 @@
		limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/item_root"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -24,7 +27,6 @@
		android:focusable="true"
		android:orientation="horizontal">


		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -67,6 +69,7 @@
		android:contentDescription="@null"
		android:scaleType="fitCenter"
		android:src="@drawable/ic_check_circle" />

		</FrameLayout>

		<LinearLayout
		@@ -99,6 +102,7 @@
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="?android:attr/textAppearanceListItem" />

		</LinearLayout>

		<LinearLayout
		@@ -106,41 +110,20 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:baselineAligned="false"
		android:layout_marginTop="4dp"
		android:gravity="center_vertical"
		android:orientation="horizontal">

		<TextView
		android:id="@+id/date"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="0.4"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@style/ItemDocListCaptionText"/>

		<TextView
		android:id="@+id/size"
		android:layout_width="0dp"
		android:id="@+id/metadata"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dp"
		android:layout_weight="0.3"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@style/ItemDocListCaptionText" />

		<TextView
		android:id="@+id/file_type"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dp"
		android:layout_weight="0.3"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@style/ItemDocListCaptionText"/>
		</LinearLayout>

		</LinearLayout>

		<FrameLayout
		@@ -164,3 +147,12 @@
		</LinearLayout>

		</LinearLayout>

		<View
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:layout_marginStart="72dp"
		android:layout_marginEnd="8dp"
		android:background="?android:strokeColor" />

		</LinearLayout>
		No newline at end of file

src/com/android/documentsui/DirectoryLoader.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -314,20 +314,20 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
		}

		private boolean checkIfCursorStale(DirectoryResult result) {
		if (mResult == null) {
		if (result == null \|\| result.cursor == null \|\| result.cursor.isClosed()) {
		return true;
		}
		Cursor cursor = result.cursor;
		try {
		cursor.moveToPosition(-1);
		for (int pos = 0; pos < cursor.getCount(); ++pos) {
		try {
		if (!cursor.moveToNext()) {
		return true;
		}
		}
		} catch (Exception e) {
		return true;
		}
		}
		return false;
		}
		}

src/com/android/documentsui/MultiRootDocumentsLoader.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -458,20 +458,20 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory
		}

		private boolean checkIfCursorStale(DirectoryResult result) {
		if (mResult == null) {
		if (result == null \|\| result.cursor == null \|\| result.cursor.isClosed()) {
		return true;
		}
		Cursor cursor = result.cursor;
		try {
		cursor.moveToPosition(-1);
		for (int pos = 0; pos < cursor.getCount(); ++pos) {
		try {
		if (!cursor.moveToNext()) {
		return true;
		}
		}
		} catch (Exception e) {
		return true;
		}
		}
		return false;
		}
		}

src/com/android/documentsui/archives/ArchiveEntryInputStream.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -20,16 +20,16 @@ import android.text.TextUtils;

		import androidx.annotation.NonNull;

		import java.io.Closeable;
		import java.io.IOException;
		import java.io.InputStream;

		import org.apache.commons.compress.archivers.ArchiveEntry;
		import org.apache.commons.compress.archivers.ArchiveInputStream;
		import org.apache.commons.compress.archivers.sevenz.SevenZFile;
		import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
		import org.apache.commons.compress.archivers.zip.ZipFile;

		import java.io.Closeable;
		import java.io.IOException;
		import java.io.InputStream;

		/**
		* To simulate the input stream by using ZipFile, SevenZFile, or ArchiveInputStream.
		*/
		@@ -124,7 +124,7 @@ abstract class ArchiveEntryInputStream extends InputStream {
		throw new IllegalArgumentException("ArchiveEntry is empty");
		}

		if (archiveEntry.isDirectory() \|\| archiveEntry.getSize() <= 0
		if (archiveEntry.isDirectory() \|\| archiveEntry.getSize() < 0
		\|\| TextUtils.isEmpty(archiveEntry.getName())) {
		throw new IllegalArgumentException("ArchiveEntry is an invalid file entry");
		}