summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2018-07-09 14:57:51 -0600
committer Jeff Sharkey <jsharkey@android.com> 2018-07-09 16:52:10 -0600
commita4ff00f7d103a82aaa9da48f1ada1a98540bdb73 (patch)
tree902a930b3c90f23aef336e2a392574d6f17d4771
parent5b225532546697625fd5198d6bdfc497c9bc303f (diff)
Mechanical refactoring to use public annotations.
We're making an effort to get DocumentsUI to build against public API, so move toward use "androidx" annotations from the support library. Purely mechanical refactoring with "sed". Test: builds Bug: 110959821 Change-Id: I378f5a29620f8f5a6046109ca1aa17d9e18e725f
-rw-r--r--Android.mk2
-rw-r--r--build_apk.mk4
-rw-r--r--src/com/android/documentsui/AbstractDragHost.java2
-rw-r--r--src/com/android/documentsui/ActionHandler.java2
-rw-r--r--src/com/android/documentsui/ActionModeController.java4
-rw-r--r--src/com/android/documentsui/DocumentsAccess.java2
-rw-r--r--src/com/android/documentsui/DragAndDropManager.java4
-rw-r--r--src/com/android/documentsui/DrawerController.java2
-rw-r--r--src/com/android/documentsui/FileTypeMap.java2
-rw-r--r--src/com/android/documentsui/FocusManager.java4
-rw-r--r--src/com/android/documentsui/Injector.java2
-rw-r--r--src/com/android/documentsui/ItemDragListener.java2
-rw-r--r--src/com/android/documentsui/LoadDocStackTask.java2
-rw-r--r--src/com/android/documentsui/MenuManager.java2
-rw-r--r--src/com/android/documentsui/Metrics.java4
-rw-r--r--src/com/android/documentsui/Model.java2
-rw-r--r--src/com/android/documentsui/NavigationViewManager.java2
-rw-r--r--src/com/android/documentsui/OperationDialogFragment.java2
-rw-r--r--src/com/android/documentsui/ProviderExecutor.java2
-rw-r--r--src/com/android/documentsui/RecentsLoader.java2
-rw-r--r--src/com/android/documentsui/RefreshTask.java2
-rw-r--r--src/com/android/documentsui/ScopedAccessActivity.java4
-rw-r--r--src/com/android/documentsui/ScopedAccessMetrics.java4
-rw-r--r--src/com/android/documentsui/ScopedAccessProvider.java2
-rw-r--r--src/com/android/documentsui/ShortcutsUpdater.java2
-rw-r--r--src/com/android/documentsui/ThumbnailCache.java4
-rw-r--r--src/com/android/documentsui/TimeoutTask.java2
-rw-r--r--src/com/android/documentsui/archives/Archive.java2
-rw-r--r--src/com/android/documentsui/archives/ArchivesProvider.java2
-rw-r--r--src/com/android/documentsui/archives/Loader.java2
-rw-r--r--src/com/android/documentsui/archives/ReadableArchive.java2
-rw-r--r--src/com/android/documentsui/archives/WriteableArchive.java2
-rw-r--r--src/com/android/documentsui/base/ConfirmationCallback.java2
-rw-r--r--src/com/android/documentsui/base/Features.java2
-rw-r--r--src/com/android/documentsui/base/MimeTypes.java2
-rw-r--r--src/com/android/documentsui/base/RootInfo.java4
-rw-r--r--src/com/android/documentsui/base/Shared.java2
-rw-r--r--src/com/android/documentsui/base/SharedMinimal.java2
-rw-r--r--src/com/android/documentsui/base/State.java2
-rw-r--r--src/com/android/documentsui/dirlist/AnimationView.java2
-rw-r--r--src/com/android/documentsui/dirlist/DirectoryFragment.java6
-rw-r--r--src/com/android/documentsui/dirlist/FocusHandler.java2
-rw-r--r--src/com/android/documentsui/dirlist/GridDocumentHolder.java2
-rw-r--r--src/com/android/documentsui/dirlist/ListDocumentHolder.java2
-rw-r--r--src/com/android/documentsui/dirlist/Message.java2
-rw-r--r--src/com/android/documentsui/files/ActionHandler.java2
-rw-r--r--src/com/android/documentsui/inspector/DebugView.java2
-rw-r--r--src/com/android/documentsui/inspector/InspectorController.java2
-rw-r--r--src/com/android/documentsui/inspector/KeyValueRow.java2
-rw-r--r--src/com/android/documentsui/inspector/TableView.java2
-rw-r--r--src/com/android/documentsui/inspector/actions/Action.java4
-rw-r--r--src/com/android/documentsui/inspector/actions/ActionView.java2
-rw-r--r--src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java2
-rw-r--r--src/com/android/documentsui/picker/ActionHandler.java2
-rw-r--r--src/com/android/documentsui/prefs/LocalPreferences.java2
-rw-r--r--src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java4
-rw-r--r--src/com/android/documentsui/queries/SearchViewManager.java6
-rw-r--r--src/com/android/documentsui/roots/GetRootDocumentTask.java2
-rw-r--r--src/com/android/documentsui/roots/ProvidersCache.java2
-rw-r--r--src/com/android/documentsui/selection/ContentLock.java4
-rw-r--r--src/com/android/documentsui/selection/DefaultBandHost.java2
-rw-r--r--src/com/android/documentsui/services/CopyJob.java4
-rw-r--r--src/com/android/documentsui/services/FileOperationService.java2
-rw-r--r--src/com/android/documentsui/services/FileOperations.java2
-rw-r--r--src/com/android/documentsui/services/Job.java6
-rw-r--r--src/com/android/documentsui/sidebar/Item.java2
-rw-r--r--src/com/android/documentsui/sidebar/RootItem.java2
-rw-r--r--src/com/android/documentsui/sidebar/RootsFragment.java2
-rw-r--r--src/com/android/documentsui/sorting/DropdownSortWidgetController.java2
-rw-r--r--src/com/android/documentsui/sorting/HeaderCell.java4
-rw-r--r--src/com/android/documentsui/sorting/SortController.java2
-rw-r--r--src/com/android/documentsui/sorting/SortDimension.java2
-rw-r--r--src/com/android/documentsui/sorting/SortModel.java4
-rw-r--r--src/com/android/documentsui/ui/DocumentDebugInfo.java2
-rw-r--r--src/com/android/documentsui/ui/MessageBuilder.java2
-rw-r--r--src/com/android/documentsui/ui/Snackbars.java2
-rw-r--r--tests/common/com/android/documentsui/TestActivity.java2
-rw-r--r--tests/common/com/android/documentsui/testing/TestDragAndDropManager.java2
-rw-r--r--tests/common/com/android/documentsui/testing/TestEvents.java2
-rw-r--r--tests/common/com/android/documentsui/testing/TestFeatures.java2
-rw-r--r--tests/common/com/android/documentsui/testing/TestMenuInflater.java2
-rw-r--r--tests/common/com/android/documentsui/testing/TestMenuItem.java2
-rw-r--r--tests/common/com/android/documentsui/testing/TestPackageManager.java3
-rw-r--r--tests/common/com/android/documentsui/testing/TestResources.java8
-rw-r--r--tests/unit/com/android/documentsui/FileTypeMapTest.java2
-rw-r--r--tests/unit/com/android/documentsui/picker/TestActivity.java2
-rw-r--r--tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java2
-rw-r--r--tests/unit/com/android/documentsui/selection/testing/TestEvents.java2
88 files changed, 112 insertions, 113 deletions
diff --git a/Android.mk b/Android.mk
index fd8a1c858..677307561 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := DocumentsUI
-LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
@@ -35,7 +34,6 @@ LOCAL_SRC_FILES := \
minimal/src/com/android/documentsui/picker/DummyPickActivity.java
LOCAL_PACKAGE_NAME := DocumentsUIMinimal
-LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/minimal/res
LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/minimal/AndroidManifest.xml
diff --git a/build_apk.mk b/build_apk.mk
index 670169da5..c7955bc02 100644
--- a/build_apk.mk
+++ b/build_apk.mk
@@ -25,4 +25,8 @@ endif
LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+# TODO: build against public API as part of b/110959821
+LOCAL_PRIVATE_PLATFORM_APIS := true
+#LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/src/com/android/documentsui/AbstractDragHost.java b/src/com/android/documentsui/AbstractDragHost.java
index a0d13a939..148e71c0c 100644
--- a/src/com/android/documentsui/AbstractDragHost.java
+++ b/src/com/android/documentsui/AbstractDragHost.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.CallSuper;
+import androidx.annotation.CallSuper;
import android.view.View;
import com.android.documentsui.services.FileOperationService;
diff --git a/src/com/android/documentsui/ActionHandler.java b/src/com/android/documentsui/ActionHandler.java
index ba20f347a..53a746a4b 100644
--- a/src/com/android/documentsui/ActionHandler.java
+++ b/src/com/android/documentsui/ActionHandler.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.PendingIntent;
import android.content.ContentProvider;
import android.content.Intent;
diff --git a/src/com/android/documentsui/ActionModeController.java b/src/com/android/documentsui/ActionModeController.java
index dc453b775..1c371fe30 100644
--- a/src/com/android/documentsui/ActionModeController.java
+++ b/src/com/android/documentsui/ActionModeController.java
@@ -18,8 +18,8 @@ package com.android.documentsui;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.IdRes;
-import android.annotation.Nullable;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.text.TextUtils;
import android.util.Log;
diff --git a/src/com/android/documentsui/DocumentsAccess.java b/src/com/android/documentsui/DocumentsAccess.java
index 90c344a72..ea62d935a 100644
--- a/src/com/android/documentsui/DocumentsAccess.java
+++ b/src/com/android/documentsui/DocumentsAccess.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
diff --git a/src/com/android/documentsui/DragAndDropManager.java b/src/com/android/documentsui/DragAndDropManager.java
index 6df130c26..5f5876c41 100644
--- a/src/com/android/documentsui/DragAndDropManager.java
+++ b/src/com/android/documentsui/DragAndDropManager.java
@@ -16,8 +16,8 @@
package com.android.documentsui;
-import android.annotation.IntDef;
-import android.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.content.ClipData;
import android.content.Context;
import android.graphics.drawable.Drawable;
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index 5190c480e..2c268d98f 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.Activity;
import androidx.annotation.ColorRes;
import androidx.legacy.app.ActionBarDrawerToggle;
diff --git a/src/com/android/documentsui/FileTypeMap.java b/src/com/android/documentsui/FileTypeMap.java
index d4969be24..2fe4be553 100644
--- a/src/com/android/documentsui/FileTypeMap.java
+++ b/src/com/android/documentsui/FileTypeMap.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.res.Resources;
import android.text.TextUtils;
diff --git a/src/com/android/documentsui/FocusManager.java b/src/com/android/documentsui/FocusManager.java
index 22b18e522..1fa42e450 100644
--- a/src/com/android/documentsui/FocusManager.java
+++ b/src/com/android/documentsui/FocusManager.java
@@ -20,8 +20,8 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
import static com.android.internal.util.Preconditions.checkNotNull;
-import android.annotation.ColorRes;
-import android.annotation.Nullable;
+import androidx.annotation.ColorRes;
+import androidx.annotation.Nullable;
import android.database.Cursor;
import android.os.Handler;
import android.os.Looper;
diff --git a/src/com/android/documentsui/Injector.java b/src/com/android/documentsui/Injector.java
index e6ad544ee..ea4dd90a7 100644
--- a/src/com/android/documentsui/Injector.java
+++ b/src/com/android/documentsui/Injector.java
@@ -36,7 +36,7 @@ import com.android.documentsui.selection.ContentLock;
import com.android.documentsui.selection.SelectionHelper;
import com.android.documentsui.ui.DialogController;
import com.android.documentsui.ui.MessageBuilder;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/src/com/android/documentsui/ItemDragListener.java b/src/com/android/documentsui/ItemDragListener.java
index 78d2a3d2a..530b55099 100644
--- a/src/com/android/documentsui/ItemDragListener.java
+++ b/src/com/android/documentsui/ItemDragListener.java
@@ -24,7 +24,7 @@ import android.view.View;
import android.view.View.OnDragListener;
import com.android.documentsui.ItemDragListener.DragHost;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import java.util.Timer;
import java.util.TimerTask;
diff --git a/src/com/android/documentsui/LoadDocStackTask.java b/src/com/android/documentsui/LoadDocStackTask.java
index af106937c..404bb1bf9 100644
--- a/src/com/android/documentsui/LoadDocStackTask.java
+++ b/src/com/android/documentsui/LoadDocStackTask.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.net.Uri;
import android.provider.DocumentsContract;
diff --git a/src/com/android/documentsui/MenuManager.java b/src/com/android/documentsui/MenuManager.java
index cdb90025d..7a5b08802 100644
--- a/src/com/android/documentsui/MenuManager.java
+++ b/src/com/android/documentsui/MenuManager.java
@@ -30,7 +30,7 @@ import com.android.documentsui.base.State;
import com.android.documentsui.dirlist.DirectoryFragment;
import com.android.documentsui.queries.SearchViewManager;
import com.android.documentsui.sidebar.RootsFragment;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import java.util.List;
import java.util.function.IntFunction;
diff --git a/src/com/android/documentsui/Metrics.java b/src/com/android/documentsui/Metrics.java
index 6821eb024..838ebf8b7 100644
--- a/src/com/android/documentsui/Metrics.java
+++ b/src/com/android/documentsui/Metrics.java
@@ -19,8 +19,8 @@ package com.android.documentsui;
import static com.android.documentsui.DocumentsApplication.acquireUnstableProviderOrThrow;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.IntDef;
-import android.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.content.ContentProviderClient;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/documentsui/Model.java b/src/com/android/documentsui/Model.java
index 88aeb9235..96dfc5dec 100644
--- a/src/com/android/documentsui/Model.java
+++ b/src/com/android/documentsui/Model.java
@@ -20,7 +20,7 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
import static com.android.documentsui.base.SharedMinimal.VERBOSE;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.AuthenticationRequiredException;
import android.database.Cursor;
import android.database.MergeCursor;
diff --git a/src/com/android/documentsui/NavigationViewManager.java b/src/com/android/documentsui/NavigationViewManager.java
index fdaba38d9..2012415a9 100644
--- a/src/com/android/documentsui/NavigationViewManager.java
+++ b/src/com/android/documentsui/NavigationViewManager.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import static com.android.documentsui.base.SharedMinimal.VERBOSE;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.graphics.drawable.Drawable;
import android.util.Log;
import android.view.View;
diff --git a/src/com/android/documentsui/OperationDialogFragment.java b/src/com/android/documentsui/OperationDialogFragment.java
index 2d8de8d02..7fd31636e 100644
--- a/src/com/android/documentsui/OperationDialogFragment.java
+++ b/src/com/android/documentsui/OperationDialogFragment.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.FragmentManager;
diff --git a/src/com/android/documentsui/ProviderExecutor.java b/src/com/android/documentsui/ProviderExecutor.java
index 8145edc4d..e12183218 100644
--- a/src/com/android/documentsui/ProviderExecutor.java
+++ b/src/com/android/documentsui/ProviderExecutor.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import android.os.AsyncTask;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
diff --git a/src/com/android/documentsui/RecentsLoader.java b/src/com/android/documentsui/RecentsLoader.java
index bb0115d3f..28b5fa589 100644
--- a/src/com/android/documentsui/RecentsLoader.java
+++ b/src/com/android/documentsui/RecentsLoader.java
@@ -41,7 +41,7 @@ import com.android.documentsui.base.RootInfo;
import com.android.documentsui.base.State;
import com.android.documentsui.roots.ProvidersAccess;
import com.android.documentsui.roots.RootCursorWrapper;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import com.google.common.util.concurrent.AbstractFuture;
diff --git a/src/com/android/documentsui/RefreshTask.java b/src/com/android/documentsui/RefreshTask.java
index 5e0a1a190..b7483956f 100644
--- a/src/com/android/documentsui/RefreshTask.java
+++ b/src/com/android/documentsui/RefreshTask.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
diff --git a/src/com/android/documentsui/ScopedAccessActivity.java b/src/com/android/documentsui/ScopedAccessActivity.java
index 971228f27..cc2225350 100644
--- a/src/com/android/documentsui/ScopedAccessActivity.java
+++ b/src/com/android/documentsui/ScopedAccessActivity.java
@@ -39,8 +39,7 @@ import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.PERMISS
import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.getScopedAccessPermissionStatus;
import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.setScopedAccessPermissionStatus;
-import android.annotation.Nullable;
-import android.annotation.SuppressLint;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.AlertDialog;
@@ -331,7 +330,6 @@ public class ScopedAccessActivity extends Activity {
}
};
- @SuppressLint("InflateParams")
// It's ok pass null ViewRoot on AlertDialogs.
final View view = View.inflate(mActivity, R.layout.dialog_open_scoped_directory, null);
final CharSequence message;
diff --git a/src/com/android/documentsui/ScopedAccessMetrics.java b/src/com/android/documentsui/ScopedAccessMetrics.java
index ec23e59bf..1d94269d6 100644
--- a/src/com/android/documentsui/ScopedAccessMetrics.java
+++ b/src/com/android/documentsui/ScopedAccessMetrics.java
@@ -21,8 +21,8 @@ import static android.os.Environment.STANDARD_DIRECTORIES;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
import static com.android.documentsui.base.SharedMinimal.DIRECTORY_ROOT;
-import android.annotation.IntDef;
-import android.annotation.StringDef;
+import androidx.annotation.IntDef;
+import androidx.annotation.StringDef;
import android.app.Activity;
import android.content.Context;
import android.util.Log;
diff --git a/src/com/android/documentsui/ScopedAccessProvider.java b/src/com/android/documentsui/ScopedAccessProvider.java
index e98375e6c..e1209111c 100644
--- a/src/com/android/documentsui/ScopedAccessProvider.java
+++ b/src/com/android/documentsui/ScopedAccessProvider.java
@@ -40,7 +40,7 @@ import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.getAllP
import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.setScopedAccessPermissionStatus;
import static com.android.internal.util.Preconditions.checkArgument;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.ActivityManager;
import android.app.GrantedUriPermission;
import android.content.ContentProvider;
diff --git a/src/com/android/documentsui/ShortcutsUpdater.java b/src/com/android/documentsui/ShortcutsUpdater.java
index 5fcdf2765..c4269f37b 100644
--- a/src/com/android/documentsui/ShortcutsUpdater.java
+++ b/src/com/android/documentsui/ShortcutsUpdater.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui;
-import android.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ShortcutInfo;
diff --git a/src/com/android/documentsui/ThumbnailCache.java b/src/com/android/documentsui/ThumbnailCache.java
index cfa53579d..580fc8d84 100644
--- a/src/com/android/documentsui/ThumbnailCache.java
+++ b/src/com/android/documentsui/ThumbnailCache.java
@@ -16,8 +16,8 @@
package com.android.documentsui;
-import android.annotation.IntDef;
-import android.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.content.ComponentCallbacks2;
import android.graphics.Bitmap;
import android.graphics.Point;
diff --git a/src/com/android/documentsui/TimeoutTask.java b/src/com/android/documentsui/TimeoutTask.java
index 9e7bbb810..a290bce37 100644
--- a/src/com/android/documentsui/TimeoutTask.java
+++ b/src/com/android/documentsui/TimeoutTask.java
@@ -16,7 +16,7 @@
package com.android.documentsui;
-import android.annotation.CallSuper;
+import androidx.annotation.CallSuper;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.Looper;
diff --git a/src/com/android/documentsui/archives/Archive.java b/src/com/android/documentsui/archives/Archive.java
index 6bd198526..6031ebed8 100644
--- a/src/com/android/documentsui/archives/Archive.java
+++ b/src/com/android/documentsui/archives/Archive.java
@@ -35,7 +35,7 @@ import android.system.OsConstants;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import com.android.internal.util.Preconditions;
import java.io.Closeable;
diff --git a/src/com/android/documentsui/archives/ArchivesProvider.java b/src/com/android/documentsui/archives/ArchivesProvider.java
index 641126c40..de76da484 100644
--- a/src/com/android/documentsui/archives/ArchivesProvider.java
+++ b/src/com/android/documentsui/archives/ArchivesProvider.java
@@ -35,7 +35,7 @@ import androidx.annotation.Nullable;
import android.util.Log;
import com.android.documentsui.R;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import libcore.io.IoUtils;
diff --git a/src/com/android/documentsui/archives/Loader.java b/src/com/android/documentsui/archives/Loader.java
index ebf63ac18..0098ef401 100644
--- a/src/com/android/documentsui/archives/Loader.java
+++ b/src/com/android/documentsui/archives/Loader.java
@@ -16,7 +16,7 @@
package com.android.documentsui.archives;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import android.content.Context;
import android.net.Uri;
diff --git a/src/com/android/documentsui/archives/ReadableArchive.java b/src/com/android/documentsui/archives/ReadableArchive.java
index df32fae12..3427d7364 100644
--- a/src/com/android/documentsui/archives/ReadableArchive.java
+++ b/src/com/android/documentsui/archives/ReadableArchive.java
@@ -31,7 +31,7 @@ import androidx.annotation.Nullable;
import android.util.Log;
import android.util.jar.StrictJarFile;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import com.android.internal.util.Preconditions;
import libcore.io.IoUtils;
diff --git a/src/com/android/documentsui/archives/WriteableArchive.java b/src/com/android/documentsui/archives/WriteableArchive.java
index e2e3242cf..72a8249aa 100644
--- a/src/com/android/documentsui/archives/WriteableArchive.java
+++ b/src/com/android/documentsui/archives/WriteableArchive.java
@@ -26,7 +26,7 @@ import android.provider.DocumentsContract.Document;
import androidx.annotation.Nullable;
import android.util.Log;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import androidx.annotation.VisibleForTesting;
import libcore.io.IoUtils;
diff --git a/src/com/android/documentsui/base/ConfirmationCallback.java b/src/com/android/documentsui/base/ConfirmationCallback.java
index a6ddb5d5c..c46ee6ed5 100644
--- a/src/com/android/documentsui/base/ConfirmationCallback.java
+++ b/src/com/android/documentsui/base/ConfirmationCallback.java
@@ -16,7 +16,7 @@
package com.android.documentsui.base;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/src/com/android/documentsui/base/Features.java b/src/com/android/documentsui/base/Features.java
index 7714353f1..aacb34d00 100644
--- a/src/com/android/documentsui/base/Features.java
+++ b/src/com/android/documentsui/base/Features.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.base;
-import android.annotation.BoolRes;
+import androidx.annotation.BoolRes;
import android.content.Context;
import android.content.res.Resources;
import android.os.UserManager;
diff --git a/src/com/android/documentsui/base/MimeTypes.java b/src/com/android/documentsui/base/MimeTypes.java
index 44b61ca84..52818749f 100644
--- a/src/com/android/documentsui/base/MimeTypes.java
+++ b/src/com/android/documentsui/base/MimeTypes.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.base;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.provider.DocumentsContract.Document;
import java.util.List;
diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index 340d61459..a03f4d1bf 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -22,8 +22,8 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString;
import static com.android.documentsui.base.SharedMinimal.VERBOSE;
import static com.android.documentsui.base.Shared.compareToIgnoreCaseNullable;
-import android.annotation.IntDef;
-import android.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.content.Context;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
diff --git a/src/com/android/documentsui/base/Shared.java b/src/com/android/documentsui/base/Shared.java
index 638b5f438..cf5e8df6a 100644
--- a/src/com/android/documentsui/base/Shared.java
+++ b/src/com/android/documentsui/base/Shared.java
@@ -18,7 +18,7 @@ package com.android.documentsui.base;
import static com.android.documentsui.base.SharedMinimal.TAG;
-import android.annotation.PluralsRes;
+import androidx.annotation.PluralsRes;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ContentResolver;
diff --git a/src/com/android/documentsui/base/SharedMinimal.java b/src/com/android/documentsui/base/SharedMinimal.java
index 880ee499a..69bc333cd 100644
--- a/src/com/android/documentsui/base/SharedMinimal.java
+++ b/src/com/android/documentsui/base/SharedMinimal.java
@@ -22,7 +22,7 @@ import static com.android.documentsui.ScopedAccessMetrics.SCOPED_DIRECTORY_ACCES
import static com.android.documentsui.ScopedAccessMetrics.SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY;
import static com.android.documentsui.ScopedAccessMetrics.logInvalidScopedAccessRequest;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.ContentProviderClient;
import android.content.Context;
import android.net.Uri;
diff --git a/src/com/android/documentsui/base/State.java b/src/com/android/documentsui/base/State.java
index 13a28ef6e..b18ea6cdc 100644
--- a/src/com/android/documentsui/base/State.java
+++ b/src/com/android/documentsui/base/State.java
@@ -16,7 +16,7 @@
package com.android.documentsui.base;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.content.Intent;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/src/com/android/documentsui/dirlist/AnimationView.java b/src/com/android/documentsui/dirlist/AnimationView.java
index 7f75d3bda..fdeb6d4c1 100644
--- a/src/com/android/documentsui/dirlist/AnimationView.java
+++ b/src/com/android/documentsui/dirlist/AnimationView.java
@@ -16,7 +16,7 @@
package com.android.documentsui.dirlist;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.FragmentTransaction;
import android.content.Context;
import android.os.Bundle;
diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 529ac6131..54d8e43be 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -22,9 +22,9 @@ import static com.android.documentsui.base.SharedMinimal.VERBOSE;
import static com.android.documentsui.base.State.MODE_GRID;
import static com.android.documentsui.base.State.MODE_LIST;
-import android.annotation.DimenRes;
-import android.annotation.FractionRes;
-import android.annotation.IntDef;
+import androidx.annotation.DimenRes;
+import androidx.annotation.FractionRes;
+import androidx.annotation.IntDef;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.Fragment;
diff --git a/src/com/android/documentsui/dirlist/FocusHandler.java b/src/com/android/documentsui/dirlist/FocusHandler.java
index 23d53a9b1..03cf23380 100644
--- a/src/com/android/documentsui/dirlist/FocusHandler.java
+++ b/src/com/android/documentsui/dirlist/FocusHandler.java
@@ -16,7 +16,7 @@
package com.android.documentsui.dirlist;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.KeyEvent;
import android.view.View;
diff --git a/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
index f0866da13..3b9be2f8c 100644
--- a/src/com/android/documentsui/dirlist/GridDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
@@ -19,7 +19,7 @@ package com.android.documentsui.dirlist;
import static com.android.documentsui.base.DocumentInfo.getCursorLong;
import static com.android.documentsui.base.DocumentInfo.getCursorString;
-import android.annotation.ColorInt;
+import androidx.annotation.ColorInt;
import android.content.Context;
import android.database.Cursor;
import android.graphics.Rect;
diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
index f97410af1..0f9f87b54 100644
--- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
@@ -18,7 +18,7 @@ package com.android.documentsui.dirlist;
import static com.android.documentsui.base.DocumentInfo.getCursorString;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.Context;
import android.database.Cursor;
import android.graphics.Rect;
diff --git a/src/com/android/documentsui/dirlist/Message.java b/src/com/android/documentsui/dirlist/Message.java
index b81a72c90..8478f6803 100644
--- a/src/com/android/documentsui/dirlist/Message.java
+++ b/src/com/android/documentsui/dirlist/Message.java
@@ -16,7 +16,7 @@
package com.android.documentsui.dirlist;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.AuthenticationRequiredException;
import android.app.PendingIntent;
import android.graphics.drawable.Drawable;
diff --git a/src/com/android/documentsui/files/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java
index 6b5a0a2f1..775ec549e 100644
--- a/src/com/android/documentsui/files/ActionHandler.java
+++ b/src/com/android/documentsui/files/ActionHandler.java
@@ -69,7 +69,7 @@ import com.android.documentsui.services.FileOperation;
import com.android.documentsui.services.FileOperationService;
import com.android.documentsui.services.FileOperations;
import com.android.documentsui.ui.DialogController;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/documentsui/inspector/DebugView.java b/src/com/android/documentsui/inspector/DebugView.java
index 03427e593..b4c00bb82 100644
--- a/src/com/android/documentsui/inspector/DebugView.java
+++ b/src/com/android/documentsui/inspector/DebugView.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.res.Resources;
import android.os.AsyncTask;
diff --git a/src/com/android/documentsui/inspector/InspectorController.java b/src/com/android/documentsui/inspector/InspectorController.java
index fe0bac3e9..97e8642f6 100644
--- a/src/com/android/documentsui/inspector/InspectorController.java
+++ b/src/com/android/documentsui/inspector/InspectorController.java
@@ -17,7 +17,7 @@ package com.android.documentsui.inspector;
import static com.android.internal.util.Preconditions.checkArgument;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/documentsui/inspector/KeyValueRow.java b/src/com/android/documentsui/inspector/KeyValueRow.java
index b2aedbfd4..7fbd5a440 100644
--- a/src/com/android/documentsui/inspector/KeyValueRow.java
+++ b/src/com/android/documentsui/inspector/KeyValueRow.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Resources;
diff --git a/src/com/android/documentsui/inspector/TableView.java b/src/com/android/documentsui/inspector/TableView.java
index 191e89a17..194d46ab2 100644
--- a/src/com/android/documentsui/inspector/TableView.java
+++ b/src/com/android/documentsui/inspector/TableView.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.res.Resources;
import android.util.AttributeSet;
diff --git a/src/com/android/documentsui/inspector/actions/Action.java b/src/com/android/documentsui/inspector/actions/Action.java
index d90d6dc34..2d97c64e7 100644
--- a/src/com/android/documentsui/inspector/actions/Action.java
+++ b/src/com/android/documentsui/inspector/actions/Action.java
@@ -16,8 +16,8 @@
package com.android.documentsui.inspector.actions;
-import android.annotation.Nullable;
-import android.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
diff --git a/src/com/android/documentsui/inspector/actions/ActionView.java b/src/com/android/documentsui/inspector/actions/ActionView.java
index b519bccc2..398a6b654 100644
--- a/src/com/android/documentsui/inspector/actions/ActionView.java
+++ b/src/com/android/documentsui/inspector/actions/ActionView.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector.actions;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
diff --git a/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java b/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java
index f8f6aeb58..9a07465a7 100644
--- a/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java
+++ b/src/com/android/documentsui/inspector/actions/ClearDefaultAppAction.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector.actions;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
diff --git a/src/com/android/documentsui/picker/ActionHandler.java b/src/com/android/documentsui/picker/ActionHandler.java
index 4511fefba..f18a7fe6f 100644
--- a/src/com/android/documentsui/picker/ActionHandler.java
+++ b/src/com/android/documentsui/picker/ActionHandler.java
@@ -56,7 +56,7 @@ import com.android.documentsui.queries.SearchViewManager;
import com.android.documentsui.roots.ProvidersAccess;
import com.android.documentsui.selection.ItemDetailsLookup.ItemDetails;
import com.android.documentsui.services.FileOperationService;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import java.util.Arrays;
import java.util.concurrent.Executor;
diff --git a/src/com/android/documentsui/prefs/LocalPreferences.java b/src/com/android/documentsui/prefs/LocalPreferences.java
index 955b19da8..252ec1f13 100644
--- a/src/com/android/documentsui/prefs/LocalPreferences.java
+++ b/src/com/android/documentsui/prefs/LocalPreferences.java
@@ -18,7 +18,7 @@ package com.android.documentsui.prefs;
import static com.android.documentsui.base.State.MODE_UNKNOWN;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
diff --git a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
index 5da0e494d..2e9fda730 100644
--- a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
+++ b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
@@ -19,8 +19,8 @@ import static com.android.documentsui.base.SharedMinimal.DEBUG;
import static com.android.documentsui.base.SharedMinimal.DIRECTORY_ROOT;
import static com.android.internal.util.Preconditions.checkArgument;
-import android.annotation.IntDef;
-import android.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
diff --git a/src/com/android/documentsui/queries/SearchViewManager.java b/src/com/android/documentsui/queries/SearchViewManager.java
index fab5a933b..b01a600b0 100644
--- a/src/com/android/documentsui/queries/SearchViewManager.java
+++ b/src/com/android/documentsui/queries/SearchViewManager.java
@@ -18,7 +18,7 @@ package com.android.documentsui.queries;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -40,8 +40,8 @@ import com.android.documentsui.base.DocumentStack;
import com.android.documentsui.base.EventHandler;
import com.android.documentsui.base.RootInfo;
import com.android.documentsui.base.Shared;
-import com.android.internal.annotations.GuardedBy;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.VisibleForTesting;
import java.util.Timer;
import java.util.TimerTask;
diff --git a/src/com/android/documentsui/roots/GetRootDocumentTask.java b/src/com/android/documentsui/roots/GetRootDocumentTask.java
index 84b58122f..b835f714b 100644
--- a/src/com/android/documentsui/roots/GetRootDocumentTask.java
+++ b/src/com/android/documentsui/roots/GetRootDocumentTask.java
@@ -16,7 +16,7 @@
package com.android.documentsui.roots;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.util.Log;
diff --git a/src/com/android/documentsui/roots/ProvidersCache.java b/src/com/android/documentsui/roots/ProvidersCache.java
index 2be559d79..19c56e598 100644
--- a/src/com/android/documentsui/roots/ProvidersCache.java
+++ b/src/com/android/documentsui/roots/ProvidersCache.java
@@ -46,7 +46,7 @@ import com.android.documentsui.archives.ArchivesProvider;
import com.android.documentsui.base.Providers;
import com.android.documentsui.base.RootInfo;
import com.android.documentsui.base.State;
-import com.android.internal.annotations.GuardedBy;
+import androidx.annotation.GuardedBy;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
diff --git a/src/com/android/documentsui/selection/ContentLock.java b/src/com/android/documentsui/selection/ContentLock.java
index 796ef5f70..387e70ccc 100644
--- a/src/com/android/documentsui/selection/ContentLock.java
+++ b/src/com/android/documentsui/selection/ContentLock.java
@@ -19,8 +19,8 @@ import static androidx.core.util.Preconditions.checkState;
import static com.android.documentsui.selection.Shared.DEBUG;
import static com.android.documentsui.selection.Shared.TAG;
-import android.annotation.MainThread;
-import android.annotation.Nullable;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
import android.content.Loader;
import android.util.Log;
diff --git a/src/com/android/documentsui/selection/DefaultBandHost.java b/src/com/android/documentsui/selection/DefaultBandHost.java
index 64420b684..9d856cc75 100644
--- a/src/com/android/documentsui/selection/DefaultBandHost.java
+++ b/src/com/android/documentsui/selection/DefaultBandHost.java
@@ -17,7 +17,7 @@ package com.android.documentsui.selection;
import static com.android.internal.util.Preconditions.checkArgument;
-import android.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
diff --git a/src/com/android/documentsui/services/CopyJob.java b/src/com/android/documentsui/services/CopyJob.java
index 48a115e67..2953ea4c6 100644
--- a/src/com/android/documentsui/services/CopyJob.java
+++ b/src/com/android/documentsui/services/CopyJob.java
@@ -32,7 +32,7 @@ import static com.android.documentsui.services.FileOperationService.MESSAGE_FINI
import static com.android.documentsui.services.FileOperationService.MESSAGE_PROGRESS;
import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.app.Notification;
import android.app.Notification.Builder;
import android.app.PendingIntent;
@@ -73,7 +73,7 @@ import com.android.documentsui.base.RootInfo;
import com.android.documentsui.clipping.UrisSupplier;
import com.android.documentsui.roots.ProvidersCache;
import com.android.documentsui.services.FileOperationService.OpType;
-import com.android.internal.annotations.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
import libcore.io.IoUtils;
diff --git a/src/com/android/documentsui/services/FileOperationService.java b/src/com/android/documentsui/services/FileOperationService.java
index 0f0f58527..88b47f5cd 100644
--- a/src/com/android/documentsui/services/FileOperationService.java
+++ b/src/com/android/documentsui/services/FileOperationService.java
@@ -18,7 +18,7 @@ package com.android.documentsui.services;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
diff --git a/src/com/android/documentsui/services/FileOperations.java b/src/com/android/documentsui/services/FileOperations.java
index babb26b0d..edb6d3757 100644
--- a/src/com/android/documentsui/services/FileOperations.java
+++ b/src/com/android/documentsui/services/FileOperations.java
@@ -22,7 +22,7 @@ import static com.android.documentsui.services.FileOperationService.EXTRA_CANCEL
import static com.android.documentsui.services.FileOperationService.EXTRA_JOB_ID;
import static com.android.documentsui.services.FileOperationService.EXTRA_OPERATION;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/documentsui/services/Job.java b/src/com/android/documentsui/services/Job.java
index 7524de191..c05bbbd87 100644
--- a/src/com/android/documentsui/services/Job.java
+++ b/src/com/android/documentsui/services/Job.java
@@ -25,9 +25,9 @@ import static com.android.documentsui.services.FileOperationService.EXTRA_JOB_ID
import static com.android.documentsui.services.FileOperationService.EXTRA_OPERATION_TYPE;
import static com.android.documentsui.services.FileOperationService.OPERATION_UNKNOWN;
-import android.annotation.DrawableRes;
-import android.annotation.IntDef;
-import android.annotation.PluralsRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.PluralsRes;
import android.app.Notification;
import android.app.Notification.Builder;
import android.app.PendingIntent;
diff --git a/src/com/android/documentsui/sidebar/Item.java b/src/com/android/documentsui/sidebar/Item.java
index fd32a2758..09026777c 100644
--- a/src/com/android/documentsui/sidebar/Item.java
+++ b/src/com/android/documentsui/sidebar/Item.java
@@ -16,7 +16,7 @@
package com.android.documentsui.sidebar;
-import android.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
import android.view.DragEvent;
import android.view.LayoutInflater;
import android.view.Menu;
diff --git a/src/com/android/documentsui/sidebar/RootItem.java b/src/com/android/documentsui/sidebar/RootItem.java
index 4e278697d..b9d83d50d 100644
--- a/src/com/android/documentsui/sidebar/RootItem.java
+++ b/src/com/android/documentsui/sidebar/RootItem.java
@@ -16,7 +16,7 @@
package com.android.documentsui.sidebar;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.Context;
import android.provider.DocumentsProvider;
import android.text.TextUtils;
diff --git a/src/com/android/documentsui/sidebar/RootsFragment.java b/src/com/android/documentsui/sidebar/RootsFragment.java
index 1b5f68973..a7f0ed09a 100644
--- a/src/com/android/documentsui/sidebar/RootsFragment.java
+++ b/src/com/android/documentsui/sidebar/RootsFragment.java
@@ -19,7 +19,7 @@ package com.android.documentsui.sidebar;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
import static com.android.documentsui.base.SharedMinimal.VERBOSE;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
diff --git a/src/com/android/documentsui/sorting/DropdownSortWidgetController.java b/src/com/android/documentsui/sorting/DropdownSortWidgetController.java
index 489e18452..d61421961 100644
--- a/src/com/android/documentsui/sorting/DropdownSortWidgetController.java
+++ b/src/com/android/documentsui/sorting/DropdownSortWidgetController.java
@@ -16,7 +16,7 @@
package com.android.documentsui.sorting;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/src/com/android/documentsui/sorting/HeaderCell.java b/src/com/android/documentsui/sorting/HeaderCell.java
index fa0f5c7c5..43e254e39 100644
--- a/src/com/android/documentsui/sorting/HeaderCell.java
+++ b/src/com/android/documentsui/sorting/HeaderCell.java
@@ -19,8 +19,8 @@ package com.android.documentsui.sorting;
import android.animation.AnimatorInflater;
import android.animation.LayoutTransition;
import android.animation.ObjectAnimator;
-import android.annotation.AnimatorRes;
-import android.annotation.StringRes;
+import androidx.annotation.AnimatorRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.util.AttributeSet;
import android.view.Gravity;
diff --git a/src/com/android/documentsui/sorting/SortController.java b/src/com/android/documentsui/sorting/SortController.java
index 1425e50d5..0084bffda 100644
--- a/src/com/android/documentsui/sorting/SortController.java
+++ b/src/com/android/documentsui/sorting/SortController.java
@@ -16,7 +16,7 @@
package com.android.documentsui.sorting;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.view.View;
diff --git a/src/com/android/documentsui/sorting/SortDimension.java b/src/com/android/documentsui/sorting/SortDimension.java
index 0dc55801b..e2c863cc0 100644
--- a/src/com/android/documentsui/sorting/SortDimension.java
+++ b/src/com/android/documentsui/sorting/SortDimension.java
@@ -16,7 +16,7 @@
package com.android.documentsui.sorting;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.StringRes;
diff --git a/src/com/android/documentsui/sorting/SortModel.java b/src/com/android/documentsui/sorting/SortModel.java
index 3e18169b9..48084ece4 100644
--- a/src/com/android/documentsui/sorting/SortModel.java
+++ b/src/com/android/documentsui/sorting/SortModel.java
@@ -18,8 +18,8 @@ package com.android.documentsui.sorting;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import android.annotation.IntDef;
-import android.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.content.ContentResolver;
import android.database.Cursor;
import android.os.Bundle;
diff --git a/src/com/android/documentsui/ui/DocumentDebugInfo.java b/src/com/android/documentsui/ui/DocumentDebugInfo.java
index 80dc8c96b..b7712c60a 100644
--- a/src/com/android/documentsui/ui/DocumentDebugInfo.java
+++ b/src/com/android/documentsui/ui/DocumentDebugInfo.java
@@ -16,7 +16,7 @@
package com.android.documentsui.ui;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.TextView;
diff --git a/src/com/android/documentsui/ui/MessageBuilder.java b/src/com/android/documentsui/ui/MessageBuilder.java
index 4a4af2977..179b73d06 100644
--- a/src/com/android/documentsui/ui/MessageBuilder.java
+++ b/src/com/android/documentsui/ui/MessageBuilder.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.ui;
-import android.annotation.PluralsRes;
+import androidx.annotation.PluralsRes;
import android.content.Context;
import android.text.BidiFormatter;
import android.net.Uri;
diff --git a/src/com/android/documentsui/ui/Snackbars.java b/src/com/android/documentsui/ui/Snackbars.java
index 933af971b..005e3ef32 100644
--- a/src/com/android/documentsui/ui/Snackbars.java
+++ b/src/com/android/documentsui/ui/Snackbars.java
@@ -16,7 +16,7 @@
package com.android.documentsui.ui;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.app.Activity;
import android.support.design.widget.Snackbar;
import android.view.Gravity;
diff --git a/tests/common/com/android/documentsui/TestActivity.java b/tests/common/com/android/documentsui/TestActivity.java
index 13abf1e55..3cdf78913 100644
--- a/tests/common/com/android/documentsui/TestActivity.java
+++ b/tests/common/com/android/documentsui/TestActivity.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import static junit.framework.Assert.assertEquals;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.LoaderManager;
diff --git a/tests/common/com/android/documentsui/testing/TestDragAndDropManager.java b/tests/common/com/android/documentsui/testing/TestDragAndDropManager.java
index ddd5c1347..95f416508 100644
--- a/tests/common/com/android/documentsui/testing/TestDragAndDropManager.java
+++ b/tests/common/com/android/documentsui/testing/TestDragAndDropManager.java
@@ -16,7 +16,7 @@
package com.android.documentsui.testing;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.content.ClipData;
import android.net.Uri;
import android.util.Pair;
diff --git a/tests/common/com/android/documentsui/testing/TestEvents.java b/tests/common/com/android/documentsui/testing/TestEvents.java
index 9aab9e80c..798120c73 100644
--- a/tests/common/com/android/documentsui/testing/TestEvents.java
+++ b/tests/common/com/android/documentsui/testing/TestEvents.java
@@ -16,7 +16,7 @@
package com.android.documentsui.testing;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.graphics.Point;
import android.view.KeyEvent;
import android.view.MotionEvent;
diff --git a/tests/common/com/android/documentsui/testing/TestFeatures.java b/tests/common/com/android/documentsui/testing/TestFeatures.java
index 39f88a0c2..5facc0782 100644
--- a/tests/common/com/android/documentsui/testing/TestFeatures.java
+++ b/tests/common/com/android/documentsui/testing/TestFeatures.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.testing;
-import android.annotation.BoolRes;
+import androidx.annotation.BoolRes;
import com.android.documentsui.base.Features;
diff --git a/tests/common/com/android/documentsui/testing/TestMenuInflater.java b/tests/common/com/android/documentsui/testing/TestMenuInflater.java
index 9b660a5ba..1b8f09371 100644
--- a/tests/common/com/android/documentsui/testing/TestMenuInflater.java
+++ b/tests/common/com/android/documentsui/testing/TestMenuInflater.java
@@ -16,7 +16,7 @@
package com.android.documentsui.testing;
-import android.annotation.MenuRes;
+import androidx.annotation.MenuRes;
import android.support.test.InstrumentationRegistry;
import android.view.Menu;
import android.view.MenuInflater;
diff --git a/tests/common/com/android/documentsui/testing/TestMenuItem.java b/tests/common/com/android/documentsui/testing/TestMenuItem.java
index 9f4df2872..a0562db05 100644
--- a/tests/common/com/android/documentsui/testing/TestMenuItem.java
+++ b/tests/common/com/android/documentsui/testing/TestMenuItem.java
@@ -19,7 +19,7 @@ package com.android.documentsui.testing;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.view.MenuItem;
import android.view.View;
diff --git a/tests/common/com/android/documentsui/testing/TestPackageManager.java b/tests/common/com/android/documentsui/testing/TestPackageManager.java
index e0b27a247..a923011e7 100644
--- a/tests/common/com/android/documentsui/testing/TestPackageManager.java
+++ b/tests/common/com/android/documentsui/testing/TestPackageManager.java
@@ -16,7 +16,6 @@
package com.android.documentsui.testing;
-import android.annotation.UserIdInt;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
@@ -93,7 +92,7 @@ public abstract class TestPackageManager extends PackageManager {
}
public final ResolveInfo resolveActivityAsUser(
- Intent intent, int flags, @UserIdInt int userId) {
+ Intent intent, int flags, int userId) {
return resolveActivity(intent, flags);
}
diff --git a/tests/common/com/android/documentsui/testing/TestResources.java b/tests/common/com/android/documentsui/testing/TestResources.java
index 0bd21de27..2230581f8 100644
--- a/tests/common/com/android/documentsui/testing/TestResources.java
+++ b/tests/common/com/android/documentsui/testing/TestResources.java
@@ -16,10 +16,10 @@
package com.android.documentsui.testing;
-import android.annotation.BoolRes;
-import android.annotation.NonNull;
-import android.annotation.PluralsRes;
-import android.annotation.StringRes;
+import androidx.annotation.BoolRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.PluralsRes;
+import androidx.annotation.StringRes;
import android.content.res.Resources;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
diff --git a/tests/unit/com/android/documentsui/FileTypeMapTest.java b/tests/unit/com/android/documentsui/FileTypeMapTest.java
index 6c8c4b139..f564c2372 100644
--- a/tests/unit/com/android/documentsui/FileTypeMapTest.java
+++ b/tests/unit/com/android/documentsui/FileTypeMapTest.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import static junit.framework.Assert.assertEquals;
-import android.annotation.StringRes;
+import androidx.annotation.StringRes;
import android.content.Context;
import android.content.res.Resources;
import android.support.test.InstrumentationRegistry;
diff --git a/tests/unit/com/android/documentsui/picker/TestActivity.java b/tests/unit/com/android/documentsui/picker/TestActivity.java
index 2a7b6be60..50942cc6e 100644
--- a/tests/unit/com/android/documentsui/picker/TestActivity.java
+++ b/tests/unit/com/android/documentsui/picker/TestActivity.java
@@ -16,7 +16,7 @@
package com.android.documentsui.picker;
-import android.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import android.content.Intent;
import android.util.Pair;
diff --git a/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java b/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java
index feffaec1a..850933e17 100644
--- a/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java
+++ b/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java
@@ -23,7 +23,7 @@ import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
-import android.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.os.Bundle;
import android.os.Handler;
diff --git a/tests/unit/com/android/documentsui/selection/testing/TestEvents.java b/tests/unit/com/android/documentsui/selection/testing/TestEvents.java
index c472adbc7..828704ffc 100644
--- a/tests/unit/com/android/documentsui/selection/testing/TestEvents.java
+++ b/tests/unit/com/android/documentsui/selection/testing/TestEvents.java
@@ -16,7 +16,7 @@
package com.android.documentsui.selection.testing;
-import android.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.graphics.Point;
import android.view.KeyEvent;
import android.view.MotionEvent;