From 2dcf1fa54f71a6bb207600ab295b641334fbb9c3 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 09:47:22 +0530 Subject: [PATCH 01/13] setup ui-sdk for ions and test for one icon --- Android.mk | 3 ++- src/com/android/documentsui/base/RootInfo.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index a0b633adb..235890382 100644 --- a/Android.mk +++ b/Android.mk @@ -5,7 +5,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) - +LOCAL_STATIC_JAVA_LIBRARIES = org.lineageos.platform.sdk +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PACKAGE_NAME := DocumentsUI LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java index 340d61459..90b8a28ef 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable { if (isHome()) { derivedType = TYPE_LOCAL; - derivedIcon = R.drawable.ic_root_documents; + derivedIcon = lineageos.platform.R.drawable.ic_folder;//R.drawable.ic_root_documents; } else if (isMtp()) { derivedType = TYPE_MTP; derivedIcon = R.drawable.ic_usb_storage; -- GitLab From ff825148a273cc087dd72892b3f41f4deee0e46a Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 11:51:09 +0530 Subject: [PATCH 02/13] setup ui-sdk for ions and test for one icon --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 235890382..54dab1654 100644 --- a/Android.mk +++ b/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES = org.lineageos.platform.sdk +LOCAL_STATIC_JAVA_LIBRARIES := org.lineageos.platform.sdk LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PACKAGE_NAME := DocumentsUI LOCAL_PRIVATE_PLATFORM_APIS := true -- GitLab From 38429e7a64a94856ecf664d47d70aa7739ecafdf Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 12:17:17 +0530 Subject: [PATCH 03/13] setup ui-sdk for ions and test for one icon --- src/com/android/documentsui/base/RootInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java index 90b8a28ef..577bf6fa2 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable { if (isHome()) { derivedType = TYPE_LOCAL; - derivedIcon = lineageos.platform.R.drawable.ic_folder;//R.drawable.ic_root_documents; + derivedIcon = lineageos.platform.R.drawable.ic_album;//R.drawable.ic_root_documents; } else if (isMtp()) { derivedType = TYPE_MTP; derivedIcon = R.drawable.ic_usb_storage; -- GitLab From 738baf9c809d2d33c70bd08654cff3ccb91ce684 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 12:52:36 +0530 Subject: [PATCH 04/13] setup ui-sdk for ions and test for one icon --- Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 54dab1654..a0b633adb 100644 --- a/Android.mk +++ b/Android.mk @@ -5,8 +5,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := org.lineageos.platform.sdk -LOCAL_PRIVATE_PLATFORM_APIS := true + LOCAL_PACKAGE_NAME := DocumentsUI LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -- GitLab From 210f911699cda1839f20af44e36757ce4ee8be05 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 13:23:04 +0530 Subject: [PATCH 05/13] setup ui-sdk for ions and test for one icon --- Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index a0b633adb..78f554f0e 100644 --- a/Android.mk +++ b/Android.mk @@ -5,7 +5,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) - +LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PACKAGE_NAME := DocumentsUI LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -- GitLab From 6075b945e624f6f8074259be5c28e929e0f9deb5 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 14:00:54 +0530 Subject: [PATCH 06/13] add proguard flags --- proguard.flags | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proguard.flags b/proguard.flags index 0f33fb27d..bfcfed0fe 100644 --- a/proguard.flags +++ b/proguard.flags @@ -15,4 +15,5 @@ # Keep -keep public class android.support.v4.view.accessibility.AccessibilityNodeInfoCompat { public static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat obtain(); -} \ No newline at end of file +} +-dontwarn lineageos.** \ No newline at end of file -- GitLab From 635e1c59d68bc6c9ed807205b39b1c4ca6665c82 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 14:03:30 +0530 Subject: [PATCH 07/13] udate folder for testing --- src/com/android/documentsui/base/RootInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java index 577bf6fa2..90b8a28ef 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -202,7 +202,7 @@ public class RootInfo implements Durable, Parcelable, Comparable { if (isHome()) { derivedType = TYPE_LOCAL; - derivedIcon = lineageos.platform.R.drawable.ic_album;//R.drawable.ic_root_documents; + derivedIcon = lineageos.platform.R.drawable.ic_folder;//R.drawable.ic_root_documents; } else if (isMtp()) { derivedType = TYPE_MTP; derivedIcon = R.drawable.ic_usb_storage; -- GitLab From d6ae5d2b95a30f346320ae2b6f2bd5e3fd4f9196 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 14:06:31 +0530 Subject: [PATCH 08/13] bud fixed --- Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.mk b/Android.mk index 78f554f0e..8e00991d9 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk -LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PACKAGE_NAME := DocumentsUI LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -- GitLab From b2f6f690cc1cbb3524d361f001739c69afa1cbfb Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 23 Dec 2020 19:44:17 +0530 Subject: [PATCH 09/13] update icons --- src/com/android/documentsui/base/RootInfo.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/android/documentsui/base/RootInfo.java b/src/com/android/documentsui/base/RootInfo.java index 90b8a28ef..74b6c56e7 100644 --- a/src/com/android/documentsui/base/RootInfo.java +++ b/src/com/android/documentsui/base/RootInfo.java @@ -214,21 +214,22 @@ public class RootInfo implements Durable, Parcelable, Comparable { derivedIcon = R.drawable.ic_sd_storage; } else if (isExternalStorage()) { derivedType = TYPE_LOCAL; - derivedIcon = R.drawable.ic_root_smartphone; + derivedIcon = lineageos.platform.R.drawable.ic_device_phone; } else if (isDownloads()) { derivedType = TYPE_DOWNLOADS; - derivedIcon = R.drawable.ic_root_download; + derivedIcon = lineageos.platform.R.drawable.ic_downloads; } else if (isImages()) { derivedType = TYPE_IMAGES; - derivedIcon = R.drawable.image_root_icon; + derivedIcon = lineageos.platform.R.drawable.ic_album; } else if (isVideos()) { derivedType = TYPE_VIDEO; - derivedIcon = R.drawable.video_root_icon; + derivedIcon = lineageos.platform.R.drawable.ic_videos; } else if (isAudio()) { derivedType = TYPE_AUDIO; - derivedIcon = R.drawable.audio_root_icon; + derivedIcon = lineageos.platform.R.drawable.ic_audio; } else if (isRecents()) { derivedType = TYPE_RECENTS; + } else { derivedType = TYPE_OTHER; } -- GitLab From dd3f0652a43b352a5925978cf2c198a312df9c4a Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 24 Dec 2020 08:53:52 +0530 Subject: [PATCH 10/13] update image icon color --- res/drawable/ic_doc_image.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml index 126256365..0fb43d424 100644 --- a/res/drawable/ic_doc_image.xml +++ b/res/drawable/ic_doc_image.xml @@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="@color/color_default_blue1" + > -- GitLab From 97f5f83a4322073e3088d2cde5941beb59cfdfac Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 24 Dec 2020 09:10:30 +0530 Subject: [PATCH 11/13] update image icon color : bug fixed --- res/drawable/ic_doc_image.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml index 0fb43d424..13b0168a8 100644 --- a/res/drawable/ic_doc_image.xml +++ b/res/drawable/ic_doc_image.xml @@ -18,7 +18,7 @@ Copyright (C) 2017 The Android Open Source Project android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="@color/color_default_blue1" + android:tint="@color/accent" > Date: Thu, 24 Dec 2020 11:02:30 +0530 Subject: [PATCH 12/13] update icons color --- res/drawable/ic_doc_audio.xml | 4 +++- res/drawable/ic_doc_generic.xml | 4 +++- res/drawable/ic_doc_video.xml | 4 +++- res/values/drawables.xml | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/res/drawable/ic_doc_audio.xml b/res/drawable/ic_doc_audio.xml index 341a91942..c9dea4cfc 100644 --- a/res/drawable/ic_doc_audio.xml +++ b/res/drawable/ic_doc_audio.xml @@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="@color/accent" + > diff --git a/res/drawable/ic_doc_generic.xml b/res/drawable/ic_doc_generic.xml index a4fd77ae5..85f0ebc06 100644 --- a/res/drawable/ic_doc_generic.xml +++ b/res/drawable/ic_doc_generic.xml @@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="@color/accent" + > diff --git a/res/drawable/ic_doc_video.xml b/res/drawable/ic_doc_video.xml index 4944232e9..25f13f70e 100644 --- a/res/drawable/ic_doc_video.xml +++ b/res/drawable/ic_doc_video.xml @@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="@color/accent" + > diff --git a/res/values/drawables.xml b/res/values/drawables.xml index 3873eefec..d0e7db6d6 100644 --- a/res/values/drawables.xml +++ b/res/values/drawables.xml @@ -17,10 +17,10 @@ @mipmap/ic_launcher @mipmap/ic_launcher - @*android:drawable/ic_doc_image - @*android:drawable/ic_doc_video - @*android:drawable/ic_doc_audio - @*android:drawable/ic_doc_generic + @drawable/ic_doc_image + @drawable/ic_doc_video + @drawable/ic_doc_audio + @drawable/ic_doc_generic @*android:drawable/text_select_handle_left_mtrl_alpha @*android:drawable/text_select_handle_right_mtrl_alpha @*android:drawable/text_select_handle_middle_mtrl_alpha -- GitLab From ad698e2b4ce21806b16ba9a9b6554f5403f54365 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 24 Dec 2020 12:01:17 +0530 Subject: [PATCH 13/13] update icons color --- res/drawable/ic_doc_audio.xml | 2 +- res/drawable/ic_doc_folder.xml | 6 ++++-- res/drawable/ic_doc_generic.xml | 2 +- res/drawable/ic_doc_image.xml | 2 +- res/drawable/ic_doc_video.xml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/res/drawable/ic_doc_audio.xml b/res/drawable/ic_doc_audio.xml index c9dea4cfc..1de91bdf6 100644 --- a/res/drawable/ic_doc_audio.xml +++ b/res/drawable/ic_doc_audio.xml @@ -21,6 +21,6 @@ Copyright (C) 2017 The Android Open Source Project android:tint="@color/accent" > diff --git a/res/drawable/ic_doc_folder.xml b/res/drawable/ic_doc_folder.xml index dcbce0108..6b2c8782e 100644 --- a/res/drawable/ic_doc_folder.xml +++ b/res/drawable/ic_doc_folder.xml @@ -17,8 +17,10 @@ Copyright (C) 2015 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="@color/accent" + > diff --git a/res/drawable/ic_doc_generic.xml b/res/drawable/ic_doc_generic.xml index 85f0ebc06..b7ae5b5c0 100644 --- a/res/drawable/ic_doc_generic.xml +++ b/res/drawable/ic_doc_generic.xml @@ -21,6 +21,6 @@ Copyright (C) 2017 The Android Open Source Project android:tint="@color/accent" > diff --git a/res/drawable/ic_doc_image.xml b/res/drawable/ic_doc_image.xml index 13b0168a8..413d4c30b 100644 --- a/res/drawable/ic_doc_image.xml +++ b/res/drawable/ic_doc_image.xml @@ -21,6 +21,6 @@ Copyright (C) 2017 The Android Open Source Project android:tint="@color/accent" > diff --git a/res/drawable/ic_doc_video.xml b/res/drawable/ic_doc_video.xml index 25f13f70e..2753daf7d 100644 --- a/res/drawable/ic_doc_video.xml +++ b/res/drawable/ic_doc_video.xml @@ -21,6 +21,6 @@ Copyright (C) 2017 The Android Open Source Project android:tint="@color/accent" > -- GitLab