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

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

Merge "Fixes issues with multiple ringer rows (which also addresses a few... 

Merge "Fixes issues with multiple ringer rows (which also addresses a few RTL/landscape issues)." into sc-dev am: b3ca17a2

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

Change-Id: Ifde40b91f0870d862a2f513e44a31ae30c0974ae
parents 155db02e b3ca17a2

packages/SystemUI/res/drawable/volume_background_bottom.xml

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

<!--

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

  -->

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

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

    <size android:width="@dimen/volume_dialog_panel_width" />

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

    <corners android:bottomLeftRadius="@dimen/volume_dialog_panel_width_half"

        android:bottomRightRadius="@dimen/volume_dialog_panel_width_half"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_background.xml→packages/SystemUI/res/drawable/volume_background_top.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
        <shape>

            <size android:width="@dimen/volume_dialog_panel_width" />

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

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

            <corners android:topLeftRadius="@dimen/volume_dialog_panel_width_half"

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

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_background_top_rounded.xml

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

<!--

  ~ Copyright (C) 2021 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"

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

    <item>

        <shape>

            <size android:width="@dimen/volume_dialog_panel_width" />

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

            <corners android:topLeftRadius="@dimen/volume_dialog_panel_width_half"

                android:topRightRadius="@dimen/volume_dialog_panel_width_half"

                android:bottomLeftRadius="@dimen/volume_dialog_panel_width_half"

                android:bottomRightRadius="@dimen/volume_dialog_panel_width_half"/>

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_row_rounded_background.xml

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

<!--

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

  -->



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

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

    <size android:width="@dimen/volume_dialog_panel_width" />

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout-land-television/volume_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:clipToPadding="false">



        <LinearLayout

            android:id="@+id/main"

            android:id="@+id/volume_dialog_rows_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="right"