fixup! SystemUI: Make round QS toggleable [1/3]
Change-Id: I178be3048f4717b43b28d1f040486d25a53abb21
diff --git a/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml b/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml
index 7af4a05..487082f 100644
--- a/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml
+++ b/packages/SystemUI/res/drawable/qs_tile_background_no_mask.xml
@@ -15,22 +15,7 @@
~ limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/qs_tile_ripple_color">
- <item android:id="@id/background">
- <layer-list>
- <item
- android:id="@+id/qs_tile_background_base"
- android:drawable="@drawable/qs_tile_background_shape" />
- <item android:id="@+id/qs_tile_background_overlay">
- <selector>
- <item
- android:state_hovered="true"
- android:drawable="@drawable/qs_tile_background_shape_round" />
- <item
- android:state_focused="true"
- android:drawable="@drawable/qs_tile_background_shape_round" />
- </selector>
- </item>
- </layer-list>
- </item>
+ android:color="?android:attr/colorControlHighlight">
+ <item android:id="@id/background"
+ android:drawable="@drawable/qs_tile_background_shape_round"/>
</ripple>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
index b92aec9..462e8a6 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
@@ -154,7 +154,7 @@
private lateinit var ripple: RippleDrawable
private lateinit var backgroundDrawable: LayerDrawable
private lateinit var backgroundBaseDrawable: Drawable
- private lateinit var backgroundOverlayDrawable: StateListDrawable
+ private lateinit var backgroundOverlayDrawable: Drawable
private var backgroundColor: Int = 0
private var backgroundOverlayColor: Int = 0
@@ -386,7 +386,7 @@
backgroundBaseDrawable =
backgroundDrawable.findDrawableByLayerId(R.id.qs_tile_background_base)
backgroundOverlayDrawable =
- backgroundDrawable.findDrawableByLayerId(R.id.qs_tile_background_overlay) as StateListDrawable
+ backgroundDrawable.findDrawableByLayerId(R.id.qs_tile_background_overlay)
backgroundOverlayDrawable.mutate().setTintMode(PorterDuff.Mode.SRC)
return ripple
}