From 9777b8fad618201c8ecfac67451c97a63fb09d83 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Thu, 27 Aug 2020 18:26:35 -0700 Subject: [PATCH] =?UTF-8?q?FNX-14661=20=E2=81=83=20Delete=20drawables=20(#?= =?UTF-8?q?13481)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Delete unused drawabled Mostly leftovers from quick action bar * Remove duplicate drawables using tints --- .../customtabs/WebAppSiteControlsBuilder.kt | 2 +- .../session/PrivateNotificationService.kt | 2 +- .../main/res/drawable-v26/ic_menu_kebab.xml | 16 ---------- .../main/res/drawable/bookmark_two_state.xml | 11 ------- .../bookmarks_circle_background_filled.xml | 29 ----------------- .../bookmarks_circle_background_outline.xml | 29 ----------------- .../ic_collections_circle_background.xml | 32 ------------------- app/src/main/res/drawable/ic_library.xml | 13 -------- app/src/main/res/drawable/ic_link.xml | 2 +- .../main/res/drawable/ic_menu_tab_tray.xml | 13 -------- .../main/res/drawable/ic_pbm_notification.xml | 13 -------- .../res/drawable/ic_tab_circle_background.xml | 29 ----------------- .../drawable/ic_whats_new_notification.xml | 26 +++++++-------- ...brary_icon_app_links_circle_background.xml | 30 ----------------- ...brary_icon_downloads_circle_background.xml | 29 ----------------- ...library_icon_history_circle_background.xml | 29 ----------------- ...ary_icon_screenshots_circle_background.xml | 29 ----------------- .../res/drawable/mozac_ic_permissions.xml | 20 ------------ .../drawable/quick_action_icon_appearance.xml | 30 ----------------- .../res/drawable/quick_action_icon_read.xml | 29 ----------------- .../res/drawable/quick_action_icon_share.xml | 25 --------------- .../main/res/layout/component_tabstray.xml | 3 +- 22 files changed, 18 insertions(+), 423 deletions(-) delete mode 100644 app/src/main/res/drawable-v26/ic_menu_kebab.xml delete mode 100644 app/src/main/res/drawable/bookmark_two_state.xml delete mode 100644 app/src/main/res/drawable/bookmarks_circle_background_filled.xml delete mode 100644 app/src/main/res/drawable/bookmarks_circle_background_outline.xml delete mode 100644 app/src/main/res/drawable/ic_collections_circle_background.xml delete mode 100644 app/src/main/res/drawable/ic_library.xml delete mode 100644 app/src/main/res/drawable/ic_menu_tab_tray.xml delete mode 100644 app/src/main/res/drawable/ic_pbm_notification.xml delete mode 100644 app/src/main/res/drawable/ic_tab_circle_background.xml delete mode 100644 app/src/main/res/drawable/library_icon_app_links_circle_background.xml delete mode 100644 app/src/main/res/drawable/library_icon_downloads_circle_background.xml delete mode 100644 app/src/main/res/drawable/library_icon_history_circle_background.xml delete mode 100644 app/src/main/res/drawable/library_icon_screenshots_circle_background.xml delete mode 100644 app/src/main/res/drawable/mozac_ic_permissions.xml delete mode 100644 app/src/main/res/drawable/quick_action_icon_appearance.xml delete mode 100644 app/src/main/res/drawable/quick_action_icon_read.xml delete mode 100644 app/src/main/res/drawable/quick_action_icon_share.xml diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt b/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt index f6e6facf2..b0596654c 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/WebAppSiteControlsBuilder.kt @@ -30,7 +30,7 @@ class WebAppSiteControlsBuilder( if (!isPrivateSession) { return } - builder.setSmallIcon(R.drawable.ic_pbm_notification) + builder.setSmallIcon(R.drawable.ic_private_browsing) builder.setContentTitle(context.getString(R.string.pwa_site_controls_title_private, manifest.name)) } diff --git a/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt b/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt index d38101c76..b0728e67f 100644 --- a/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt +++ b/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt @@ -30,7 +30,7 @@ class PrivateNotificationService : AbstractPrivateNotificationService() { override val store: BrowserStore by lazy { components.core.store } override fun NotificationCompat.Builder.buildNotification() { - setSmallIcon(R.drawable.ic_pbm_notification) + setSmallIcon(R.drawable.ic_private_browsing) setContentTitle(getString(R.string.app_name_private_4, getString(R.string.app_name))) setContentText(getString(R.string.notification_pbm_delete_text_2)) color = ContextCompat.getColor(this@PrivateNotificationService, R.color.pbm_notification_color) diff --git a/app/src/main/res/drawable-v26/ic_menu_kebab.xml b/app/src/main/res/drawable-v26/ic_menu_kebab.xml deleted file mode 100644 index d1cc76820..000000000 --- a/app/src/main/res/drawable-v26/ic_menu_kebab.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/bookmark_two_state.xml b/app/src/main/res/drawable/bookmark_two_state.xml deleted file mode 100644 index 3b704a91e..000000000 --- a/app/src/main/res/drawable/bookmark_two_state.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/bookmarks_circle_background_filled.xml b/app/src/main/res/drawable/bookmarks_circle_background_filled.xml deleted file mode 100644 index a847916a2..000000000 --- a/app/src/main/res/drawable/bookmarks_circle_background_filled.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/bookmarks_circle_background_outline.xml b/app/src/main/res/drawable/bookmarks_circle_background_outline.xml deleted file mode 100644 index dbbbf8c30..000000000 --- a/app/src/main/res/drawable/bookmarks_circle_background_outline.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_collections_circle_background.xml b/app/src/main/res/drawable/ic_collections_circle_background.xml deleted file mode 100644 index 6b314cd82..000000000 --- a/app/src/main/res/drawable/ic_collections_circle_background.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml deleted file mode 100644 index a83b781a2..000000000 --- a/app/src/main/res/drawable/ic_library.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml index f5be9216d..87e43535b 100644 --- a/app/src/main/res/drawable/ic_link.xml +++ b/app/src/main/res/drawable/ic_link.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_menu_tab_tray.xml b/app/src/main/res/drawable/ic_menu_tab_tray.xml deleted file mode 100644 index b356d5ba4..000000000 --- a/app/src/main/res/drawable/ic_menu_tab_tray.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pbm_notification.xml b/app/src/main/res/drawable/ic_pbm_notification.xml deleted file mode 100644 index 802a5c0da..000000000 --- a/app/src/main/res/drawable/ic_pbm_notification.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_tab_circle_background.xml b/app/src/main/res/drawable/ic_tab_circle_background.xml deleted file mode 100644 index 6c1fcb08c..000000000 --- a/app/src/main/res/drawable/ic_tab_circle_background.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_whats_new_notification.xml b/app/src/main/res/drawable/ic_whats_new_notification.xml index d05fc67b0..363fc588d 100644 --- a/app/src/main/res/drawable/ic_whats_new_notification.xml +++ b/app/src/main/res/drawable/ic_whats_new_notification.xml @@ -3,17 +3,17 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - + + + - - - - - \ No newline at end of file + + + + + diff --git a/app/src/main/res/drawable/library_icon_app_links_circle_background.xml b/app/src/main/res/drawable/library_icon_app_links_circle_background.xml deleted file mode 100644 index fceb59797..000000000 --- a/app/src/main/res/drawable/library_icon_app_links_circle_background.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/library_icon_downloads_circle_background.xml b/app/src/main/res/drawable/library_icon_downloads_circle_background.xml deleted file mode 100644 index 6ca85d50b..000000000 --- a/app/src/main/res/drawable/library_icon_downloads_circle_background.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/library_icon_history_circle_background.xml b/app/src/main/res/drawable/library_icon_history_circle_background.xml deleted file mode 100644 index 714342ab0..000000000 --- a/app/src/main/res/drawable/library_icon_history_circle_background.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml b/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml deleted file mode 100644 index 47487182b..000000000 --- a/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/mozac_ic_permissions.xml b/app/src/main/res/drawable/mozac_ic_permissions.xml deleted file mode 100644 index 6817c3819..000000000 --- a/app/src/main/res/drawable/mozac_ic_permissions.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/quick_action_icon_appearance.xml b/app/src/main/res/drawable/quick_action_icon_appearance.xml deleted file mode 100644 index 783a50da8..000000000 --- a/app/src/main/res/drawable/quick_action_icon_appearance.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/quick_action_icon_read.xml b/app/src/main/res/drawable/quick_action_icon_read.xml deleted file mode 100644 index 831d1539a..000000000 --- a/app/src/main/res/drawable/quick_action_icon_read.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/quick_action_icon_share.xml b/app/src/main/res/drawable/quick_action_icon_share.xml deleted file mode 100644 index 9adf47ea6..000000000 --- a/app/src/main/res/drawable/quick_action_icon_share.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml index b90dcea71..ca2689b4a 100644 --- a/app/src/main/res/layout/component_tabstray.xml +++ b/app/src/main/res/layout/component_tabstray.xml @@ -149,10 +149,11 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/open_tabs_menu" android:visibility="visible" + app:tint="@color/accent_normal_theme" app:layout_constraintBottom_toBottomOf="@id/tab_layout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/tab_layout" - app:srcCompat="@drawable/ic_menu_tab_tray" /> + app:srcCompat="@drawable/ic_menu" />