For #24082 - Use Icon Secondary for the tab tray globe thumbnail icon color

upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent 97ecf4e45e
commit 61ef3907a4

@ -103,7 +103,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:padding="22dp" android:padding="22dp"
app:srcCompat="@drawable/mozac_ic_globe" app:srcCompat="@drawable/mozac_ic_globe"
app:tint="?tabTrayThumbnailIcon" /> app:tint="?iconSecondary" />
<mozilla.components.browser.tabstray.thumbnail.TabThumbnailView <mozilla.components.browser.tabstray.thumbnail.TabThumbnailView
android:id="@+id/mozac_browser_tabstray_thumbnail" android:id="@+id/mozac_browser_tabstray_thumbnail"

@ -44,7 +44,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:padding="22dp" android:padding="22dp"
app:srcCompat="@drawable/mozac_ic_globe" app:srcCompat="@drawable/mozac_ic_globe"
app:tint="?tabTrayThumbnailIcon" /> app:tint="?iconSecondary" />
<mozilla.components.browser.tabstray.thumbnail.TabThumbnailView <mozilla.components.browser.tabstray.thumbnail.TabThumbnailView
android:id="@+id/mozac_browser_tabstray_thumbnail" android:id="@+id/mozac_browser_tabstray_thumbnail"

@ -84,7 +84,7 @@
<!-- Inactive tab --> <!-- Inactive tab -->
<color name="fx_mobile_icon_color_primary_inactive">@color/photonLightGrey05A60</color> <color name="fx_mobile_icon_color_primary_inactive">@color/photonLightGrey05A60</color>
<!-- Secondary icon --> <!-- Secondary icon -->
<color name="fx_mobile_icon_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color> <color name="fx_mobile_icon_color_secondary">@color/photonLightGrey40</color>
<!-- Active tab --> <!-- Active tab -->
<color name="fx_mobile_icon_color_active">@color/photonViolet40</color> <color name="fx_mobile_icon_color_active">@color/photonViolet40</color>
<!-- Disabled icon --> <!-- Disabled icon -->
@ -142,7 +142,6 @@
<!-- Tab tray --> <!-- Tab tray -->
<color name="tab_tray_item_background_normal_theme">@color/photonDarkGrey80</color> <color name="tab_tray_item_background_normal_theme">@color/photonDarkGrey80</color>
<color name="tab_tray_item_thumbnail_icon_normal_theme">@color/photonDarkGrey05</color>
<!-- Reader View colors --> <!-- Reader View colors -->
<color name="mozac_feature_readerview_text_color">@color/fx_mobile_text_color_primary</color> <color name="mozac_feature_readerview_text_color">@color/fx_mobile_text_color_primary</color>

@ -25,6 +25,8 @@
<attr name="textActionPrimary" format="reference" /> <attr name="textActionPrimary" format="reference" />
<!-- Icon --> <!-- Icon -->
<!-- Secondary icon -->
<attr name="iconSecondary" format="reference" />
<!-- Active tab --> <!-- Active tab -->
<attr name="iconActive" format="reference" /> <attr name="iconActive" format="reference" />
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
@ -76,9 +78,6 @@
<attr name="awesomeBarIndicatorColor" format="reference|color"/> <attr name="awesomeBarIndicatorColor" format="reference|color"/>
<attr name="awesomeBarIndicatorBookmarkColor" format="reference|color"/> <attr name="awesomeBarIndicatorBookmarkColor" format="reference|color"/>
<!-- Tab tray -->
<attr name="tabTrayThumbnailIcon" format="reference" />
<declare-styleable name="TrackingProtectionCategory"> <declare-styleable name="TrackingProtectionCategory">
<attr name="categoryItemTitle" format="reference" /> <attr name="categoryItemTitle" format="reference" />
<attr name="categoryItemDescription" format="reference" /> <attr name="categoryItemDescription" format="reference" />

