Removed all com.android.internal.* references in code.
Moved reference to internal Android resource depedencies to drawable.xml.
Bug: 34888290
Change-Id: I906e58579bab97438201bf8abab24f94e2640b2c
diff --git a/src/com/android/documentsui/DropBadgeView.java b/src/com/android/documentsui/DropBadgeView.java
index 6d18af0..4bf3f74 100644
--- a/src/com/android/documentsui/DropBadgeView.java
+++ b/src/com/android/documentsui/DropBadgeView.java
@@ -45,7 +45,7 @@
Drawable okBadge = context.getResources().getDrawable(R.drawable.drop_badge_states, null);
Drawable defaultIcon = context.getResources()
- .getDrawable(com.android.internal.R.drawable.ic_doc_generic, null);
+ .getDrawable(R.drawable.ic_doc_generic, null);
Drawable[] list = {defaultIcon, okBadge};
mBackground = new LayerDrawable(list);
diff --git a/src/com/android/documentsui/IconUtils.java b/src/com/android/documentsui/IconUtils.java
index 5a87f87..7b6678d 100644
--- a/src/com/android/documentsui/IconUtils.java
+++ b/src/com/android/documentsui/IconUtils.java
@@ -23,8 +23,6 @@
import android.provider.DocumentsContract.Document;
import android.util.TypedValue;
-import com.android.documentsui.base.State;
-
public class IconUtils {
public static Drawable loadPackageIcon(Context context, String authority, int icon) {
if (icon != 0) {
@@ -44,11 +42,7 @@
public static Drawable loadMimeIcon(
Context context, String mimeType, String authority, String docId, int mode) {
if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- if (mode == State.MODE_GRID) {
- return context.getDrawable(R.drawable.ic_grid_folder);
- } else {
- return context.getDrawable(com.android.internal.R.drawable.ic_doc_folder);
- }
+ return context.getDrawable(R.drawable.ic_doc_folder);
}
return loadMimeIcon(context, mimeType);
diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java
index 2d68161..64677e5 100644
--- a/src/com/android/documentsui/base/RootInfo.java
+++ b/src/com/android/documentsui/base/RootInfo.java
@@ -220,13 +220,13 @@
derivedIcon = R.drawable.ic_root_download;
} else if (isImages()) {
derivedType = TYPE_IMAGES;
- derivedIcon = com.android.internal.R.drawable.ic_doc_image;
+ derivedIcon = R.drawable.image_root_icon;
} else if (isVideos()) {
derivedType = TYPE_VIDEO;
- derivedIcon = com.android.internal.R.drawable.ic_doc_video;
+ derivedIcon = R.drawable.video_root_icon;
} else if (isAudio()) {
derivedType = TYPE_AUDIO;
- derivedIcon = com.android.internal.R.drawable.ic_doc_audio;
+ derivedIcon = R.drawable.audio_root_icon;
} else if (isRecents()) {
derivedType = TYPE_RECENTS;
} else {
diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 34e65c3..d032afb 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -335,7 +335,7 @@
mState,
this::getModelId,
mRecView::findChildViewUnder,
- getContext().getDrawable(com.android.internal.R.drawable.ic_doc_generic),
+ getContext().getDrawable(R.drawable.ic_doc_generic),
mActivity.getShadowBuilder())
: DragStartListener.DUMMY;