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

Commit ae05f970 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev am: 773641f5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6570fc9f05fecc3ca529a06d5e28dadf63e0bdd9
parents c17829d6 773641f5

core/res/res/drawable-car/car_button_background.xml

+37 −13
Original line number Diff line number Diff line
@@ -13,24 +13,48 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
See the License for the specific language governing permissions and

limitations under the License.

-->

<!-- Default background styles for car buttons when enabled/disabled. -->

<ripple

    xmlns:android="http://schemas.android.com/apk/res/android"

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

    <item>

        <selector>

<!-- Default background styles for car buttons when enabled/disabled,

     focused/unfocused, and pressed/unpressed -->

<!-- TODO(b/175161842) Add rotary fill color -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_focused="true" android:state_enabled="false">

        <shape android:shape="rectangle">

            <corners android:radius="@*android:dimen/car_button_radius"/>

            <solid android:color="@*android:color/car_grey_300"/>

            <stroke android:width="8dp"

                    android:color="#0059B3"/>

        </shape>

    </item>

    <item android:state_focused="true" android:state_pressed="true">

        <shape android:shape="rectangle">

            <corners android:radius="@*android:dimen/car_button_radius"/>

            <solid android:color="?android:attr/colorButtonNormal"/>

            <stroke android:width="4dp"

                    android:color="#0059B3"/>

        </shape>

    </item>

    <item android:state_focused="true">

        <shape android:shape="rectangle">

            <corners android:radius="@*android:dimen/car_button_radius"/>

            <solid android:color="?android:attr/colorButtonNormal"/>

            <stroke android:width="8dp"

                    android:color="#0059B3"/>

        </shape>

    </item>

    <item android:state_enabled="false">

        <shape android:shape="rectangle">

            <corners android:radius="@*android:dimen/car_button_radius"/>

            <solid android:color="@*android:color/car_grey_300"/>

        </shape>

    </item>

    <item>

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

            <item>

                <shape android:shape="rectangle">

                    <corners android:radius="@*android:dimen/car_button_radius"/>

                    <solid android:color="?android:attr/colorButtonNormal"/>

                </shape>

            </item>

        </selector>

    </item>

        </ripple>

    </item>

</selector>