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

Commit 01426077 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Add rotary highlight to switches" into rvc-qpr-dev am: c28fb42e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c85c22df09b85c1c7a051fa750014354923ba7c
parents 03ced7e5 c28fb42e
Loading
Loading
Loading
Loading
+12 −9
Original line number Diff line number Diff line
@@ -14,12 +14,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
-->

<shape
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="oval">
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:gravity="center_vertical|fill_horizontal"
        android:top="@dimen/car_switch_thumb_margin_size"
        android:bottom="@dimen/car_switch_thumb_margin_size">
        <shape android:shape="oval">
            <solid android:color="@color/car_switch"/>
            <size
        android:width="@dimen/car_seekbar_thumb_size"
        android:height="@dimen/car_seekbar_thumb_size"/>
                android:width="@dimen/car_switch_thumb_size"
                android:height="@dimen/car_switch_thumb_size"/>
        </shape>
    </item>
</layer-list>
+53 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright 2020 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
  <item
    android:height="@dimen/car_touch_target_size_minus_one"
    android:width="@dimen/car_touch_target_size_minus_one"
    android:gravity="center">
    <selector>
      <item android:state_focused="true" android:state_pressed="true">
        <shape android:shape="oval">
          <solid android:color="#8A94CBFF"/>
          <stroke android:width="4dp"
              android:color="#94CBFF"/>
        </shape>
      </item>
      <item android:state_focused="true">
        <shape android:shape="oval">
          <solid android:color="#3D94CBFF"/>
          <stroke android:width="8dp"
              android:color="#94CBFF"/>
        </shape>
      </item>
    </selector>
  </item>
  <item android:gravity="center_vertical|fill_horizontal"
      android:left="@dimen/car_switch_track_margin_size"
      android:right="@dimen/car_switch_track_margin_size">
    <shape
        android:shape="rectangle"
        android:tint="@color/switch_track_material">
      <corners android:radius="7dp" />
      <solid android:color="@color/white_disabled_material" />
      <size android:height="14dp" />
      <padding
          android:right="@dimen/car_switch_track_margin_size"
          android:left="@dimen/car_switch_track_margin_size"/>
    </shape>
  </item>
</layer-list>
+8 −0
Original line number Diff line number Diff line
@@ -84,6 +84,14 @@
    <dimen name="car_button_radius">@dimen/car_radius_1</dimen>
    <dimen name="car_pill_button_size">56dp</dimen>
    <dimen name="car_touch_target_size">76dp</dimen>
    <dimen name="car_touch_target_size_minus_one">75dp</dimen>

    <!-- Switch. -->
    <!-- Thumb size + 2*thumb margin size must equal car_touch_target_size -->
    <!-- 2 * Thumb size + 2*track margin size must equal car_touch_target_size -->
    <dimen name="car_switch_thumb_size">24dp</dimen>
    <dimen name="car_switch_thumb_margin_size">26dp</dimen>
    <dimen name="car_switch_track_margin_size">14dp</dimen>

    <!-- Seekbar -->
    <dimen name="car_seekbar_height">6dp</dimen>