Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa1e548b authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Make favorite star not clickable 

The clickable element to change favorite state is the whole tile.

Also, fix ripple rounded corners.

Test: manual
Fixes: 152932469

Change-Id: I4f018c96018684093af738a570733129f3b974f8
parent b69f2bc1

packages/SystemUI/res/drawable/control_background_ripple.xml

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
<ripple xmlns:android="http://schemas.android.com/apk/res/android"

        android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <color android:color="@android:color/white" />

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white" />

            <corners android:radius="@dimen/control_corner_radius" />

        </shape>

    </item>

    <item android:drawable="@drawable/control_background" />

</ripple>
 
 No newline at end of file

packages/SystemUI/res/layout/controls_base_item.xml

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="bottom|end"

        android:button="@drawable/controls_btn_star"

        android:background="@android:color/transparent"

        android:clickable="false"

        android:selectable="false"

        android:importantForAccessibility="no"

        android:layout_marginTop="4dp"

        android:layout_marginStart="4dp"

        app:layout_constraintStart_toEndOf="@id/subtitle"

packages/SystemUI/src/com/android/systemui/controls/management/ControlAdapter.kt

+2 −2
Original line number Diff line number Diff line
@@ -151,10 +151,10 @@ private class ControlHolder(view: View, val favoriteCallback: ModelFavoriteChang 
        subtitle.text = data.control.subtitle

        favorite.isChecked = data.favorite

        removed.text = if (data.removed) "Removed" else ""

        favorite.setOnClickListener {

        itemView.setOnClickListener {

            favorite.isChecked = !favorite.isChecked

            favoriteCallback(data.control.controlId, favorite.isChecked)

        }

        itemView.setOnClickListener { favorite.performClick() }

        applyRenderInfo(renderInfo)

    }