Merge "Move State to a separate file." (ecfbd3ed) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+0 −127

Original line number	Diff line number	Diff line
		@@ -33,14 +33,11 @@ import android.database.Cursor;
		import android.net.Uri;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.provider.DocumentsContract;
		import android.provider.DocumentsContract.Root;
		import android.support.annotation.LayoutRes;
		import android.support.annotation.Nullable;
		import android.util.Log;
		import android.util.SparseArray;
		import android.view.LayoutInflater;
		import android.view.Menu;
		import android.view.MenuItem;
		@@ -67,7 +64,6 @@ import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.HashMap;
		import java.util.List;
		import java.util.concurrent.Executor;

		@@ -367,129 +363,6 @@ abstract class BaseActivity extends Activity {
		public static String EXTRA_DIRECTORY_COPY = "com.android.documentsui.DIRECTORY_COPY";
		}

		public static class State implements android.os.Parcelable {
		public int action;
		public String[] acceptMimes;

		/** Explicit user choice */
		public int userMode = MODE_UNKNOWN;
		/** Derived after loader */
		public int derivedMode = MODE_LIST;

		/** Explicit user choice */
		public int userSortOrder = SORT_ORDER_UNKNOWN;
		/** Derived after loader */
		public int derivedSortOrder = SORT_ORDER_DISPLAY_NAME;

		public boolean allowMultiple;
		public boolean forceSize ;
		public boolean showSize;
		public boolean localOnly ;
		public boolean forceAdvanced ;
		public boolean showAdvanced ;
		public boolean stackTouched ;
		public boolean restored ;
		public boolean directoryCopy ;
		/** Transfer mode for file copy/move operations. */
		public int transferMode;

		/** Current user navigation stack; empty implies recents. */
		public DocumentStack stack = new DocumentStack();
		/** Currently active search, overriding any stack. */
		public String currentSearch;

		/** Instance state for every shown directory */
		public HashMap<String, SparseArray<Parcelable>> dirState = new HashMap<>();

		/** Currently copying file */
		public List<DocumentInfo> selectedDocumentsForCopy = new ArrayList<DocumentInfo>();

		/** Name of the package that started DocsUI */
		public List<String> excludedAuthorities = new ArrayList<>();

		public static final int ACTION_OPEN = 1;
		public static final int ACTION_CREATE = 2;
		public static final int ACTION_GET_CONTENT = 3;
		public static final int ACTION_OPEN_TREE = 4;
		public static final int ACTION_MANAGE = 5;
		public static final int ACTION_BROWSE = 6;
		public static final int ACTION_OPEN_COPY_DESTINATION = 8;

		public static final int MODE_UNKNOWN = 0;
		public static final int MODE_LIST = 1;
		public static final int MODE_GRID = 2;

		public static final int SORT_ORDER_UNKNOWN = 0;
		public static final int SORT_ORDER_DISPLAY_NAME = 1;
		public static final int SORT_ORDER_LAST_MODIFIED = 2;
		public static final int SORT_ORDER_SIZE = 3;

		public void initAcceptMimes(Intent intent) {
		if (intent.hasExtra(Intent.EXTRA_MIME_TYPES)) {
		acceptMimes = intent.getStringArrayExtra(Intent.EXTRA_MIME_TYPES);
		} else {
		String glob = intent.getType();
		acceptMimes = new String[] { glob != null ? glob : "/" };
		}
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(action);
		out.writeInt(userMode);
		out.writeStringArray(acceptMimes);
		out.writeInt(userSortOrder);
		out.writeInt(allowMultiple ? 1 : 0);
		out.writeInt(forceSize ? 1 : 0);
		out.writeInt(showSize ? 1 : 0);
		out.writeInt(localOnly ? 1 : 0);
		out.writeInt(forceAdvanced ? 1 : 0);
		out.writeInt(showAdvanced ? 1 : 0);
		out.writeInt(stackTouched ? 1 : 0);
		out.writeInt(restored ? 1 : 0);
		DurableUtils.writeToParcel(out, stack);
		out.writeString(currentSearch);
		out.writeMap(dirState);
		out.writeList(selectedDocumentsForCopy);
		out.writeList(excludedAuthorities);
		}

		public static final Creator<State> CREATOR = new Creator<State>() {
		@Override
		public State createFromParcel(Parcel in) {
		final State state = new State();
		state.action = in.readInt();
		state.userMode = in.readInt();
		state.acceptMimes = in.readStringArray();
		state.userSortOrder = in.readInt();
		state.allowMultiple = in.readInt() != 0;
		state.forceSize = in.readInt() != 0;
		state.showSize = in.readInt() != 0;
		state.localOnly = in.readInt() != 0;
		state.forceAdvanced = in.readInt() != 0;
		state.showAdvanced = in.readInt() != 0;
		state.stackTouched = in.readInt() != 0;
		state.restored = in.readInt() != 0;
		DurableUtils.readFromParcel(in, state.stack);
		state.currentSearch = in.readString();
		in.readMap(state.dirState, null);
		in.readList(state.selectedDocumentsForCopy, null);
		in.readList(state.excludedAuthorities, null);
		return state;
		}

		@Override
		public State[] newArray(int size) {
		return new State[size];
		}
		};
		}

		void setDisplayAdvancedDevices(boolean display) {
		State state = getDisplayState();
		LocalPreferences.setDisplayAdvancedDevices(this, display);

packages/DocumentsUI/src/com/android/documentsui/CopyService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.documentsui;

		import static com.android.documentsui.Shared.DEBUG;
		import static com.android.documentsui.model.DocumentInfo.getCursorLong;
		import static com.android.documentsui.model.DocumentInfo.getCursorString;

		@@ -56,7 +57,6 @@ import java.util.Objects;

		public class CopyService extends IntentService {
		public static final String TAG = "CopyService";
		public static final boolean DEBUG = false;

		private static final String EXTRA_CANCEL = "com.android.documentsui.CANCEL";
		public static final String EXTRA_SRC_LIST = "com.android.documentsui.SRC_LIST";

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -16,14 +16,15 @@

		package com.android.documentsui;

		import static com.android.documentsui.BaseActivity.State.ACTION_BROWSE;
		import static com.android.documentsui.BaseActivity.State.ACTION_CREATE;
		import static com.android.documentsui.BaseActivity.State.ACTION_MANAGE;
		import static com.android.documentsui.BaseActivity.State.MODE_GRID;
		import static com.android.documentsui.BaseActivity.State.MODE_LIST;
		import static com.android.documentsui.BaseActivity.State.MODE_UNKNOWN;
		import static com.android.documentsui.BaseActivity.State.SORT_ORDER_UNKNOWN;
		import static com.android.documentsui.Shared.DEBUG;
		import static com.android.documentsui.Shared.TAG;
		import static com.android.documentsui.State.ACTION_BROWSE;
		import static com.android.documentsui.State.ACTION_CREATE;
		import static com.android.documentsui.State.ACTION_MANAGE;
		import static com.android.documentsui.State.MODE_GRID;
		import static com.android.documentsui.State.MODE_LIST;
		import static com.android.documentsui.State.MODE_UNKNOWN;
		import static com.android.documentsui.State.SORT_ORDER_UNKNOWN;
		import static com.android.documentsui.model.DocumentInfo.getCursorInt;
		import static com.android.documentsui.model.DocumentInfo.getCursorLong;
		import static com.android.documentsui.model.DocumentInfo.getCursorString;
		@@ -93,7 +94,6 @@ import android.widget.TextView;
		import android.widget.Toast;

		import com.android.documentsui.BaseActivity.DocumentContext;
		import com.android.documentsui.BaseActivity.State;
		import com.android.documentsui.MultiSelectManager.Selection;
		import com.android.documentsui.ProviderExecutor.Preemptable;
		import com.android.documentsui.RecentsProvider.StateColumns;
		@@ -124,7 +124,6 @@ public class DirectoryFragment extends Fragment {
		public static final int REQUEST_COPY_DESTINATION = 1;

		private static final int LOADER_ID = 42;
		private static final boolean DEBUG = false;
		private static final boolean DEBUG_ENABLE_DND = false;

		private static final String EXTRA_TYPE = "type";

packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -16,12 +16,12 @@

		package com.android.documentsui;

		import static com.android.documentsui.BaseActivity.State.MODE_UNKNOWN;
		import static com.android.documentsui.BaseActivity.State.SORT_ORDER_DISPLAY_NAME;
		import static com.android.documentsui.BaseActivity.State.SORT_ORDER_LAST_MODIFIED;
		import static com.android.documentsui.BaseActivity.State.SORT_ORDER_SIZE;
		import static com.android.documentsui.BaseActivity.State.SORT_ORDER_UNKNOWN;
		import static com.android.documentsui.Shared.TAG;
		import static com.android.documentsui.State.MODE_UNKNOWN;
		import static com.android.documentsui.State.SORT_ORDER_DISPLAY_NAME;
		import static com.android.documentsui.State.SORT_ORDER_LAST_MODIFIED;
		import static com.android.documentsui.State.SORT_ORDER_SIZE;
		import static com.android.documentsui.State.SORT_ORDER_UNKNOWN;
		import static com.android.documentsui.model.DocumentInfo.getCursorInt;

		import android.content.AsyncTaskLoader;
		@@ -37,7 +37,6 @@ import android.provider.DocumentsContract;
		import android.provider.DocumentsContract.Document;
		import android.util.Log;

		import com.android.documentsui.BaseActivity.State;
		import com.android.documentsui.RecentsProvider.StateColumns;
		import com.android.documentsui.model.DocumentInfo;
		import com.android.documentsui.model.RootInfo;

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -16,13 +16,12 @@

		package com.android.documentsui;

		import static com.android.documentsui.BaseActivity.State.ACTION_CREATE;
		import static com.android.documentsui.BaseActivity.State.ACTION_GET_CONTENT;
		import static com.android.documentsui.BaseActivity.State.ACTION_OPEN;
		import static com.android.documentsui.BaseActivity.State.ACTION_OPEN_COPY_DESTINATION;
		import static com.android.documentsui.BaseActivity.State.ACTION_OPEN_TREE;
		import static com.android.documentsui.DirectoryFragment.ANIM_DOWN;
		import static com.android.documentsui.DirectoryFragment.ANIM_NONE;
		import static com.android.documentsui.State.ACTION_CREATE;
		import static com.android.documentsui.State.ACTION_GET_CONTENT;
		import static com.android.documentsui.State.ACTION_OPEN;
		import static com.android.documentsui.State.ACTION_OPEN_COPY_DESTINATION;
		import static com.android.documentsui.State.ACTION_OPEN_TREE;

		import android.app.Activity;
		import android.app.Fragment;