From fc84b34edff91524af63c82dcf8cc2e97ee76f75 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 17 Feb 2017 11:44:45 -0800 Subject: Removed all com.android.internal.* references in code. Moved reference to internal Android resource depedencies to drawable.xml. Bug: 34888290 Change-Id: I906e58579bab97438201bf8abab24f94e2640b2c --- res/drawable-hdpi/ic_grid_folder_alpha.png | Bin 865 -> 0 bytes res/drawable-mdpi/ic_grid_folder_alpha.png | Bin 638 -> 0 bytes res/drawable-xhdpi/ic_grid_folder_alpha.png | Bin 1066 -> 0 bytes res/drawable-xxhdpi/ic_grid_folder_alpha.png | Bin 962 -> 0 bytes res/drawable-xxxhdpi/ic_grid_folder_alpha.png | Bin 1320 -> 0 bytes res/drawable/ic_doc_audio.xml | 24 +++++++++++++++++++++ res/drawable/ic_doc_generic.xml | 24 +++++++++++++++++++++ res/drawable/ic_doc_image.xml | 24 +++++++++++++++++++++ res/drawable/ic_doc_video.xml | 24 +++++++++++++++++++++ res/drawable/ic_grid_folder.xml | 4 ---- res/values-v24/drawable.xml | 22 +++++++++++++++++++ res/values/drawables.xml | 4 ++++ src/com/android/documentsui/DropBadgeView.java | 2 +- src/com/android/documentsui/IconUtils.java | 8 +------ src/com/android/documentsui/base/RootInfo.java | 6 +++--- .../documentsui/dirlist/DirectoryFragment.java | 2 +- 16 files changed, 128 insertions(+), 16 deletions(-) delete mode 100644 res/drawable-hdpi/ic_grid_folder_alpha.png delete mode 100644 res/drawable-mdpi/ic_grid_folder_alpha.png delete mode 100644 res/drawable-xhdpi/ic_grid_folder_alpha.png delete mode 100644 res/drawable-xxhdpi/ic_grid_folder_alpha.png delete mode 100644 res/drawable-xxxhdpi/ic_grid_folder_alpha.png create mode 100644 res/drawable/ic_doc_audio.xml create mode 100644 res/drawable/ic_doc_generic.xml create mode 100644 res/drawable/ic_doc_image.xml create mode 100644 res/drawable/ic_doc_video.xml delete mode 100644 res/drawable/ic_grid_folder.xml create mode 100644 res/values-v24/drawable.xml diff --git a/res/drawable-hdpi/ic_grid_folder_alpha.png b/res/drawable-hdpi/ic_grid_folder_alpha.png deleted file mode 100644 index 874fde798..000000000 Binary files a/res/drawable-hdpi/ic_grid_folder_alpha.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_grid_folder_alpha.png b/res/drawable-mdpi/ic_grid_folder_alpha.png deleted file mode 100644 index 44e0e376e..000000000 Binary files a/res/drawable-mdpi/ic_grid_folder_alpha.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_grid_folder_alpha.png b/res/drawable-xhdpi/ic_grid_folder_alpha.png deleted file mode 100644 index 1a4e7c4d5..000000000 Binary files a/res/drawable-xhdpi/ic_grid_folder_alpha.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_grid_folder_alpha.png b/res/drawable-xxhdpi/ic_grid_folder_alpha.png deleted file mode 100644 index d7b2bfb3e..000000000 Binary files a/res/drawable-xxhdpi/ic_grid_folder_alpha.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_grid_folder_alpha.png b/res/drawable-xxxhdpi/ic_grid_folder_alpha.png deleted file mode 100644 index ca6be0e91..000000000 Binary files a/res/drawable-xxxhdpi/ic_grid_folder_alpha.png and /dev/null differ diff --git a/res/drawable/ic_doc_audio.xml b/res/drawable/ic_doc_audio.xml new file mode 100644 index 000000000..341a91942 --- /dev/null +++ b/res/drawable/ic_doc_audio.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_doc_generic.xml b/res/drawable/ic_doc_generic.xml new file mode 100644 index 000000000..a4fd77ae5 --- /dev/null +++ b/res/drawable/ic_doc_generic.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml new file mode 100644 index 000000000..126256365 --- /dev/null +++ b/res/drawable/ic_doc_image.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_doc_video.xml b/res/drawable/ic_doc_video.xml new file mode 100644 index 000000000..4944232e9 --- /dev/null +++ b/res/drawable/ic_doc_video.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_grid_folder.xml b/res/drawable/ic_grid_folder.xml deleted file mode 100644 index 0c8786929..000000000 --- a/res/drawable/ic_grid_folder.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/res/values-v24/drawable.xml b/res/values-v24/drawable.xml new file mode 100644 index 000000000..68ba75b3e --- /dev/null +++ b/res/values-v24/drawable.xml @@ -0,0 +1,22 @@ + + + + + @drawable/ic_doc_image + @drawable/ic_doc_video + @drawable/ic_doc_audio + @drawable/ic_doc_generic + diff --git a/res/values/drawables.xml b/res/values/drawables.xml index 2d2acbbc0..1ea830f17 100644 --- a/res/values/drawables.xml +++ b/res/values/drawables.xml @@ -18,4 +18,8 @@ @mipmap/ic_app_icon @mipmap/ic_app_icon @drawable/ic_doc_text + @*android:drawable/ic_doc_image + @*android:drawable/ic_doc_video + @*android:drawable/ic_doc_audio + @*android:drawable/ic_doc_generic diff --git a/src/com/android/documentsui/DropBadgeView.java b/src/com/android/documentsui/DropBadgeView.java index 6d18af0ab..4bf3f74c5 100644 --- a/src/com/android/documentsui/DropBadgeView.java +++ b/src/com/android/documentsui/DropBadgeView.java @@ -45,7 +45,7 @@ public final class DropBadgeView extends ImageView { 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 5a87f876b..7b6678d6b 100644 --- a/src/com/android/documentsui/IconUtils.java +++ b/src/com/android/documentsui/IconUtils.java @@ -23,8 +23,6 @@ import android.graphics.drawable.Drawable; 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 class IconUtils { 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 2d68161db..64677e596 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -220,13 +220,13 @@ public class RootInfo implements Durable, Parcelable, Comparable { 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 34e65c3fd..d032afbc2 100644 --- a/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -335,7 +335,7 @@ public class DirectoryFragment extends Fragment 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; -- cgit v1.2.3-59-g8ed1b