diff options
19 files changed, 132 insertions, 74 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index e3b13246090b..0ee970d6db3a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -16,11 +16,11 @@ package com.android.documentsui; -import static com.android.documentsui.DirectoryFragment.ANIM_DOWN; -import static com.android.documentsui.DirectoryFragment.ANIM_NONE; -import static com.android.documentsui.DirectoryFragment.ANIM_SIDE; -import static com.android.documentsui.DirectoryFragment.ANIM_UP; import static com.android.documentsui.Shared.DEBUG; +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 android.app.Activity; @@ -55,6 +55,7 @@ import android.widget.SearchView.OnQueryTextListener; import android.widget.TextView; import com.android.documentsui.RecentsProvider.ResumeColumns; +import com.android.documentsui.dirlist.DirectoryFragment; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.DocumentStack; import com.android.documentsui.model.DurableUtils; @@ -69,7 +70,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.Executor; -abstract class BaseActivity extends Activity { +public abstract class BaseActivity extends Activity { static final String EXTRA_STATE = "state"; @@ -383,7 +384,7 @@ abstract class BaseActivity extends Activity { invalidateOptionsMenu(); } - void onStateChanged() { + public void onStateChanged() { invalidateOptionsMenu(); } @@ -421,7 +422,7 @@ abstract class BaseActivity extends Activity { super.onRestoreInstanceState(state); } - RootInfo getCurrentRoot() { + public RootInfo getCurrentRoot() { if (mState.stack.root != null) { return mState.stack.root; } else { @@ -825,7 +826,7 @@ abstract class BaseActivity extends Activity { * Interface providing access to current view of documents * even when all documents are not homed to the same parent. */ - interface DocumentContext { + public interface DocumentContext { /** * Returns the cursor for the selected document. The cursor can be used to retrieve * details about a document and its siblings. diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java index bb82b386aa12..b0bbec3e5919 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java @@ -17,11 +17,9 @@ package com.android.documentsui; 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; @@ -38,6 +36,7 @@ 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; @@ -45,23 +44,6 @@ import libcore.io.IoUtils; import java.io.FileNotFoundException; -class DirectoryResult implements AutoCloseable { - ContentProviderClient client; - Cursor cursor; - Exception exception; - - int mode = MODE_UNKNOWN; - int sortOrder = SORT_ORDER_UNKNOWN; - - @Override - public void close() { - IoUtils.closeQuietly(cursor); - ContentProviderClient.releaseQuietly(client); - cursor = null; - client = null; - } -} - public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { private static final String[] SEARCH_REJECT_MIMES = new String[] { Document.MIME_TYPE_DIR }; diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java new file mode 100644 index 000000000000..e7e4f737a896 --- /dev/null +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.documentsui; + +import static com.android.documentsui.State.MODE_UNKNOWN; +import static com.android.documentsui.State.SORT_ORDER_UNKNOWN; + +import android.content.ContentProviderClient; +import android.database.Cursor; + +import libcore.io.IoUtils; + +public class DirectoryResult implements AutoCloseable { + ContentProviderClient client; + public Cursor cursor; + public Exception exception; + + public int mode = MODE_UNKNOWN; + public int sortOrder = SORT_ORDER_UNKNOWN; + + @Override + public void close() { + IoUtils.closeQuietly(cursor); + ContentProviderClient.releaseQuietly(client); + cursor = null; + client = null; + } +} diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java index 6ba07fbbaf6a..b3c28469e71d 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java @@ -39,7 +39,7 @@ import java.util.List; * ClipboardManager wrapper class providing higher level logical * support for dealing with Documents. */ -final class DocumentClipper { +public final class DocumentClipper { private static final String TAG = "DocumentClipper"; diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 18957ee66e38..403a464fb51b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -16,12 +16,12 @@ package com.android.documentsui; -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 static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE; import android.app.Activity; import android.app.Fragment; @@ -53,6 +53,7 @@ import android.widget.Toolbar; import com.android.documentsui.RecentsProvider.RecentColumns; import com.android.documentsui.RecentsProvider.ResumeColumns; +import com.android.documentsui.dirlist.DirectoryFragment; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.DurableUtils; import com.android.documentsui.model.RootInfo; diff --git a/packages/DocumentsUI/src/com/android/documentsui/Events.java b/packages/DocumentsUI/src/com/android/documentsui/Events.java index d4c3ba3ba3c3..49dae3d0402f 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Events.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Events.java @@ -25,33 +25,33 @@ import android.view.View; /** * Utility code for dealing with MotionEvents. */ -final class Events { +public final class Events { /** * Returns true if event was triggered by a mouse. */ - static boolean isMouseEvent(MotionEvent e) { + public static boolean isMouseEvent(MotionEvent e) { return isMouseType(e.getToolType(0)); } /** * Returns true if event was triggered by a finger or stylus touch. */ - static boolean isTouchEvent(MotionEvent e) { + public static boolean isTouchEvent(MotionEvent e) { return isTouchType(e.getToolType(0)); } /** * Returns true if event was triggered by a mouse. */ - static boolean isMouseType(int toolType) { + public static boolean isMouseType(int toolType) { return toolType == MotionEvent.TOOL_TYPE_MOUSE; } /** * Returns true if event was triggered by a finger or stylus touch. */ - static boolean isTouchType(int toolType) { + public static boolean isTouchType(int toolType) { return toolType == MotionEvent.TOOL_TYPE_FINGER || toolType == MotionEvent.TOOL_TYPE_STYLUS; } @@ -59,28 +59,28 @@ final class Events { /** * Returns true if event was triggered by a finger or stylus touch. */ - static boolean isActionDown(MotionEvent e) { + public static boolean isActionDown(MotionEvent e) { return e.getActionMasked() == MotionEvent.ACTION_DOWN; } /** * Returns true if event was triggered by a finger or stylus touch. */ - static boolean isActionUp(MotionEvent e) { + public static boolean isActionUp(MotionEvent e) { return e.getActionMasked() == MotionEvent.ACTION_UP; } /** * Returns true if the shift is pressed. */ - boolean isShiftPressed(MotionEvent e) { + public boolean isShiftPressed(MotionEvent e) { return hasShiftBit(e.getMetaState()); } /** * Returns true if the "SHIFT" bit is set. */ - static boolean hasShiftBit(int metaState) { + public static boolean hasShiftBit(int metaState) { return (metaState & KeyEvent.META_SHIFT_ON) != 0; } @@ -88,7 +88,7 @@ final class Events { * A facade over MotionEvent primarily designed to permit for unit testing * of related code. */ - interface InputEvent { + public interface InputEvent { boolean isMouseEvent(); boolean isPrimaryButtonPressed(); boolean isSecondaryButtonPressed(); @@ -109,7 +109,7 @@ final class Events { int getItemPosition(); } - static final class MotionInputEvent implements InputEvent { + public static final class MotionInputEvent implements InputEvent { private final MotionEvent mEvent; private final RecyclerView mView; private final int mPosition; diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index 627ba756680f..c7cffed91a96 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -16,8 +16,8 @@ package com.android.documentsui; -import static com.android.documentsui.DirectoryFragment.ANIM_NONE; import static com.android.documentsui.Shared.DEBUG; +import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE; import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkState; @@ -44,6 +44,7 @@ import android.widget.Spinner; import android.widget.Toolbar; import com.android.documentsui.RecentsProvider.ResumeColumns; +import com.android.documentsui.dirlist.DirectoryFragment; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.DocumentStack; import com.android.documentsui.model.DurableUtils; diff --git a/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java b/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java index 26a373403d80..3045fa847b26 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java @@ -16,8 +16,8 @@ package com.android.documentsui; -import static com.android.documentsui.DirectoryFragment.ANIM_NONE; import static com.android.documentsui.State.ACTION_MANAGE; +import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE; import android.app.Activity; import android.app.Fragment; @@ -41,6 +41,7 @@ import android.widget.Spinner; import android.widget.Toolbar; import com.android.documentsui.RecentsProvider.ResumeColumns; +import com.android.documentsui.dirlist.DirectoryFragment; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.DurableUtils; import com.android.documentsui.model.RootInfo; diff --git a/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java b/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java index 312d53b9dc1c..5c6213fdc933 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java +++ b/packages/DocumentsUI/src/com/android/documentsui/MessageBar.java @@ -105,7 +105,7 @@ public class MessageBar extends Fragment { return mView; } - void hide() { + public void hide() { // The container view is used to show/hide the error bar. If a container is not provided, // fall back to showing/hiding the error bar View, which also works, but does not provide // the same animated transition. @@ -116,7 +116,7 @@ public class MessageBar extends Fragment { } } - void show() { + public void show() { // The container view is used to show/hide the error bar. If a container is not provided, // fall back to showing/hiding the error bar View, which also works, but does not provide // the same animated transition. diff --git a/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java b/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java index f48b298a4f2f..48c1a733703c 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Snackbars.java @@ -22,7 +22,7 @@ import android.app.Activity; import android.support.design.widget.Snackbar; import android.view.View; -final class Snackbars { +public final class Snackbars { private Snackbars() {} public static final Snackbar makeSnackbar(Activity activity, int messageId, int duration) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 3b7da78ccb8d..e1f5ee16d29b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.documentsui; +package com.android.documentsui.dirlist; import static com.android.documentsui.Shared.DEBUG; import static com.android.documentsui.State.ACTION_CREATE; @@ -88,11 +88,44 @@ import android.view.ViewParent; import android.widget.ImageView; import android.widget.TextView; +import com.android.documentsui.BaseActivity; +import com.android.documentsui.CopyService; +import com.android.documentsui.DirectoryLoader; +import com.android.documentsui.DirectoryResult; +import com.android.documentsui.DocumentClipper; +import com.android.documentsui.DocumentsActivity; +import com.android.documentsui.DocumentsApplication; +import com.android.documentsui.Events; +import com.android.documentsui.IconUtils; +import com.android.documentsui.Menus; +import com.android.documentsui.MessageBar; +import com.android.documentsui.MimePredicate; +import com.android.documentsui.ProviderExecutor; +import com.android.documentsui.R; +import com.android.documentsui.RecentLoader; +import com.android.documentsui.RecentsProvider; +import com.android.documentsui.RootCursorWrapper; +import com.android.documentsui.RootsCache; +import com.android.documentsui.Shared; +import com.android.documentsui.Snackbars; +import com.android.documentsui.State; +import com.android.documentsui.ThumbnailCache; import com.android.documentsui.BaseActivity.DocumentContext; -import com.android.documentsui.MultiSelectManager.Selection; +import com.android.documentsui.BaseActivity.DocumentsIntent; import com.android.documentsui.ProviderExecutor.Preemptable; +import com.android.documentsui.R.animator; +import com.android.documentsui.R.attr; +import com.android.documentsui.R.bool; +import com.android.documentsui.R.dimen; +import com.android.documentsui.R.drawable; +import com.android.documentsui.R.id; +import com.android.documentsui.R.layout; +import com.android.documentsui.R.menu; +import com.android.documentsui.R.plurals; +import com.android.documentsui.R.string; import com.android.documentsui.RecentsProvider.StateColumns; -import com.android.documentsui.dirlist.FragmentTuner; +import com.android.documentsui.dirlist.MultiSelectManager.Callback; +import com.android.documentsui.dirlist.MultiSelectManager.Selection; import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.model.DocumentStack; import com.android.documentsui.model.RootInfo; @@ -1391,7 +1424,7 @@ public class DirectoryFragment extends Fragment { return clipData; } - void copySelectedToClipboard() { + public void copySelectedToClipboard() { Selection sel = mSelectionManager.getSelection(new Selection()); copySelectionToClipboard(sel); } @@ -1410,7 +1443,7 @@ public class DirectoryFragment extends Fragment { }.execute(items); } - void pasteFromClipboard() { + public void pasteFromClipboard() { copyFromClipboard(); getActivity().invalidateOptionsMenu(); } @@ -1440,7 +1473,7 @@ public class DirectoryFragment extends Fragment { return dest != null && dest.isDirectory() && dest.isCreateSupported(); } - void selectAllFiles() { + public void selectAllFiles() { boolean changed = mSelectionManager.setItemsSelected(0, mModel.getItemCount(), true); if (changed) { updateDisplayState(); diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryItemAnimator.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java index 0eb1ea55895e..0963845db628 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryItemAnimator.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.documentsui; +package com.android.documentsui.dirlist; import android.animation.Animator; import android.animation.ArgbEvaluator; diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java index ca85cff8a32b..7e9bbe2023d6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java @@ -24,7 +24,6 @@ import android.os.SystemProperties; import android.view.Menu; import android.view.MenuItem; -import com.android.documentsui.DirectoryFragment; import com.android.documentsui.Menus; import com.android.documentsui.R; import com.android.documentsui.State; diff --git a/packages/DocumentsUI/src/com/android/documentsui/MultiSelectManager.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java index 4fde6ff74fea..b5a3b9374d10 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/MultiSelectManager.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.documentsui; +package com.android.documentsui.dirlist; import static com.android.documentsui.Shared.DEBUG; import static com.android.internal.util.Preconditions.checkArgument; @@ -41,8 +41,11 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; +import com.android.documentsui.Events; +import com.android.documentsui.R; import com.android.documentsui.Events.InputEvent; import com.android.documentsui.Events.MotionInputEvent; +import com.android.documentsui.R.drawable; import java.util.ArrayList; import java.util.Collections; @@ -342,7 +345,7 @@ public final class MultiSelectManager implements View.OnKeyListener { * * @param position */ - void toggleSelection(int position) { + public void toggleSelection(int position) { // Position may be special "no position" during certain // transitional phases. If so, skip handling of the event. if (position == RecyclerView.NO_POSITION) { @@ -801,14 +804,11 @@ public final class MultiSelectManager implements View.OnKeyListener { cancelProvisionalSelection(); } - /** @hide */ - @VisibleForTesting - void clear() { + public void clear() { mSavedSelection.clear(); mTotalSelection.clear(); } - /** @hide */ @VisibleForTesting void copyFrom(Selection source) { mSavedSelection = source.mSavedSelection.clone(); diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java b/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java index e83f9e007349..ec5321a8c940 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java @@ -3,7 +3,7 @@ package com.android.documentsui; import android.graphics.Point; import android.support.v7.widget.RecyclerView; -class TestInputEvent implements Events.InputEvent { +public class TestInputEvent implements Events.InputEvent { public boolean mouseEvent; public boolean primaryButtonPressed; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/DirectoryFragmentModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java index 36d880a06892..746e2117dc02 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/DirectoryFragmentModelTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.documentsui; +package com.android.documentsui.dirlist; import android.content.ContentResolver; import android.content.Context; @@ -27,8 +27,9 @@ import android.test.AndroidTestCase; import android.test.mock.MockContentResolver; import android.view.ViewGroup; -import com.android.documentsui.DirectoryFragment.Model; -import com.android.documentsui.MultiSelectManager.Selection; +import com.android.documentsui.DirectoryResult; +import com.android.documentsui.dirlist.DirectoryFragment.Model; +import com.android.documentsui.dirlist.MultiSelectManager.Selection; import com.android.documentsui.model.DocumentInfo; import java.util.List; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java index ceb8cdc34faa..24f5c9e21f7a 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManagerTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.documentsui; +package com.android.documentsui.dirlist; import android.support.v7.widget.RecyclerView; import android.test.AndroidTestCase; @@ -22,7 +22,9 @@ import android.util.SparseBooleanArray; import android.view.View; import android.view.ViewGroup; -import com.android.documentsui.MultiSelectManager.Selection; +import com.android.documentsui.TestInputEvent; +import com.android.documentsui.dirlist.MultiSelectManager; +import com.android.documentsui.dirlist.MultiSelectManager.Selection; import org.mockito.Mockito; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManager_GridModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java index f6683fa840e2..c4b6ce5c7f87 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManager_GridModelTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package com.android.documentsui; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +package com.android.documentsui.dirlist; import android.graphics.Point; import android.graphics.Rect; @@ -26,7 +23,7 @@ import android.test.AndroidTestCase; import android.util.SparseBooleanArray; import android.view.View; -import com.android.documentsui.MultiSelectManager.GridModel; +import com.android.documentsui.dirlist.MultiSelectManager.GridModel; public class MultiSelectManager_GridModelTest extends AndroidTestCase { diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManager_SelectionTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java index eddf4ef6fede..64da750b1306 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManager_SelectionTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package com.android.documentsui; - -import static org.junit.Assert.*; +package com.android.documentsui.dirlist; import android.test.AndroidTestCase; -import com.android.documentsui.MultiSelectManager.Selection; +import com.android.documentsui.dirlist.MultiSelectManager.Selection; public class MultiSelectManager_SelectionTest extends AndroidTestCase{ |