diff options
11 files changed, 100 insertions, 141 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index ad8b0d12d438..5ffc435a581b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -17,11 +17,13 @@ package com.android.documentsui; import static com.android.documentsui.Shared.DEBUG; +import static com.android.documentsui.State.MODE_GRID; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_DOWN; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_UP; import static com.android.internal.util.Preconditions.checkArgument; +import static com.android.internal.util.Preconditions.checkState; import android.app.Activity; import android.app.Fragment; @@ -51,8 +53,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.documentsui.RecentsProvider.ResumeColumns; -import com.android.documentsui.SearchManager; import com.android.documentsui.SearchManager.SearchManagerListener; +import com.android.documentsui.State.ViewMode; import com.android.documentsui.dirlist.DirectoryFragment; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.DocumentStack; @@ -204,6 +206,8 @@ public abstract class BaseActivity extends Activity implements SearchManagerList void onStackRestored(boolean restored, boolean external) {} void onRootPicked(RootInfo root) { + mState.derivedMode = LocalPreferences.getViewMode(this, root, MODE_GRID); + // Clear entire backstack and start in new root mState.onRootChanged(root); mSearchManager.update(root); @@ -260,11 +264,11 @@ public abstract class BaseActivity extends Activity implements SearchManagerList return true; case R.id.menu_grid: - setUserMode(State.MODE_GRID); + setViewMode(State.MODE_GRID); return true; case R.id.menu_list: - setUserMode(State.MODE_LIST); + setViewMode(State.MODE_LIST); return true; case R.id.menu_paste_from_clipboard: @@ -419,24 +423,27 @@ public abstract class BaseActivity extends Activity implements SearchManagerList invalidateOptionsMenu(); } - public void onStateChanged() { - invalidateOptionsMenu(); - } - /** * Set state sort order based on explicit user action. */ void setUserSortOrder(int sortOrder) { mState.userSortOrder = sortOrder; - DirectoryFragment.get(getFragmentManager()).onUserSortOrderChanged(); + DirectoryFragment.get(getFragmentManager()).onSortOrderChanged(); } /** - * Set state mode based on explicit user action. + * Set mode based on explicit user action. */ - void setUserMode(int mode) { - mState.userMode = mode; - DirectoryFragment.get(getFragmentManager()).onUserModeChanged(); + void setViewMode(@ViewMode int mode) { + checkState(mState.stack.root != null); + LocalPreferences.setViewMode(this, mState.stack.root, mode); + mState.derivedMode = mode; + + // view icon needs to be updated, but we *could* do it + // in onOptionsItemSelected, and not do the full invalidation + // But! That's a larger refactoring we'll save for another day. + invalidateOptionsMenu(); + DirectoryFragment.get(getFragmentManager()).onViewModeChanged(); } public void setPending(boolean pending) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java index 6719b238326a..b0542b9eb5be 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java @@ -16,11 +16,11 @@ package com.android.documentsui; +import static com.android.documentsui.Shared.DEBUG; import static com.android.documentsui.Shared.TAG; 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.model.DocumentInfo.getCursorInt; import android.content.AsyncTaskLoader; import android.content.ContentProviderClient; @@ -35,7 +35,6 @@ import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; import android.util.Log; -import com.android.documentsui.RecentsProvider.StateColumns; import com.android.documentsui.dirlist.DirectoryFragment; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.RootInfo; @@ -52,10 +51,10 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { private final int mType; private final RootInfo mRoot; - private DocumentInfo mDoc; private final Uri mUri; private final int mUserSortOrder; + private DocumentInfo mDoc; private CancellationSignal mSignal; private DirectoryResult mResult; @@ -64,9 +63,9 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { super(context, ProviderExecutor.forAuthority(root.authority)); mType = type; mRoot = root; - mDoc = doc; mUri = uri; mUserSortOrder = userSortOrder; + mDoc = doc; } @Override @@ -83,8 +82,6 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { final DirectoryResult result = new DirectoryResult(); - int userMode = State.MODE_UNKNOWN; - // Use default document when searching if (mType == DirectoryFragment.TYPE_SEARCH) { final Uri docUri = DocumentsContract.buildDocumentUri( @@ -98,25 +95,6 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { } } - // Pick up any custom modes requested by user - Cursor cursor = null; - try { - final Uri stateUri = RecentsProvider.buildState( - mRoot.authority, mRoot.rootId, mDoc.documentId); - cursor = resolver.query(stateUri, null, null, null, null); - if (cursor.moveToFirst()) { - userMode = getCursorInt(cursor, StateColumns.MODE); - } - } finally { - IoUtils.closeQuietly(cursor); - } - - if (userMode != State.MODE_UNKNOWN) { - result.mode = userMode; - } else { - result.mode = State.MODE_GRID; - } - if (mUserSortOrder != State.SORT_ORDER_UNKNOWN) { result.sortOrder = mUserSortOrder; } else { @@ -132,13 +110,13 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { result.sortOrder = State.SORT_ORDER_UNKNOWN; } - Log.d(TAG, "userMode=" + userMode + ", userSortOrder=" + mUserSortOrder + " --> mode=" - + result.mode + ", sortOrder=" + result.sortOrder); + if (DEBUG) + Log.d(TAG, "userSortOrder=" + mUserSortOrder + ", sortOrder=" + result.sortOrder); ContentProviderClient client = null; + Cursor cursor = null; try { client = DocumentsApplication.acquireUnstableProviderOrThrow(resolver, authority); - cursor = client.query( mUri, null, null, null, getQuerySortOrder(result.sortOrder), mSignal); if (cursor == null) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java index e7e4f737a896..22e438addc4c 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java @@ -29,7 +29,6 @@ public class DirectoryResult implements AutoCloseable { public Cursor cursor; public Exception exception; - public int mode = MODE_UNKNOWN; public int sortOrder = SORT_ORDER_UNKNOWN; @Override diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 6dcd472b3efe..c3395aeb7ba2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -346,11 +346,13 @@ public class DocumentsActivity extends BaseActivity { } else { DirectoryFragment.showRecentsOpen(fm, anim); - // Start recents in grid when requesting visual things - final boolean visualMimes = MimePredicate.mimeMatches( + // In recents we pick layout mode based on the mimetype, + // picking GRID for visual types. We intentionally don't + // consult a user's saved preferences here since they are + // set per root (not per root and per mimetype). + boolean visualMimes = MimePredicate.mimeMatches( MimePredicate.VISUAL_MIMES, mState.acceptMimes); - mState.userMode = visualMimes ? State.MODE_GRID : State.MODE_LIST; - mState.derivedMode = mState.userMode; + mState.derivedMode = visualMimes ? State.MODE_GRID : State.MODE_LIST; } } else { if (mSearchManager.isSearching()) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index 5abe7f6f5234..89a691215672 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -296,12 +296,6 @@ public class FilesActivity extends BaseActivity { if (cwd == null) { DirectoryFragment.showRecentsOpen(fm, anim); - - // Start recents in grid when requesting visual things - final boolean visualMimes = MimePredicate.mimeMatches( - MimePredicate.VISUAL_MIMES, mState.acceptMimes); - mState.userMode = visualMimes ? State.MODE_GRID : State.MODE_LIST; - mState.derivedMode = mState.userMode; } else { if (mState.currentSearch != null) { // Ongoing search diff --git a/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java b/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java index 113e9d7f7357..4bffc49e5ac0 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java +++ b/packages/DocumentsUI/src/com/android/documentsui/LocalPreferences.java @@ -16,12 +16,19 @@ package com.android.documentsui; +import static com.android.documentsui.State.MODE_UNKNOWN; +import static com.android.internal.util.Preconditions.checkArgument; + import android.content.Context; import android.preference.PreferenceManager; +import com.android.documentsui.State.ViewMode; +import com.android.documentsui.model.RootInfo; + public class LocalPreferences { private static final String KEY_ADVANCED_DEVICES = "advancedDevices"; private static final String KEY_FILE_SIZE = "fileSize"; + private static final String ROOT_VIEW_MODE_PREFIX = "rootViewMode-"; public static boolean getDisplayAdvancedDevices(Context context) { boolean defaultAdvanced = context.getResources() @@ -35,6 +42,12 @@ public class LocalPreferences { .getBoolean(KEY_FILE_SIZE, false); } + public static @ViewMode int getViewMode( + Context context, RootInfo root, @ViewMode int fallback) { + return PreferenceManager.getDefaultSharedPreferences(context) + .getInt(createKey(root), fallback); + } + public static void setDisplayAdvancedDevices(Context context, boolean display) { PreferenceManager.getDefaultSharedPreferences(context).edit() .putBoolean(KEY_ADVANCED_DEVICES, display).apply(); @@ -44,4 +57,14 @@ public class LocalPreferences { PreferenceManager.getDefaultSharedPreferences(context).edit() .putBoolean(KEY_FILE_SIZE, display).apply(); } + + public static void setViewMode(Context context, RootInfo root, @ViewMode int viewMode) { + checkArgument(viewMode != MODE_UNKNOWN); + PreferenceManager.getDefaultSharedPreferences(context).edit() + .putInt(createKey(root), viewMode).apply(); + } + + private static String createKey(RootInfo root) { + return ROOT_VIEW_MODE_PREFIX + root.authority + root.rootId; + } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java index 82eb732002bb..92ffb93365d2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java @@ -85,6 +85,8 @@ public class RecentsProvider extends ContentProvider { public static final String AUTHORITY = "authority"; public static final String ROOT_ID = Root.COLUMN_ROOT_ID; public static final String DOCUMENT_ID = Document.COLUMN_DOCUMENT_ID; + + @Deprecated // mode is tracked in local preferences now...by root only public static final String MODE = "mode"; public static final String SORT_ORDER = "sortOrder"; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/State.java b/packages/DocumentsUI/src/com/android/documentsui/State.java index 2f0224ff4565..28f743243234 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/State.java +++ b/packages/DocumentsUI/src/com/android/documentsui/State.java @@ -16,6 +16,7 @@ package com.android.documentsui; +import android.annotation.IntDef; import android.content.Intent; import android.os.Parcel; import android.os.Parcelable; @@ -26,18 +27,43 @@ import com.android.documentsui.model.DocumentStack; import com.android.documentsui.model.DurableUtils; import com.android.documentsui.model.RootInfo; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; public class State implements android.os.Parcelable { + + 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_PICK_COPY_DESTINATION = 8; + + @IntDef(flag = true, value = { + MODE_UNKNOWN, + MODE_LIST, + MODE_GRID + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ViewMode {} + 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 int action; public String[] acceptMimes; - /** Explicit user choice */ - public int userMode = MODE_UNKNOWN; - /** Derived after loader */ - public int derivedMode = MODE_GRID; + /** Derived from local preferences */ + public @ViewMode int derivedMode = MODE_GRID; /** Explicit user choice */ public int userSortOrder = SORT_ORDER_UNKNOWN; @@ -58,6 +84,8 @@ public class State implements android.os.Parcelable { /** Current user navigation stack; empty implies recents. */ public DocumentStack stack = new DocumentStack(); + private boolean mStackTouched; + /** Currently active search, overriding any stack. */ public String currentSearch; @@ -70,25 +98,6 @@ public class State implements android.os.Parcelable { /** 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_PICK_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; - - private boolean mStackTouched; - public void initAcceptMimes(Intent intent) { if (intent.hasExtra(Intent.EXTRA_MIME_TYPES)) { acceptMimes = intent.getStringArrayExtra(Intent.EXTRA_MIME_TYPES); @@ -131,7 +140,6 @@ public class State implements android.os.Parcelable { @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); @@ -155,7 +163,6 @@ public class State implements android.os.Parcelable { 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; diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 74fa8d07da87..f57aa4b44530 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -20,7 +20,6 @@ import static com.android.documentsui.Shared.DEBUG; 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.getCursorString; @@ -37,7 +36,6 @@ import android.app.FragmentTransaction; import android.app.LoaderManager.LoaderCallbacks; import android.content.ClipData; import android.content.ContentResolver; -import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.content.Loader; @@ -91,9 +89,6 @@ import com.android.documentsui.MessageBar; import com.android.documentsui.MimePredicate; import com.android.documentsui.R; import com.android.documentsui.RecentLoader; -import com.android.documentsui.RecentsProvider; -import com.android.documentsui.RecentsProvider.StateColumns; -import com.android.documentsui.dirlist.RenameDocumentFragment; import com.android.documentsui.RootsCache; import com.android.documentsui.Shared; import com.android.documentsui.Snackbars; @@ -155,7 +150,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi private int mType = TYPE_NORMAL; private String mStateKey; - private int mLastMode = MODE_UNKNOWN; private int mLastSortOrder = SORT_ORDER_UNKNOWN; private boolean mLastShowSize; private DocumentsAdapter mAdapter; @@ -240,7 +234,7 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi final RootInfo root = getArguments().getParcelable(EXTRA_ROOT); final DocumentInfo doc = getArguments().getParcelable(EXTRA_DOC); - mIconHelper = new IconHelper(context, state.derivedMode); + mIconHelper = new IconHelper(context, MODE_GRID); mAdapter = new SectionBreakDocumentsAdapterWrapper( this, new ModelBackedDocumentsAdapter(this, mIconHelper)); @@ -323,12 +317,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi if (!isAdded()) return; mModel.update(result); - - // Push latest state up to UI - // TODO: if mode change was racing with us, don't overwrite it - if (result.mode != MODE_UNKNOWN) { - state.derivedMode = result.mode; - } state.derivedSortOrder = result.sortOrder; updateDisplayState(); @@ -361,8 +349,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi // Kick off loader at least once getLoaderManager().restartLoader(LOADER_ID, null, mCallbacks); - - updateDisplayState(); } @Override @@ -425,61 +411,25 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi state.dirState.put(mStateKey, container); } - @Override - public void onResume() { - super.onResume(); - updateDisplayState(); - } - public void onDisplayStateChanged() { updateDisplayState(); } - public void onUserSortOrderChanged() { - // Sort order change always triggers reload; we'll trigger state change - // on the flip side. + public void onSortOrderChanged() { + // Sort order is implemented as a sorting wrapper around directory + // results. So when sort order changes, we force a reload of the directory. getLoaderManager().restartLoader(LOADER_ID, null, mCallbacks); } - public void onUserModeChanged() { - final ContentResolver resolver = getActivity().getContentResolver(); - final State state = getDisplayState(); - - final RootInfo root = getArguments().getParcelable(EXTRA_ROOT); - final DocumentInfo doc = getArguments().getParcelable(EXTRA_DOC); - - if (root != null && doc != null) { - final Uri stateUri = RecentsProvider.buildState( - root.authority, root.rootId, doc.documentId); - final ContentValues values = new ContentValues(); - values.put(StateColumns.MODE, state.userMode); - - new AsyncTask<Void, Void, Void>() { - @Override - protected Void doInBackground(Void... params) { - resolver.insert(stateUri, values); - return null; - } - }.execute(); - } - - // Mode change is just visual change; no need to kick loader, and - // deliver change event immediately. - state.derivedMode = state.userMode; - ((BaseActivity) getActivity()).onStateChanged(); - + public void onViewModeChanged() { + // Mode change is just visual change; no need to kick loader. updateDisplayState(); } private void updateDisplayState() { - final State state = getDisplayState(); - - if (mLastMode == state.derivedMode && mLastShowSize == state.showSize) return; - mLastMode = state.derivedMode; + State state = getDisplayState(); mLastShowSize = state.showSize; - updateLayout(state.derivedMode); - mRecView.setAdapter(mAdapter); } @@ -506,7 +456,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi } layout = mListLayout; break; - case MODE_UNKNOWN: default: throw new IllegalArgumentException("Unsupported layout mode: " + mode); } @@ -516,7 +465,7 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi // setting layout manager automatically invalidates existing ViewHolders. mRecView.setLayoutManager(layout); mSelectionManager.handleLayoutChanged(); // RecyclerView doesn't do this for us - mIconHelper.setMode(mode); + mIconHelper.setViewMode(mode); } private int calculateColumnCount() { @@ -539,7 +488,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi case MODE_LIST: return getResources().getDimensionPixelSize( R.dimen.list_container_padding); - case MODE_UNKNOWN: default: throw new IllegalArgumentException("Unsupported layout mode: " + mode); } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java index 0314077aae0b..c97c4465b4ef 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/IconHelper.java @@ -42,6 +42,8 @@ import com.android.documentsui.MimePredicate; import com.android.documentsui.ProviderExecutor; import com.android.documentsui.ProviderExecutor.Preemptable; import com.android.documentsui.R; +import com.android.documentsui.State; +import com.android.documentsui.State.ViewMode; import com.android.documentsui.ThumbnailCache; /** @@ -64,7 +66,7 @@ public class IconHelper { */ public IconHelper(Context context, int mode) { mContext = context; - setMode(mode); + setViewMode(mode); mCache = DocumentsApplication.getThumbnailsCache(context, mThumbSize); } @@ -82,7 +84,7 @@ public class IconHelper { * Sets the current display mode. This affects the thumbnail sizes that are loaded. * @param mode See {@link State.MODE_LIST} and {@link State.MODE_GRID}. */ - public void setMode(int mode) { + public void setViewMode(@ViewMode int mode) { // TODO: Instead of exposing setMode, make the mode final, and make separate instances for // grid/list. int thumbSize; @@ -94,7 +96,6 @@ public class IconHelper { thumbSize = mContext.getResources().getDimensionPixelSize( R.dimen.list_item_thumbnail_size); break; - case MODE_UNKNOWN: default: throw new IllegalArgumentException("Unsupported layout mode: " + mode); } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java index 68756a36fb1c..880da9c07bef 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java @@ -19,7 +19,6 @@ package com.android.documentsui.dirlist; import static com.android.documentsui.Shared.DEBUG; 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.model.DocumentInfo.getCursorInt; import static com.android.documentsui.model.DocumentInfo.getCursorString; @@ -92,7 +91,6 @@ final class ModelBackedDocumentsAdapter extends DocumentsAdapter { case MODE_LIST: holder = new ListDocumentHolder(mEnv.getContext(), parent, mIconHelper); break; - case MODE_UNKNOWN: default: throw new IllegalStateException("Unsupported layout mode."); } |