ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Closes #28205: fix ripple position over unified search icon

This commit is contained in:
mike a 2022-12-15 15:43:33 +09:00 committed by mergify[bot]
parent c9083280ea
commit 8d3a691d4e
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/mozilla/fenix/search/toolbar/SearchSelector.kt
View File

@ -8,7 +8,6 @@ import android.content.Context
import android.graphics.drawable.Drawable
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.ViewGroup
import android.widget.RelativeLayout
import org.mozilla.fenix.databinding.SearchSelectorBinding
@ -22,21 +21,9 @@ internal class SearchSelector @JvmOverloads constructor(
) : RelativeLayout(context, attrs, defStyle) {
private val binding = SearchSelectorBinding.inflate(LayoutInflater.from(context), this)
private var marginTop: Int = 0
override fun setLayoutParams(params: ViewGroup.LayoutParams?) {
if (params is MarginLayoutParams) {
params.topMargin = marginTop
}
super.setLayoutParams(params)
}
fun setIcon(icon: Drawable?, contentDescription: String?) {
binding.icon.setImageDrawable(icon)
binding.icon.contentDescription = contentDescription
}
fun setTopMargin(margin: Int) {
marginTop = margin
}
}

4
app/src/main/java/org/mozilla/fenix/search/toolbar/SearchSelectorToolbarAction.kt
View File

@ -55,7 +55,9 @@ class SearchSelectorToolbarAction(
menu.menuController.show(anchor = it, orientation = orientation, forceOrientation = true)
}
setTopMargin(resources.getDimensionPixelSize(R.dimen.search_engine_engine_icon_top_margin))
val topPadding = resources.getDimensionPixelSize(R.dimen.search_engine_engine_icon_top_margin)
setPadding(0, topPadding, 0, 0)
setBackgroundResource(
context.theme.resolveAttribute(android.R.attr.selectableItemBackgroundBorderless),
)