mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-19 09:25:34 +00:00
[fenix] For https://github.com/mozilla-mobile/fenix/issues/23121 - Replace @drawble/ic_search with @drawable/mozac_ic_search
This commit is contained in:
parent
b0c75e83c3
commit
d84bdb1d93
@ -148,7 +148,7 @@ class AwesomeBarView(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
|
val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply {
|
||||||
colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
|
colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
|
||||||
}.toBitmap()
|
}.toBitmap()
|
||||||
|
|
||||||
@ -335,7 +335,7 @@ class AwesomeBarView(
|
|||||||
val components = activity.components
|
val components = activity.components
|
||||||
val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText)
|
val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText)
|
||||||
|
|
||||||
val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
|
val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply {
|
||||||
colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
|
colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
|
||||||
}.toBitmap()
|
}.toBitmap()
|
||||||
|
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
- 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/. -->
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="?primaryText"
|
|
||||||
android:pathData="M15.685,14.074C16.511,12.925 17,11.519 17,10C17,6.141 13.86,3 10,3C6.14,3 3,6.141 3,10C3,13.859 6.14,17 10,17C11.525,17 12.936,16.508 14.087,15.676L14.611,15.67L19.721,20.78C19.867,20.926 20.059,21 20.251,21C20.443,21 20.635,20.927 20.781,20.78C21.074,20.487 21.074,20.012 20.781,19.719L15.675,14.612L15.685,14.074ZM10,15.5C6.967,15.5 4.5,13.032 4.5,10C4.5,6.968 6.967,4.5 10,4.5C13.033,4.5 15.5,6.968 15.5,10C15.5,13.032 13.033,15.5 10,15.5Z" />
|
|
||||||
</vector>
|
|
@ -186,7 +186,7 @@
|
|||||||
style="@style/search_pill"
|
style="@style/search_pill"
|
||||||
android:textOff="@string/search_engine_button"
|
android:textOff="@string/search_engine_button"
|
||||||
android:textOn="@string/search_engine_button"
|
android:textOn="@string/search_engine_button"
|
||||||
app:drawableStartCompat="@drawable/ic_search"
|
app:drawableStartCompat="@drawable/mozac_ic_search"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/pill_wrapper"
|
app:layout_constraintBottom_toBottomOf="@id/pill_wrapper"
|
||||||
app:layout_constraintStart_toEndOf="@id/qr_scan_button"
|
app:layout_constraintStart_toEndOf="@id/qr_scan_button"
|
||||||
app:layout_constraintTop_toTopOf="@id/pill_wrapper" />
|
app:layout_constraintTop_toTopOf="@id/pill_wrapper" />
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:tint="@color/primary_text_normal_theme"
|
app:tint="@color/primary_text_normal_theme"
|
||||||
app:srcCompat="@drawable/ic_search" />
|
app:srcCompat="@drawable/mozac_ic_search" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tab_group_title"
|
android:id="@+id/tab_group_title"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/search"
|
android:id="@+id/search"
|
||||||
android:icon="@drawable/ic_search"
|
android:icon="@drawable/mozac_ic_search"
|
||||||
android:title="@string/locale_search_hint"
|
android:title="@string/locale_search_hint"
|
||||||
app:iconTint="?primaryText"
|
app:iconTint="?primaryText"
|
||||||
app:actionViewClass="androidx.appcompat.widget.SearchView"
|
app:actionViewClass="androidx.appcompat.widget.SearchView"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/search"
|
android:id="@+id/search"
|
||||||
android:icon="@drawable/ic_search"
|
android:icon="@drawable/mozac_ic_search"
|
||||||
android:title="@string/preferences_passwords_saved_logins_search"
|
android:title="@string/preferences_passwords_saved_logins_search"
|
||||||
app:actionViewClass="androidx.appcompat.widget.SearchView"
|
app:actionViewClass="androidx.appcompat.widget.SearchView"
|
||||||
app:iconTint="?primaryText"
|
app:iconTint="?primaryText"
|
||||||
|
@ -44,7 +44,7 @@ class ToolbarViewTest {
|
|||||||
searchEngineSource = SearchEngineSource.Default(
|
searchEngineSource = SearchEngineSource.Default(
|
||||||
mockk {
|
mockk {
|
||||||
every { name } returns "Search Engine"
|
every { name } returns "Search Engine"
|
||||||
every { icon } returns testContext.getDrawable(R.drawable.ic_search)!!.toBitmap()
|
every { icon } returns testContext.getDrawable(R.drawable.mozac_ic_search)!!.toBitmap()
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
defaultEngine = null,
|
defaultEngine = null,
|
||||||
|
Loading…
Reference in New Issue
Block a user