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

Commit 35cac157 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Output Switcher] Adjusts color, size and margin"

parents 2aae2899 7c9b6bd2

packages/SystemUI/res/drawable/media_output_dialog_button_background.xml

+16 −14
Original line number Diff line number Diff line
@@ -13,11 +13,12 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

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

       android:shape="rectangle">

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

       android:insetBottom="6dp"

       android:insetTop="6dp">

    <shape android:shape="rectangle">

        <stroke

        android:color="?androidprv:attr/colorAccentPrimaryVariant"

            android:color="@color/media_dialog_outlined_button"

            android:width="1dp"/>

        <corners android:radius="20dp"/>

        <padding
@@ -27,3 +28,4 @@ 
            android:bottom="8dp"/>

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

    </shape>

</inset>
 
 No newline at end of file

packages/SystemUI/res/drawable/media_output_dialog_solid_button_background.xml

+16 −14
Original line number Diff line number Diff line
@@ -13,9 +13,10 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

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

       android:shape="rectangle">

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

       android:insetBottom="6dp"

       android:insetTop="6dp">

    <shape android:shape="rectangle">

        <stroke

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

            android:width="1dp"/>
@@ -25,5 +26,6 @@ 
            android:right="@dimen/media_output_dialog_button_padding_horizontal"

            android:top="@dimen/media_output_dialog_button_padding_vertical"

            android:bottom="@dimen/media_output_dialog_button_padding_vertical"/>

    <solid android:color="?androidprv:attr/colorAccentPrimaryVariant" />

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

    </shape>

</inset>
 
 No newline at end of file

packages/SystemUI/res/drawable/media_output_item_background.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ 
  -->



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

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

       android:shape="rectangle">

    <corners

        android:radius="16dp"/>

    <solid android:color="?androidprv:attr/colorAccentSecondary" />

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/media_output_item_background_active.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ 
  -->



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

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

       android:shape="rectangle">

    <corners

        android:radius="50dp"/>

    <solid android:color="?androidprv:attr/colorAccentSecondary" />

        android:radius="28dp"/>

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/media_output_status_check.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,13 +15,12 @@ 
  -->



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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="?androidprv:attr/colorAccentPrimaryVariant"

        android:fillColor="@color/media_dialog_item_status"

        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>

</vector>