From 39c6067b03b37af40c24445b82e2f2bff74fb427 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Tue, 1 Feb 2022 17:15:31 -0500 Subject: [PATCH] For #23350 - Revert changes from removing duplicate icons that already exists in ui-icons (#23527) * Revert "For #23121 - Override @color/mozac_ui_icons_fill with ?primaryText attribute" This reverts commit 12347c99999c340e7f7072ab2749cb13c5fd86c9. * Revert "For #23121 - Replace @drawble/ic_share with @drawable/mozac_ic_share" This reverts commit bbf6ce3f0c52e58493423ce2e2c62e3fb08f21b2. * Revert "For #23121 - Replace @drawble/ic_storage_enabled with @drawable/mozac_ic_storage" This reverts commit 930c7bf3b3076cf6b56be85fd733dd9f5cf2d1bb. * Revert "For #23121 - Replace @drawble/ic_notifications_enabled with @drawable/mozac_ic_notification" This reverts commit 9069b57c2440b517357a180e7c74b70ab86501a8. * Revert "For #23121 - Replace @drawble/ic_microphone_enabled with @drawable/mozac_ic_microphone" This reverts commit 53216f3f4a1fc6982aee8ab111cb6e92ef54f92a. * Revert "For #23121 - Replace @drawble/ic_location_enabled with @drawable/mozac_ic_location" This reverts commit 9ee9aafd879a884814f1d4b826db75f24ebdacec. * Revert "For #23121 - Replace @drawble/ic_autoplay_disabled with @drawable/mozac_ic_autoplay_blocked" This reverts commit b045a5e20317516bac422ed44549d5871a2cb96a. * Revert "For #23121 - Replace @drawble/ic_camera_enabled with @drawable/mozac_ic_video" This reverts commit 62842db131fee3aa0646c586f075f85105d32cb7. * Revert "For #23121 - Replace @drawble/mozac_ic_extensions_black with @drawable/mozac_ic_extensions" This reverts commit c020a9da10e6a49ce097b48fe2d40b7b21c578fe. * Revert "For #23121 - Replace @drawble/ic_top_sites with @drawable/mozac_ic_pin" This reverts commit ca67b0a752f9582a85ef5d22ff9cfba5f95fd1a0. * Revert "For #23121 - Replace @drawble/ic_search with @drawable/mozac_ic_search" This reverts commit 02d9197945ca9305cf3d2017954a48dd762a8a09. * Revert "For #23121 - Replace @drawble/ic_readermode with @drawable/mozac_ic_reader_mode" This reverts commit cf8592c709d26cf34a187175a2a0b4275a53a576. * Revert "For #23121 - Replace @drawble/ic_menu with @drawable/mozac_ic_menu" This reverts commit a1ac0190242ae416472442e3838318d210a6e419. * Revert "For #23121 - Replace @drawble/ic_login with @drawable/mozac_ic_login" This reverts commit 541c56b5894436c4384c7fdcb6ad3a57a566833a. * Revert "For #23121 - Replace @drawble/ic_internet with @drawable/mozac_ic_globe" This reverts commit 4d8adce85e07edce1969bd188698963c7452cac7. * Revert "For #23121 - Replace @drawble/ic_download with @drawable/mozac_ic_download" This reverts commit ef026d3ec290614053001a0709b800480ac59bf5. * Revert "For #23121 - Replace @drawble/ic_lock with @drawable/mozac_ic_lock" This reverts commit 18591d5dd848af6a11f1ebf4d37efc602a0f36e7. * Revert "For #23121 - Replace @drawble/ic_desktop with @drawable/mozac_ic_device_desktop" This reverts commit ad33e3c1e148bf20264a4cc08c524814da15409a. * Revert "For #23121 - Replace @drawble/ic_close with @drawable/mozac_ic_close" This reverts commit a9f0fefac21e63260a7e8547431a9a5af780faf1. * Revert "For #23121 - Replace @drawble/ic_delete with @drawable/mozac_ic_delete" This reverts commit 33dc752ef2864e8662eebe63756ea37360c4cf61. * Revert "For #23121 - Replace @drawble/ic_chevron_up with @drawable/mozac_ic_arrowhead_up" This reverts commit 5bf937cfd37e2fec2258d8e03e3f31d35952d9cc. * Revert "For #23121 - Replace @drawble/ic_chevron_down with @drawable/mozac_ic_arrowhead_down" This reverts commit 0fadd68112fc313f20be14c13ee75bb9ce67c472. * Revert "For #23121 - Replace @drawble/ic_back_button with @drawable/mozac_ic_back" This reverts commit bea766e7858e6a0bf38a8d1a74d79c8da68d204a. * Revert "For #23121 - Replace @drawable/ic_arrowhead_right with @drawable/mozac_ic_arrowhead_right" This reverts commit 5a6f349ea857cd2a5fdeb3b6001dcf52e8463025. * Revert "For #23121 - Replace @drawable/ic_new with @drawable/mozac_ic_new" This reverts commit ae38410106d7ed0eb65f3eda43ef45ecb7fecc73. * Revert "For #23121 - Replace @drawable/ic_addons_extensions with @drawable/mozac_ic_extensions" This reverts commit 9352946afce4d7be135bfe9b1ffc83895eb20b40. --- .../java/org/mozilla/fenix/HomeActivity.kt | 2 +- .../mozilla/fenix/browser/BrowserFragment.kt | 2 +- .../CollectionCreationBottomBarView.kt | 4 ++-- .../collections/CollectionsListAdapter.kt | 2 +- .../providers/MasterPasswordTipProvider.kt | 2 +- .../components/toolbar/DefaultToolbarMenu.kt | 14 +++++++------- .../fenix/customtabs/CustomTabToolbarMenu.kt | 2 +- .../ExceptionsListItemViewHolder.kt | 2 +- .../java/org/mozilla/fenix/ext/Fragment.kt | 2 +- .../java/org/mozilla/fenix/home/HomeMenu.kt | 6 +++--- .../sessioncontrol/SwipeToDeleteCallback.kt | 2 +- .../viewholders/TabInCollectionViewHolder.kt | 2 +- .../mozilla/fenix/library/LibraryPageView.kt | 2 +- .../viewholders/DownloadsListItemViewHolder.kt | 2 +- .../viewholders/HistoryListItemViewHolder.kt | 2 +- .../view/HistoryMetadataGroupItemViewHolder.kt | 2 +- .../RecentlyClosedItemViewHolder.kt | 2 +- .../fenix/search/awesomebar/AwesomeBarView.kt | 4 ++-- .../creditcards/CreditCardsSettingFragment.kt | 2 +- .../QuickSettingsFragmentState.kt | 2 +- .../tabstray/FloatingActionButtonBinding.kt | 4 ++-- .../fenix/tabstray/browser/TabsTouchHelper.kt | 2 +- .../main/res/drawable/ic_addons_extensions.xml | 13 +++++++++++++ .../main/res/drawable/ic_arrowhead_right.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_autoplay.xml | 2 +- .../main/res/drawable/ic_autoplay_disabled.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_back_button.xml | 14 ++++++++++++++ app/src/main/res/drawable/ic_camera.xml | 2 +- .../main/res/drawable/ic_camera_enabled.xml | 14 ++++++++++++++ app/src/main/res/drawable/ic_chevron.xml | 4 ++-- app/src/main/res/drawable/ic_chevron_down.xml | 12 ++++++++++++ app/src/main/res/drawable/ic_chevron_up.xml | 12 ++++++++++++ app/src/main/res/drawable/ic_close.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_delete.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_desktop.xml | 12 ++++++++++++ app/src/main/res/drawable/ic_download.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_internet.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_location.xml | 2 +- .../main/res/drawable/ic_location_enabled.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_lock.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_login.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_menu.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_microphone.xml | 2 +- .../res/drawable/ic_microphone_enabled.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_new.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_notifications.xml | 2 +- .../res/drawable/ic_notifications_enabled.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_readermode.xml | 16 ++++++++++++++++ app/src/main/res/drawable/ic_search.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_share.xml | 13 +++++++++++++ app/src/main/res/drawable/ic_storage.xml | 2 +- .../main/res/drawable/ic_storage_enabled.xml | 18 ++++++++++++++++++ app/src/main/res/drawable/ic_top_sites.xml | 13 +++++++++++++ .../res/drawable/mozac_ic_extensions_black.xml | 13 +++++++++++++ .../activity_privacy_content_display.xml | 2 +- app/src/main/res/layout/button_tip_item.xml | 2 +- .../res/layout/collection_home_list_row.xml | 4 ++-- .../layout/component_collection_creation.xml | 2 +- ...ent_collection_creation_name_collection.xml | 2 +- ...t_collection_creation_select_collection.xml | 2 +- .../main/res/layout/component_tabstray2.xml | 4 ++-- .../main/res/layout/component_tabstray_fab.xml | 2 +- .../layout/connection_details_website_info.xml | 2 +- .../main/res/layout/download_dialog_layout.xml | 2 +- app/src/main/res/layout/exception_item.xml | 2 +- .../res/layout/experiment_default_browser.xml | 4 ++-- .../main/res/layout/fragment_search_dialog.xml | 2 +- ...agment_site_permissions_exceptions_item.xml | 2 +- .../main/res/layout/inactive_header_item.xml | 2 +- .../res/layout/inactive_tabs_auto_close.xml | 2 +- .../main/res/layout/layout_add_credit_card.xml | 2 +- app/src/main/res/layout/layout_add_login.xml | 2 +- app/src/main/res/layout/library_site_item.xml | 2 +- .../main/res/layout/no_collections_message.xml | 2 +- .../layout/onboarding_inactive_tabs_cfr.xml | 2 +- .../res/layout/onboarding_jump_back_in_cfr.xml | 2 +- .../res/layout/overlay_add_on_progress.xml | 2 +- .../layout/preference_search_add_engine.xml | 2 +- .../quicksettings_tracking_protection.xml | 2 +- .../res/layout/quicksettings_website_info.xml | 2 +- .../res/layout/search_engine_radio_button.xml | 2 +- app/src/main/res/layout/share_close.xml | 2 +- .../layout/survey_inactive_tabs_disable.xml | 2 +- app/src/main/res/layout/tab_group_item.xml | 2 +- app/src/main/res/layout/tab_preview.xml | 2 +- app/src/main/res/layout/tab_tray_grid_item.xml | 2 +- app/src/main/res/layout/tab_tray_item.xml | 2 +- .../res/layout/tabstray_multiselect_items.xml | 4 ++-- ...acking_protection_learn_more_preference.xml | 2 +- app/src/main/res/menu/bookmarks_edit.xml | 2 +- app/src/main/res/menu/bookmarks_menu.xml | 2 +- .../main/res/menu/bookmarks_select_folder.xml | 2 +- .../main/res/menu/bookmarks_select_multi.xml | 2 +- app/src/main/res/menu/credit_card_editor.xml | 2 +- app/src/main/res/menu/history_menu.xml | 2 +- app/src/main/res/menu/history_select_multi.xml | 2 +- app/src/main/res/menu/languages_list.xml | 2 +- app/src/main/res/menu/library_menu.xml | 2 +- app/src/main/res/menu/login_list.xml | 2 +- app/src/main/res/menu/login_options_menu.xml | 2 +- app/src/main/res/values/colors.xml | 17 ++++++++--------- app/src/main/res/values/styles.xml | 2 +- app/src/main/res/xml/logins_preferences.xml | 2 +- ...missions_details_exceptions_preferences.xml | 8 ++++---- .../res/xml/site_permissions_preferences.xml | 10 +++++----- .../xml/tracking_protection_preferences.xml | 2 +- .../fenix/search/toolbar/ToolbarViewTest.kt | 2 +- .../FloatingActionButtonBindingTest.kt | 4 ++-- 108 files changed, 464 insertions(+), 115 deletions(-) create mode 100644 app/src/main/res/drawable/ic_addons_extensions.xml create mode 100644 app/src/main/res/drawable/ic_arrowhead_right.xml create mode 100644 app/src/main/res/drawable/ic_autoplay_disabled.xml create mode 100644 app/src/main/res/drawable/ic_back_button.xml create mode 100644 app/src/main/res/drawable/ic_camera_enabled.xml create mode 100644 app/src/main/res/drawable/ic_chevron_down.xml create mode 100644 app/src/main/res/drawable/ic_chevron_up.xml create mode 100644 app/src/main/res/drawable/ic_close.xml create mode 100644 app/src/main/res/drawable/ic_delete.xml create mode 100644 app/src/main/res/drawable/ic_desktop.xml create mode 100644 app/src/main/res/drawable/ic_download.xml create mode 100644 app/src/main/res/drawable/ic_internet.xml create mode 100644 app/src/main/res/drawable/ic_location_enabled.xml create mode 100644 app/src/main/res/drawable/ic_lock.xml create mode 100644 app/src/main/res/drawable/ic_login.xml create mode 100644 app/src/main/res/drawable/ic_menu.xml create mode 100644 app/src/main/res/drawable/ic_microphone_enabled.xml create mode 100644 app/src/main/res/drawable/ic_new.xml create mode 100644 app/src/main/res/drawable/ic_notifications_enabled.xml create mode 100644 app/src/main/res/drawable/ic_readermode.xml create mode 100644 app/src/main/res/drawable/ic_search.xml create mode 100644 app/src/main/res/drawable/ic_share.xml create mode 100644 app/src/main/res/drawable/ic_storage_enabled.xml create mode 100644 app/src/main/res/drawable/ic_top_sites.xml create mode 100644 app/src/main/res/drawable/mozac_ic_extensions_black.xml diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 7c8d152d5d..b19757dc6f 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -700,7 +700,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { setSupportActionBar(navigationToolbar) // Add ids to this that we don't want to have a toolbar back button setupNavigationToolbar() - setNavigationIcon(R.drawable.mozac_ic_back) + setNavigationIcon(R.drawable.ic_back_button) isToolbarInflated = true } diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index 546fc6f6e3..da88c59392 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -168,7 +168,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { BrowserToolbar.ToggleButton( image = AppCompatResources.getDrawable( context, - R.drawable.mozac_ic_reader_mode + R.drawable.ic_readermode )!!, imageSelected = AppCompatResources.getDrawable( diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt index d114d6ff6b..33370f09e8 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt @@ -39,7 +39,7 @@ class CollectionCreationBottomBarView( iconButton.apply { val drawable = context.getDrawableWithTint( - R.drawable.mozac_ic_close, + R.drawable.ic_close, ContextCompat.getColor(context, R.color.photonWhite) ) setImageDrawable(drawable) @@ -84,7 +84,7 @@ class CollectionCreationBottomBarView( iconButton.apply { val drawable = context.getDrawableWithTint( - R.drawable.mozac_ic_new, + R.drawable.ic_new, ContextCompat.getColor(context, R.color.photonWhite) ) setImageDrawable(drawable) diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt index 68575e5882..71ede56dfa 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt @@ -49,7 +49,7 @@ class CollectionsListAdapter( holder.textView.putCompoundDrawablesRelativeWithIntrinsicBounds( start = AppCompatResources.getDrawable( holder.textView.context, - R.drawable.mozac_ic_new + R.drawable.ic_new ) ) } else { diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt index 8831346527..cfa54b7af0 100644 --- a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt @@ -68,7 +68,7 @@ class MasterPasswordTipProvider( title = context.getString(R.string.mp_homescreen_tip_title), description = context.getString(R.string.mp_homescreen_tip_message), learnMoreURL = null, - titleDrawable = AppCompatResources.getDrawable(context, R.drawable.mozac_ic_login) + titleDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_login) ) private fun showMasterPasswordMigration() { diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 74ce88b612..5d9949aa47 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -84,7 +84,7 @@ open class DefaultToolbarMenu( store = store, style = WebExtensionBrowserMenuBuilder.Style( webExtIconTintColorResource = primaryTextColor(), - addonsManagerMenuItemDrawableRes = R.drawable.mozac_ic_extensions + addonsManagerMenuItemDrawableRes = R.drawable.ic_addons_extensions ), onAddonsManagerTapped = { onItemTapped.invoke(ToolbarMenu.Item.AddonsManager) @@ -143,7 +143,7 @@ open class DefaultToolbarMenu( } val share = BrowserMenuItemToolbar.Button( - imageResource = R.drawable.mozac_ic_share, + imageResource = R.drawable.ic_share, contentDescription = context.getString(R.string.browser_menu_share), iconTintColorResource = primaryTextColor(), listener = { @@ -196,7 +196,7 @@ open class DefaultToolbarMenu( val newTabItem = BrowserMenuImageText( context.getString(R.string.library_new_tab), - R.drawable.mozac_ic_new, + R.drawable.ic_new, primaryTextColor() ) { onItemTapped.invoke(ToolbarMenu.Item.NewTab) @@ -212,7 +212,7 @@ open class DefaultToolbarMenu( val downloadsItem = BrowserMenuImageText( context.getString(R.string.library_downloads), - R.drawable.mozac_ic_download, + R.drawable.ic_download, primaryTextColor() ) { onItemTapped.invoke(ToolbarMenu.Item.Downloads) @@ -231,7 +231,7 @@ open class DefaultToolbarMenu( } val desktopSiteItem = BrowserMenuImageSwitch( - imageResource = R.drawable.mozac_ic_device_desktop, + imageResource = R.drawable.ic_desktop, label = context.getString(R.string.browser_menu_desktop_site), initialState = { selectedSession?.content?.desktopMode ?: false @@ -278,8 +278,8 @@ open class DefaultToolbarMenu( val addRemoveTopSitesItem = TwoStateBrowserMenuImageText( primaryLabel = context.getString(R.string.browser_menu_add_to_top_sites), secondaryLabel = context.getString(R.string.browser_menu_remove_from_top_sites), - primaryStateIconResource = R.drawable.mozac_ic_pin, - secondaryStateIconResource = R.drawable.mozac_ic_pin, + primaryStateIconResource = R.drawable.ic_top_sites, + secondaryStateIconResource = R.drawable.ic_top_sites, iconTintColorResource = primaryTextColor(), isInPrimaryState = { !isCurrentUrlPinned }, isInSecondaryState = { isCurrentUrlPinned }, diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt index 2d7a84a064..fdf978ec16 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt @@ -133,7 +133,7 @@ class CustomTabToolbarMenu( } private val desktopMode = BrowserMenuImageSwitch( - imageResource = R.drawable.mozac_ic_device_desktop, + imageResource = R.drawable.ic_desktop, label = context.getString(R.string.browser_menu_desktop_site), initialState = { session?.content?.desktopMode ?: false } ) { checked -> diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt index 38907dc4a2..d403703e1a 100644 --- a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt @@ -25,7 +25,7 @@ class ExceptionsListItemViewHolder( init { view.setSecondaryButton( - icon = R.drawable.mozac_ic_close, + icon = R.drawable.ic_close, contentDescription = R.string.history_delete_item ) { interactor.onDeleteOne(item) diff --git a/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt b/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt index d9e519a9a0..8d0cf1eaa7 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt @@ -36,7 +36,7 @@ fun Fragment.getPreferenceKey(@StringRes resourceId: Int): String = getString(re */ fun Fragment.showToolbar(title: String) { (requireActivity() as AppCompatActivity).title = title - activity?.setNavigationIcon(R.drawable.mozac_ic_back) + activity?.setNavigationIcon(R.drawable.ic_back_button) (activity as NavHostActivity).getSupportActionBarAndInflateIfNecessary().show() } diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index 9a09de948f..24c9f8d1d2 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -102,7 +102,7 @@ class HomeMenu( } val desktopItem = BrowserMenuImageSwitch( - imageResource = R.drawable.mozac_ic_device_desktop, + imageResource = R.drawable.ic_desktop, label = context.getString(R.string.browser_menu_desktop_site), initialState = { context.settings().openNextTabInDesktopMode } ) { checked -> @@ -131,7 +131,7 @@ class HomeMenu( val downloadsItem = BrowserMenuImageText( context.getString(R.string.library_downloads), - R.drawable.mozac_ic_download, + R.drawable.ic_download, primaryTextColor ) { onItemTapped.invoke(Item.Downloads) @@ -139,7 +139,7 @@ class HomeMenu( val extensionsItem = BrowserMenuImageText( context.getString(R.string.browser_menu_add_ons), - R.drawable.mozac_ic_extensions, + R.drawable.ic_addons_extensions, primaryTextColor ) { onItemTapped.invoke(Item.Extensions) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt index bbb0f13a92..862e319841 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt @@ -44,7 +44,7 @@ class SwipeToDeleteCallback( isCurrentlyActive: Boolean ) { super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) - val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.mozac_ic_delete) + val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.ic_delete) icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive)) val backgroundDrawable = when { diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt index f51ac54fdb..dd59e02f40 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt @@ -51,7 +51,7 @@ class TabInCollectionViewHolder( } view.setSecondaryButton( - icon = R.drawable.mozac_ic_close, + icon = R.drawable.ic_close, contentDescription = R.string.remove_tab_from_collection ) { interactor.onCollectionRemoveTab(collection, tab, wasSwiped = false) diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt index 18f0ee2168..a9d8ece854 100644 --- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt +++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt @@ -43,7 +43,7 @@ open class LibraryPageView( activity?.title = title val toolbar = activity?.findViewById(R.id.navigationToolbar) toolbar?.setToolbarColors(foregroundColor, backgroundColor) - toolbar?.setNavigationIcon(R.drawable.mozac_ic_back) + toolbar?.setNavigationIcon(R.drawable.ic_back_button) toolbar?.navigationIcon?.setTint(foregroundColor) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt index cf23a13b32..eb272e05d0 100644 --- a/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt @@ -48,7 +48,7 @@ class DownloadsListItemViewHolder( librarySiteItemBinding.favicon.setImageResource(item.getIcon()) - librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.mozac_ic_delete) + librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.ic_delete) librarySiteItemBinding.overflowMenu.showAndEnable() diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt index 72062e2130..720c90d093 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt @@ -34,7 +34,7 @@ class HistoryListItemViewHolder( } binding.historyLayout.overflowView.apply { - setImageResource(R.drawable.mozac_ic_close) + setImageResource(R.drawable.ic_close) contentDescription = view.context.getString(R.string.history_delete_item) setOnClickListener { val item = item ?: return@setOnClickListener diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt index 8e33919060..e721a461bb 100644 --- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt @@ -29,7 +29,7 @@ class HistoryMetadataGroupItemViewHolder( init { binding.historyLayout.overflowView.apply { - setImageResource(R.drawable.mozac_ic_close) + setImageResource(R.drawable.ic_close) contentDescription = view.context.getString(R.string.history_delete_item) setOnClickListener { val item = item ?: return@setOnClickListener diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt index eca152ea6e..4d6e20deac 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt @@ -25,7 +25,7 @@ class RecentlyClosedItemViewHolder( init { binding.historyLayout.overflowView.apply { - setImageResource(R.drawable.mozac_ic_close) + setImageResource(R.drawable.ic_close) contentDescription = view.context.getString(R.string.history_delete_item) setOnClickListener { val item = item ?: return@setOnClickListener diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index d209661b44..55816fee4a 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -148,7 +148,7 @@ class AwesomeBarView( ) ) - val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply { + val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply { colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN) }.toBitmap() @@ -335,7 +335,7 @@ class AwesomeBarView( val components = activity.components val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText) - val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply { + val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply { colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN) }.toBitmap() diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt index 5d7016a38e..b74cbcf50e 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt @@ -157,7 +157,7 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() { manageSavedCardsPreference.title = getString(R.string.preferences_credit_cards_manage_saved_cards) } else { - manageSavedCardsPreference.setIcon(R.drawable.mozac_ic_new) + manageSavedCardsPreference.setIcon(R.drawable.ic_new) manageSavedCardsPreference.title = getString(R.string.preferences_credit_cards_add_credit_card) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt index 8c01b009a9..4b640f4f44 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt @@ -71,7 +71,7 @@ enum class WebsiteSecurityUiValues( ) { SECURE( R.string.quick_settings_sheet_secure_connection_2, - R.drawable.mozac_ic_lock + R.drawable.ic_lock ), INSECURE( R.string.quick_settings_sheet_insecure_connection_2, diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt index 3e49e87309..3d2b1796e3 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt @@ -44,7 +44,7 @@ class FloatingActionButtonBinding( shrink() show() contentDescription = context.getString(R.string.add_tab) - setIconResource(R.drawable.mozac_ic_new) + setIconResource(R.drawable.ic_new) setOnClickListener { browserTrayInteractor.onFabClicked(false) } @@ -56,7 +56,7 @@ class FloatingActionButtonBinding( extend() show() contentDescription = context.getString(R.string.add_private_tab) - setIconResource(R.drawable.mozac_ic_new) + setIconResource(R.drawable.ic_new) setOnClickListener { browserTrayInteractor.onFabClicked(true) } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt index c036a08fea..be67b9a990 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt @@ -84,7 +84,7 @@ class TouchCallback( } val icon = recyclerView.context.getDrawableWithTint( - R.drawable.mozac_ic_delete, + R.drawable.ic_delete, recyclerView.context.getColorFromAttr(R.attr.destructive) )!! val background = AppCompatResources.getDrawable( diff --git a/app/src/main/res/drawable/ic_addons_extensions.xml b/app/src/main/res/drawable/ic_addons_extensions.xml new file mode 100644 index 0000000000..efe803ba32 --- /dev/null +++ b/app/src/main/res/drawable/ic_addons_extensions.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_arrowhead_right.xml b/app/src/main/res/drawable/ic_arrowhead_right.xml new file mode 100644 index 0000000000..268da1cced --- /dev/null +++ b/app/src/main/res/drawable/ic_arrowhead_right.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/ic_autoplay.xml b/app/src/main/res/drawable/ic_autoplay.xml index 259436fb89..f3d5a487fc 100644 --- a/app/src/main/res/drawable/ic_autoplay.xml +++ b/app/src/main/res/drawable/ic_autoplay.xml @@ -10,6 +10,6 @@ android:state_enabled="true" /> + android:drawable="@drawable/ic_autoplay_disabled" /> diff --git a/app/src/main/res/drawable/ic_autoplay_disabled.xml b/app/src/main/res/drawable/ic_autoplay_disabled.xml new file mode 100644 index 0000000000..c5f4e048bd --- /dev/null +++ b/app/src/main/res/drawable/ic_autoplay_disabled.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_back_button.xml b/app/src/main/res/drawable/ic_back_button.xml new file mode 100644 index 0000000000..5194f6f762 --- /dev/null +++ b/app/src/main/res/drawable/ic_back_button.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 82c1e1934f..9c5bca788a 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,7 +5,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_chevron.xml b/app/src/main/res/drawable/ic_chevron.xml index edb0da3735..8ca3aae735 100644 --- a/app/src/main/res/drawable/ic_chevron.xml +++ b/app/src/main/res/drawable/ic_chevron.xml @@ -3,6 +3,6 @@ - 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/. --> - - + + diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml new file mode 100644 index 0000000000..6177fe8a10 --- /dev/null +++ b/app/src/main/res/drawable/ic_chevron_down.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml new file mode 100644 index 0000000000..60d8c82f8c --- /dev/null +++ b/app/src/main/res/drawable/ic_chevron_up.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000000..7b82c98466 --- /dev/null +++ b/app/src/main/res/drawable/ic_close.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 0000000000..016f2ad0b9 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_desktop.xml b/app/src/main/res/drawable/ic_desktop.xml new file mode 100644 index 0000000000..de303bb1e7 --- /dev/null +++ b/app/src/main/res/drawable/ic_desktop.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml new file mode 100644 index 0000000000..ecccd5dd15 --- /dev/null +++ b/app/src/main/res/drawable/ic_download.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml new file mode 100644 index 0000000000..f6276035e5 --- /dev/null +++ b/app/src/main/res/drawable/ic_internet.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index d86e8f1d31..13454f7f24 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -5,7 +5,7 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000000..8b2fe6870c --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml new file mode 100644 index 0000000000..a61455db09 --- /dev/null +++ b/app/src/main/res/drawable/ic_login.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml new file mode 100644 index 0000000000..126d113c3e --- /dev/null +++ b/app/src/main/res/drawable/ic_menu.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml index e8ae23dce1..69a5db52ea 100644 --- a/app/src/main/res/drawable/ic_microphone.xml +++ b/app/src/main/res/drawable/ic_microphone.xml @@ -5,7 +5,7 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml new file mode 100644 index 0000000000..ea1ea7ba16 --- /dev/null +++ b/app/src/main/res/drawable/ic_new.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml index aaa780b57e..813693ef54 100644 --- a/app/src/main/res/drawable/ic_notifications.xml +++ b/app/src/main/res/drawable/ic_notifications.xml @@ -5,7 +5,7 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_readermode.xml b/app/src/main/res/drawable/ic_readermode.xml new file mode 100644 index 0000000000..396e540727 --- /dev/null +++ b/app/src/main/res/drawable/ic_readermode.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 0000000000..dd401903ff --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml new file mode 100644 index 0000000000..c36e1839d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_share.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml index af586b40aa..2340546f0e 100644 --- a/app/src/main/res/drawable/ic_storage.xml +++ b/app/src/main/res/drawable/ic_storage.xml @@ -2,6 +2,6 @@ - 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/. --> - + diff --git a/app/src/main/res/drawable/ic_storage_enabled.xml b/app/src/main/res/drawable/ic_storage_enabled.xml new file mode 100644 index 0000000000..b5d2f7b4a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_storage_enabled.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_top_sites.xml b/app/src/main/res/drawable/ic_top_sites.xml new file mode 100644 index 0000000000..59a02d306c --- /dev/null +++ b/app/src/main/res/drawable/ic_top_sites.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/mozac_ic_extensions_black.xml b/app/src/main/res/drawable/mozac_ic_extensions_black.xml new file mode 100644 index 0000000000..9395d60404 --- /dev/null +++ b/app/src/main/res/drawable/mozac_ic_extensions_black.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml index 8d1fcd069c..cee2f04991 100644 --- a/app/src/main/res/layout/activity_privacy_content_display.xml +++ b/app/src/main/res/layout/activity_privacy_content_display.xml @@ -21,7 +21,7 @@ android:layout_marginLeft="10dp" android:background="@android:color/transparent" android:id="@+id/privacyContentCloseButton" - android:src="@drawable/mozac_ic_close" + android:src="@drawable/ic_close" android:contentDescription="@string/privacy_content_close_button_content_description" tools:ignore="AndroidSrcXmlDetector" /> diff --git a/app/src/main/res/layout/button_tip_item.xml b/app/src/main/res/layout/button_tip_item.xml index 2199f1fe22..5cd8d139a1 100644 --- a/app/src/main/res/layout/button_tip_item.xml +++ b/app/src/main/res/layout/button_tip_item.xml @@ -38,7 +38,7 @@ app:tint="@color/photonLightGrey05" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/ic_close" /> diff --git a/app/src/main/res/layout/connection_details_website_info.xml b/app/src/main/res/layout/connection_details_website_info.xml index 74dd38bc4a..b33f1eaa8a 100644 --- a/app/src/main/res/layout/connection_details_website_info.xml +++ b/app/src/main/res/layout/connection_details_website_info.xml @@ -43,7 +43,7 @@ android:scaleType="fitCenter" android:layout_marginStart="16dp" android:layout_gravity="center_vertical" - tools:drawable="@drawable/mozac_ic_globe" /> + tools:drawable="@drawable/ic_internet" /> + app:srcCompat="@drawable/ic_close" + tools:srcCompat="@drawable/ic_close" /> diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml index 43f606010d..476a6bcc3e 100644 --- a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml +++ b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml @@ -18,7 +18,7 @@ android:layout_height="24dp" android:importantForAccessibility="no" android:scaleType="fitCenter" - app:drawableStartCompat="@drawable/mozac_ic_globe"/> + app:drawableStartCompat="@drawable/ic_internet"/> + app:srcCompat="@drawable/ic_delete" /> \ No newline at end of file diff --git a/app/src/main/res/layout/inactive_tabs_auto_close.xml b/app/src/main/res/layout/inactive_tabs_auto_close.xml index 503074d96f..873597fe11 100644 --- a/app/src/main/res/layout/inactive_tabs_auto_close.xml +++ b/app/src/main/res/layout/inactive_tabs_auto_close.xml @@ -48,7 +48,7 @@ android:contentDescription="@string/tab_tray_inactive_auto_close_button_content_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/ic_close" /> diff --git a/app/src/main/res/layout/no_collections_message.xml b/app/src/main/res/layout/no_collections_message.xml index fca1f95bbd..f5eb978389 100644 --- a/app/src/main/res/layout/no_collections_message.xml +++ b/app/src/main/res/layout/no_collections_message.xml @@ -36,7 +36,7 @@ app:layout_constraintBottom_toBottomOf="@id/no_collections_header" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/no_collections_header" - app:srcCompat="@drawable/mozac_ic_close" /> + app:srcCompat="@drawable/ic_close" /> diff --git a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml index 37d9cb62c9..994dc2ca74 100644 --- a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml +++ b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml @@ -44,7 +44,7 @@ android:contentDescription="@string/content_description_close_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/mozac_ic_close" + app:srcCompat="@drawable/ic_close" app:tint="@color/fx_mobile_private_text_color_primary" /> diff --git a/app/src/main/res/layout/overlay_add_on_progress.xml b/app/src/main/res/layout/overlay_add_on_progress.xml index 77f682fbf2..7ee5ecd1b5 100644 --- a/app/src/main/res/layout/overlay_add_on_progress.xml +++ b/app/src/main/res/layout/overlay_add_on_progress.xml @@ -24,7 +24,7 @@ android:gravity="start|center_vertical" android:padding="16dp" android:text="@string/mozac_add_on_install_progress_caption" - app:drawableStartCompat="@drawable/mozac_ic_extensions" /> + app:drawableStartCompat="@drawable/mozac_ic_extensions_black" />