diff --git a/lawnchair/res/drawable/ic_qsb_search.xml b/lawnchair/res/drawable/ic_qsb_search.xml new file mode 100644 index 0000000000..d836838238 --- /dev/null +++ b/lawnchair/res/drawable/ic_qsb_search.xml @@ -0,0 +1,25 @@ + + + + diff --git a/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt b/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt index 2888647b96..28481b220c 100644 --- a/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt +++ b/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt @@ -8,6 +8,7 @@ import android.widget.ImageButton import androidx.core.view.isVisible import com.android.launcher3.R import com.android.launcher3.qsb.QsbContainerView +import com.android.launcher3.util.Themes @SuppressLint("AppCompatCustomView") class AssistantIconView(context: Context, attrs: AttributeSet?) : ImageButton(context, attrs) { @@ -26,7 +27,13 @@ class AssistantIconView(context: Context, attrs: AttributeSet?) : ImageButton(co } } - fun setIcon() { - setImageResource(R.drawable.ic_mic_color) + fun setIcon(isGoogle: Boolean) { + clearColorFilter() + if (isGoogle) { + setImageResource(R.drawable.ic_mic_color) + } else { + setImageResource(R.drawable.ic_mic_flat) + setColorFilter(Themes.getColorAccent(context)) + } } } diff --git a/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt b/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt index 0492b3af7a..87b248b8f9 100644 --- a/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt +++ b/lawnchair/src/app/lawnchair/qsb/QsbLayout.kt @@ -13,6 +13,7 @@ import com.android.launcher3.BaseActivity import com.android.launcher3.DeviceProfile import com.android.launcher3.R import com.android.launcher3.qsb.QsbContainerView +import com.android.launcher3.util.Themes import com.android.launcher3.views.ActivityContext class QsbLayout(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) { @@ -24,7 +25,6 @@ class QsbLayout(context: Context, attrs: AttributeSet?) : FrameLayout(context, a override fun onFinishInflate() { super.onFinishInflate() assistantIcon = ViewCompat.requireViewById(this, R.id.mic_icon) - assistantIcon.setIcon() lensIcon = ViewCompat.requireViewById(this, R.id.lens_icon) val searchPackage = QsbContainerView.getSearchWidgetPackageName(context) @@ -34,8 +34,15 @@ class QsbLayout(context: Context, attrs: AttributeSet?) : FrameLayout(context, a .setPackage(searchPackage) context.startActivity(intent) } - if (searchPackage == GOOGLE_PACKAGE) { + + val isGoogle = searchPackage == GOOGLE_PACKAGE + assistantIcon.setIcon(isGoogle) + if (isGoogle) { setupLensIcon() + } else { + val gIcon = ViewCompat.requireViewById(this, R.id.g_icon) + gIcon.setImageResource(R.drawable.ic_qsb_search) + gIcon.setColorFilter(Themes.getColorAccent(context)) } } diff --git a/res/drawable/ic_mic_flat.xml b/res/drawable/ic_mic_flat.xml new file mode 100644 index 0000000000..371691bd2a --- /dev/null +++ b/res/drawable/ic_mic_flat.xml @@ -0,0 +1,12 @@ + + + +