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

Commit 8a5499cf authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Add support RTL mode" into udc-qpr-dev am: 8a973ec6 am: da2e20dc 

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



Change-Id: Ida213a8f94c9913a556aecd7c65b20d248a84a94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bab86af da2e20dc

packages/SystemUI/res/drawable/media_output_icon_volume.xml

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

    android:tint="?attr/colorControlNormal"

    android:autoMirrored="true">

  <path

      android:fillColor="@color/media_dialog_item_main_content"

      android:pathData="M14,20.725V18.675Q16.25,18.025 17.625,16.175Q19,14.325 19,11.975Q19,9.625 17.625,7.775Q16.25,5.925 14,5.275V3.225Q17.1,3.925 19.05,6.362Q21,8.8 21,11.975Q21,15.15 19.05,17.587Q17.1,20.025 14,20.725ZM3,15V9H7L12,4V20L7,15ZM14,16V7.95Q15.125,8.475 15.812,9.575Q16.5,10.675 16.5,12Q16.5,13.325 15.812,14.4Q15.125,15.475 14,16ZM10,8.85 L7.85,11H5V13H7.85L10,15.15ZM7.5,12Z"/>

packages/SystemUI/res/drawable/media_output_title_icon_area.xml

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

       android:shape="rectangle">

    <corners

        android:bottomLeftRadius="28dp"

        android:topLeftRadius="28dp"

        android:bottomRightRadius="0dp"

        android:topRightRadius="0dp"/>

        android:bottomLeftRadius="@dimen/media_output_dialog_icon_left_radius"

        android:topLeftRadius="@dimen/media_output_dialog_icon_left_radius"

        android:bottomRightRadius="@dimen/media_output_dialog_icon_right_radius"

        android:topRightRadius="@dimen/media_output_dialog_icon_right_radius"/>

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/values-ldrtl/dimens.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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.

  -->

<resources>

    <dimen name="media_output_dialog_icon_left_radius">0dp</dimen>

    <dimen name="media_output_dialog_icon_right_radius">28dp</dimen>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,8 @@ 
    <dimen name="media_output_dialog_default_margin_end">16dp</dimen>

    <dimen name="media_output_dialog_selectable_margin_end">80dp</dimen>

    <dimen name="media_output_dialog_list_padding_top">8dp</dimen>

    <dimen name="media_output_dialog_icon_left_radius">28dp</dimen>

    <dimen name="media_output_dialog_icon_right_radius">0dp</dimen>



    <!-- Distance that the full shade transition takes in order to complete by tapping on a button

         like "expand". -->