Snap for 5452883 from 1ab79483a77d57e8dbcff8f24d1b1f21089b290f to qt-release (fa456ec9) · Commits · e / os / android_packages_apps_DocumentsUI

AndroidManifest.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -91,6 +91,7 @@
	<intent-filter>		<intent-filter>
	<action android:name="android.intent.action.MAIN" />		<action android:name="android.intent.action.MAIN" />
	<category android:name="android.intent.category.LAUNCHER" />		<category android:name="android.intent.category.LAUNCHER" />
			<category android:name="android.intent.category.APP_FILES" />
	</intent-filter>		</intent-filter>
	<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />		<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
	</activity-alias>		</activity-alias>

src/com/android/documentsui/AbstractActionHandler.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -660,6 +660,10 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
	void onDocumentPicked(DocumentInfo doc);		void onDocumentPicked(DocumentInfo doc);
	RootInfo getCurrentRoot();		RootInfo getCurrentRoot();
	DocumentInfo getCurrentDirectory();		DocumentInfo getCurrentDirectory();
			/**
			* Check whether current directory is root of recent.
			*/
			boolean isInRecents();
	void setRootsDrawerOpen(boolean open);		void setRootsDrawerOpen(boolean open);

	// TODO: Let navigator listens to State		// TODO: Let navigator listens to State

src/com/android/documentsui/BaseActivity.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -135,7 +135,7 @@ public abstract class BaseActivity
	// ToDo Create tool to check resource version before applyStyle for the theme		// ToDo Create tool to check resource version before applyStyle for the theme
	// If version code is not match, we should reset overlay package to default,		// If version code is not match, we should reset overlay package to default,
	// in case Activity continueusly encounter resource not found exception		// in case Activity continueusly encounter resource not found exception
	getThemedContext().getTheme().applyStyle(R.style.DocumentsDefaultTheme, false);		getTheme().applyStyle(R.style.DocumentsDefaultTheme, false);

	super.onCreate(icicle);		super.onCreate(icicle);

	@@ -731,6 +731,11 @@ public abstract class BaseActivity
	return mState.stack.peek();		return mState.stack.peek();
	}		}

			@Override
			public boolean isInRecents() {
			return mState.stack.isRecents();
			}

	@VisibleForTesting		@VisibleForTesting
	public void addEventListener(EventListener listener) {		public void addEventListener(EventListener listener) {
	mEventListeners.add(listener);		mEventListeners.add(listener);

src/com/android/documentsui/MenuManager.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -22,16 +22,16 @@ import android.view.MenuInflater;
	import android.view.MenuItem;		import android.view.MenuItem;
	import android.view.View;		import android.view.View;

			import androidx.annotation.VisibleForTesting;
			import androidx.fragment.app.Fragment;

	import com.android.documentsui.base.DocumentInfo;		import com.android.documentsui.base.DocumentInfo;
	import com.android.documentsui.base.EventListener;
	import com.android.documentsui.base.Menus;		import com.android.documentsui.base.Menus;
	import com.android.documentsui.base.RootInfo;		import com.android.documentsui.base.RootInfo;
	import com.android.documentsui.base.State;		import com.android.documentsui.base.State;
	import com.android.documentsui.dirlist.DirectoryFragment;		import com.android.documentsui.dirlist.DirectoryFragment;
	import com.android.documentsui.queries.SearchViewManager;		import com.android.documentsui.queries.SearchViewManager;
	import com.android.documentsui.sidebar.RootsFragment;		import com.android.documentsui.sidebar.RootsFragment;
	import androidx.annotation.VisibleForTesting;
	import androidx.fragment.app.Fragment;

	import java.util.List;		import java.util.List;
	import java.util.function.IntFunction;		import java.util.function.IntFunction;
	@@ -401,7 +401,7 @@ public abstract class MenuManager {
	}		}

	public boolean isInRecents() {		public boolean isInRecents() {
	return mActivity.getCurrentDirectory() == null;		return mActivity.isInRecents();
	}		}

	public boolean canCreateDirectory() {		public boolean canCreateDirectory() {
	@@ -409,7 +409,7 @@ public abstract class MenuManager {
	}		}

	public boolean canInspectDirectory() {		public boolean canInspectDirectory() {
	return mActivity.canInspectDirectory();		return mActivity.canInspectDirectory() && !isInRecents();
	}		}
	}		}
	}		}

src/com/android/documentsui/dirlist/AppsRowManager.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,7 @@ public class AppsRowManager {
	final LinearLayout appsGroup = activity.findViewById(R.id.apps_group);		final LinearLayout appsGroup = activity.findViewById(R.id.apps_group);
	appsGroup.removeAllViews();		appsGroup.removeAllViews();

	final LayoutInflater inflater = LayoutInflater.from(activity.getThemedContext());		final LayoutInflater inflater = activity.getLayoutInflater();
	for (AppsRowItemData data : mDataList) {		for (AppsRowItemData data : mDataList) {
	View item = inflater.inflate(R.layout.apps_item, appsGroup, false);		View item = inflater.inflate(R.layout.apps_item, appsGroup, false);
	bindView(item, data);		bindView(item, data);