@ -84,7 +84,7 @@
<!-- Inactive tab --> <!-- Inactive tab -->
<color name="fx_mobile_icon_color_primary_inactive">@color/photonDarkGrey90A60</color> <color name="fx_mobile_icon_color_primary_inactive">@color/photonDarkGrey90A60</color>
<!-- Secondary icon --> <!-- Secondary icon -->
<color name="fx_mobile_icon_color_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey05</color> <color name="fx_mobile_icon_color_secondary">@color/photonDarkGrey05</color>
<!-- Active tab --> <!-- Active tab -->
<color name="fx_mobile_icon_color_active">@color/photonInk20</color> <color name="fx_mobile_icon_color_active">@color/photonInk20</color>
<!-- Disabled icon --> <!-- Disabled icon -->
@ -209,7 +209,7 @@
<!-- Inactive tab --> <!-- Inactive tab -->
<color name="fx_mobile_private_icon_color_primary_inactive" tools:ignore="UnusedResources">@color/photonLightGrey05A60</color> <color name="fx_mobile_private_icon_color_primary_inactive" tools:ignore="UnusedResources">@color/photonLightGrey05A60</color>
<!-- Secondary icon --> <!-- Secondary icon -->
<color name="fx_mobile_private_icon_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color> <color name="fx_mobile_private_icon_color_secondary">@color/photonLightGrey40</color>
<!-- Active tab --> <!-- Active tab -->
<color name="fx_mobile_private_icon_color_active">@color/photonViolet40</color> <color name="fx_mobile_private_icon_color_active">@color/photonViolet40</color>
<!-- Disabled icon --> <!-- Disabled icon -->
@ -281,7 +281,6 @@
<!-- Tab tray --> <!-- Tab tray -->
<color name="tab_tray_item_background_normal_theme">@color/photonLightGrey10</color> <color name="tab_tray_item_background_normal_theme">@color/photonLightGrey10</color>
<color name="tab_tray_item_thumbnail_icon_normal_theme">@color/photonLightGrey60</color>
<!-- Bookmark buttons --> <!-- Bookmark buttons -->
<color name="bookmark_favicon_background">#DFDFE3</color> <color name="bookmark_favicon_background">#DFDFE3</color>

@ -53,6 +53,8 @@
<item name="textActionPrimary">@color/fx_mobile_text_color_action_primary</item> <item name="textActionPrimary">@color/fx_mobile_text_color_action_primary</item>
<!-- Icon --> <!-- Icon -->
<!-- Secondary icon -->
<item name="iconSecondary">@color/fx_mobile_icon_color_secondary</item>
<!-- Active tab --> <!-- Active tab -->
<item name="iconActive">@color/fx_mobile_icon_color_active</item> <item name="iconActive">@color/fx_mobile_icon_color_active</item>
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
@ -110,8 +112,6 @@
<item name="mozac_widget_favicon_background_color">@color/fx_mobile_layer_color_2</item> <item name="mozac_widget_favicon_background_color">@color/fx_mobile_layer_color_2</item>
<item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_primary</item> <item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_primary</item>
<item name="tabTrayThumbnailIcon">@color/tab_tray_item_thumbnail_icon_normal_theme</item>
<!-- Drawables --> <!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item> <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
<item name="homeBackground">@color/fx_mobile_layer_color_1</item> <item name="homeBackground">@color/fx_mobile_layer_color_1</item>
@ -246,6 +246,8 @@
<item name="textActionPrimary">@color/fx_mobile_private_text_color_action_primary</item> <item name="textActionPrimary">@color/fx_mobile_private_text_color_action_primary</item>
<!-- Icon --> <!-- Icon -->
<!-- Secondary icon -->
<item name="iconSecondary">@color/fx_mobile_private_icon_color_secondary</item>
<!-- Active tab --> <!-- Active tab -->
<item name="iconActive">@color/fx_mobile_private_icon_color_active</item> <item name="iconActive">@color/fx_mobile_private_icon_color_active</item>
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
@ -301,9 +303,6 @@
<item name="mozac_widget_favicon_background_color">@color/photonInk50</item> <item name="mozac_widget_favicon_background_color">@color/photonInk50</item>
<item name="mozac_widget_favicon_border_color">@color/photonInk50</item> <item name="mozac_widget_favicon_border_color">@color/photonInk50</item>
<!-- Tab Tray -->
<item name="tabTrayThumbnailIcon">@color/tab_tray_item_thumbnail_icon_normal_theme</item>
<!-- Drawables --> <!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_private</item> <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
<item name="homeBackground">@drawable/private_home_background_gradient</item> <item name="homeBackground">@drawable/private_home_background_gradient</item>

Loading…
Cancel
Save