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

Commit ac6ec290 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Fix floating sliders background" into main

parents edbc557c 172aac3c

packages/SystemUI/res/drawable/volume_dialog_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

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

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

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

</shape>

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

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
<!--

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

-->

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

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

    android:id="@+id/volume_dialog_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="right"

    android:divider="@drawable/volume_dialog_floating_sliders_spacer"

    android:orientation="horizontal"

    android:showDividers="middle|end|beginning"

    android:theme="@style/volume_dialog_theme">



    <LinearLayout

        android:id="@+id/volume_dialog_floating_sliders_container"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:background="@drawable/volume_dialog_background"

        android:divider="@drawable/volume_dialog_floating_sliders_spacer"

        android:gravity="bottom"

        android:orientation="horizontal"

        android:paddingBottom="@dimen/volume_dialog_floating_sliders_bottom_padding"

        android:showDividers="middle" />



    <LinearLayout

        android:id="@+id/volume_dialog"

        android:layout_width="@dimen/volume_dialog_width"

        android:layout_height="wrap_content"

        android:background="@drawable/volume_dialog_background"

        android:divider="@drawable/volume_dialog_spacer"

        android:gravity="center_horizontal"

        android:orientation="vertical"

        android:paddingVertical="@dimen/volume_dialog_vertical_padding"

        android:showDividers="middle">



        <FrameLayout

            android:id="@+id/volume_dialog_ringer_button"

            android:layout_width="@dimen/volume_dialog_button_size"

            android:layout_height="@dimen/volume_dialog_button_size" />



        <include layout="@layout/volume_dialog_slider" />



        <Button

            android:id="@+id/volume_dialog_settings"

            android:layout_width="@dimen/volume_dialog_button_size"

            android:layout_height="@dimen/volume_dialog_button_size"

            android:background="@drawable/ripple_drawable_20dp"

            android:contentDescription="@string/accessibility_volume_settings"

            android:soundEffectsEnabled="false"

            android:src="@drawable/horizontal_ellipsis"

            android:tint="?androidprv:attr/materialColorPrimary" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

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

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
<!--

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

-->

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

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

    android:id="@+id/volume_dialog_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="right"

    android:divider="@drawable/volume_dialog_floating_sliders_spacer"

    android:orientation="horizontal"

    android:showDividers="middle|end|beginning"

    android:theme="@style/volume_dialog_theme">



    <LinearLayout

        android:id="@+id/volume_dialog_floating_sliders_container"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:background="@drawable/volume_dialog_background"

        android:divider="@drawable/volume_dialog_floating_sliders_spacer"

        android:gravity="bottom"

        android:orientation="horizontal"

        android:paddingBottom="@dimen/volume_dialog_floating_sliders_bottom_padding"

        android:showDividers="middle" />



    <LinearLayout

        android:id="@+id/volume_dialog"

        android:layout_width="@dimen/volume_dialog_width"

        android:layout_height="wrap_content"

        android:background="@drawable/volume_dialog_background"

        android:divider="@drawable/volume_dialog_spacer"

        android:gravity="center_horizontal"

        android:orientation="vertical"

        android:paddingVertical="@dimen/volume_dialog_vertical_padding"

        android:showDividers="middle">



        <FrameLayout

            android:id="@+id/volume_dialog_ringer_button"

            android:layout_width="@dimen/volume_dialog_button_size"

            android:layout_height="@dimen/volume_dialog_button_size" />



        <include layout="@layout/volume_dialog_slider" />



        <Button

            android:id="@+id/volume_dialog_settings"

            android:layout_width="@dimen/volume_dialog_button_size"

            android:layout_height="@dimen/volume_dialog_button_size"

            android:background="@drawable/ripple_drawable_20dp"

            android:contentDescription="@string/accessibility_volume_settings"

            android:soundEffectsEnabled="false"

            android:src="@drawable/horizontal_ellipsis"

            android:tint="?androidprv:attr/materialColorPrimary" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/volume_dialog.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
        android:id="@+id/volume_dialog_floating_sliders_container"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:background="@drawable/volume_dialog_background"

        android:divider="@drawable/volume_dialog_floating_sliders_spacer"

        android:gravity="bottom"

        android:orientation="horizontal"
@@ -53,7 +52,7 @@ 


        <include layout="@layout/volume_dialog_slider" />



        <Button

        <ImageButton

            android:id="@+id/volume_dialog_settings"

            android:layout_width="@dimen/volume_dialog_button_size"

            android:layout_height="@dimen/volume_dialog_button_size"