Merge "Move Activity classes to own packages." into nyc-andromeda-dev (5dc40106) · Commits · e / os / android_packages_apps_DocumentsUI

AndroidManifest.xml

+12 −4

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		android:supportsRtl="true">

		<activity
		android:name=".DocumentsActivity"
		android:name=".picker.PickActivity"
		android:theme="@style/DocumentsTheme"
		android:icon="@drawable/picker_icon">
		<intent-filter>
		@@ -43,18 +43,26 @@
		</activity>

		<activity
		android:name=".LauncherActivity"
		android:name=".manager.LauncherActivity"
		android:label="@string/downloads_label"
		android:icon="@drawable/files_icon"
		android:theme="@android:style/Theme.NoDisplay">
		</activity>

		<!-- Preserve original launcher activity from Nougat. -->
		<activity-alias
		android:name=".Launcher"
		android:targetActivity=".manager.LauncherActivity"
		android:label="@string/downloads_label"
		android:icon="@drawable/files_icon" >
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>
		</activity-alias>

		<activity
		android:name=".FilesActivity"
		android:name=".manager.ManageActivity"
		android:label="@string/downloads_label"
		android:icon="@drawable/files_icon"
		android:documentLaunchMode="intoExisting"

app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.provider.DocumentsContract;
		import android.support.test.uiautomator.UiDevice;
		import android.test.InstrumentationTestCase;
		import android.test.suitebuilder.annotation.LargeTest;
		import android.util.Log;

		import java.util.Arrays;
		import java.util.List;

perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.view.KeyEvent;

		import com.android.documentsui.model.RootInfo;
		import com.android.documentsui.EventListener;
		import com.android.documentsui.manager.ManageActivity;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -38,7 +39,7 @@ import java.util.Random;
		import java.util.concurrent.CountDownLatch;

		@LargeTest
		public class FilesActivityPerfTest extends ActivityTest<FilesActivity> {
		public class FilesActivityPerfTest extends ActivityTest<ManageActivity> {

		// Constants starting with KEY_ are used to report metrics to APCT.
		private static final String KEY_FILES_LISTED_PERFORMANCE_FIRST =
		@@ -53,7 +54,7 @@ public class FilesActivityPerfTest extends ActivityTest<FilesActivity> {
		private static final int NUM_MEASUREMENTS = 10;

		public FilesActivityPerfTest() {
		super(FilesActivity.class);
		super(ManageActivity.class);
		}

		@Override

perf-tests/src/com/android/documentsui/FilesJankPerfTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@ import android.support.test.jank.GfxMonitor;
		import android.support.test.uiautomator.UiScrollable;
		import android.util.Log;

		import com.android.documentsui.FilesActivity;
		import com.android.documentsui.bots.RootsListBot;
		import com.android.documentsui.manager.ManageActivity;
		import com.android.documentsui.bots.DirectoryListBot;

		@LargeTest
		@@ -53,7 +53,7 @@ public class FilesJankPerfTest extends JankTestBase {
		mRootsListBot = new RootsListBot(device, context, BOT_TIMEOUT);
		mDirListBot = new DirectoryListBot(device, context, BOT_TIMEOUT);

		final Intent intent = new Intent(context, FilesActivity.class);
		final Intent intent = new Intent(context, ManageActivity.class);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		mActivity = getInstrumentation().startActivitySync(intent);
		try {

src/com/android/documentsui/BaseActivity.java

+22 −23

Original line number	Diff line number	Diff line
		@@ -104,14 +104,16 @@ public abstract class BaseActivity extends Activity

		private static final String BENCHMARK_TESTING_PACKAGE = "com.android.documentsui.appperftests";

		State mState;
		@Nullable RetainedState mRetainedState;
		RootsCache mRoots;
		SearchViewManager mSearchManager;
		DrawerController mDrawer;
		NavigationViewManager mNavigator;
		protected SearchViewManager mSearchManager;
		// TODO: Unpublic this by injecting it into LoadLastAccessedStackTask
		public State mState;

		protected @Nullable RetainedState mRetainedState;
		protected RootsCache mRoots;
		protected DrawerController mDrawer;
		protected NavigationViewManager mNavigator;
		List<EventListener> mEventListeners = new ArrayList<>();
		SortController mSortController;
		protected SortController mSortController;

		private final String mTag;
		private final ContentObserver mRootsCacheObserver = new ContentObserver(new Handler()) {
		@@ -134,11 +136,11 @@ public abstract class BaseActivity extends Activity
		public abstract MenuManager getMenuManager();
		public abstract DirectoryDetails getDirectoryDetails();

		abstract void onTaskFinished(Uri... uris);
		abstract void refreshDirectory(int anim);
		protected abstract void onTaskFinished(Uri... uris);
		protected abstract void refreshDirectory(int anim);
		/** Allows sub-classes to include information in a newly created State instance. */
		abstract void includeState(State initialState);
		abstract void onDirectoryCreated(DocumentInfo doc);
		protected abstract void includeState(State initialState);
		protected abstract void onDirectoryCreated(DocumentInfo doc);

		public BaseActivity(@LayoutRes int layoutId, String tag) {
		mLayoutId = layoutId;
		@@ -321,11 +323,11 @@ public abstract class BaseActivity extends Activity
		}
		}

		final @Nullable DirectoryFragment getDirectoryFragment() {
		protected final @Nullable DirectoryFragment getDirectoryFragment() {
		return DirectoryFragment.get(getFragmentManager());
		}

		void showCreateDirectoryDialog() {
		protected void showCreateDirectoryDialog() {
		Metrics.logUserAction(this, Metrics.USER_ACTION_CREATE_DIR);

		CreateDirectoryFragment.show(getFragmentManager());
		@@ -335,7 +337,7 @@ public abstract class BaseActivity extends Activity
		* Returns true if a directory can be created in the current location.
		* @return
		*/
		boolean canCreateDirectory() {
		protected boolean canCreateDirectory() {
		final RootInfo root = getCurrentRoot();
		final DocumentInfo cwd = getCurrentDirectory();
		return cwd != null
		@@ -345,7 +347,7 @@ public abstract class BaseActivity extends Activity
		&& !root.isDownloads();
		}

		void openContainerDocument(DocumentInfo doc) {
		protected void openContainerDocument(DocumentInfo doc) {
		assert(doc.isContainer());

		notifyDirectoryNavigated(doc.derivedUri);
		@@ -379,7 +381,7 @@ public abstract class BaseActivity extends Activity
		invalidateOptionsMenu();
		}

		final void loadRoot(final Uri uri) {
		protected final void loadRoot(final Uri uri) {
		new LoadRootTask(this, uri).executeOnExecutor(
		ProviderExecutor.forAuthority(uri.getAuthority()));
		}
		@@ -417,7 +419,7 @@ public abstract class BaseActivity extends Activity
		DirectoryFragment.reloadSearch(fm, root, cwd, query);
		}

		final List<String> getExcludedAuthorities() {
		private final List<String> getExcludedAuthorities() {
		List<String> authorities = new ArrayList<>();
		if (getIntent().getBooleanExtra(DocumentsContract.EXTRA_EXCLUDE_SELF, false)) {
		// Exclude roots provided by the calling package.
		@@ -440,7 +442,7 @@ public abstract class BaseActivity extends Activity
		return (root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0;
		}

		final String getCallingPackageMaybeExtra() {
		public final String getCallingPackageMaybeExtra() {
		String callingPackage = getCallingPackage();
		// System apps can set the calling package name using an extra.
		try {
		@@ -514,10 +516,7 @@ public abstract class BaseActivity extends Activity
		}

		public void setPending(boolean pending) {
		final SaveFragment save = SaveFragment.get(getFragmentManager());
		if (save != null) {
		save.setPending(pending);
		}
		// TODO: Isolate this behavior to PickActivity.
		}

		@Override
		@@ -601,7 +600,7 @@ public abstract class BaseActivity extends Activity
		super.onBackPressed();
		}

		boolean onBeforePopDir() {
		protected boolean onBeforePopDir() {
		// Files app overrides this with some fancy logic.
		return false;
		}