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

Commit 2ff94617 authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

Merge "Fix drawer wiggles" into main

parents e60ff67b f4d02027

packages/SystemUI/res/drawable/volume_dialog_background.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<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="@dimen/volume_dialog_background_corner_radius" />

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

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

    <solid android:color="@androidprv:color/materialColorSurface" />

</shape>

packages/SystemUI/res/drawable/volume_dialog_ringer_background.xml

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

    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.

-->



<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="@dimen/volume_dialog_background_corner_radius"/>

    <solid android:color="@androidprv:color/materialColorSurface" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/volume_dialog.xml

+8 −17
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    android:id="@+id/volume_dialog_root"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    app:layoutDescription="@xml/volume_dialog_scene">



    <View
@@ -31,29 +32,19 @@ 
        app:layout_constraintBottom_toBottomOf="@id/volume_dialog_settings"

        app:layout_constraintEnd_toEndOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintStart_toStartOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintTop_toTopOf="@id/volume_ringer_drawer" />



    <View

        android:id="@+id/volume_ringer_horizontal_background"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:background="@drawable/volume_dialog_background"

        app:layout_constraintBottom_toTopOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintEnd_toEndOf="@id/volume_ringer_drawer"

        app:layout_constraintStart_toStartOf="@id/volume_ringer_drawer"

        app:layout_constraintTop_toTopOf="@id/volume_dialog_background" />

        app:layout_constraintTop_toTopOf="@id/volume_dialog_main_slider_container" />



    <include

        android:id="@id/volume_ringer_drawer"

        layout="@layout/volume_ringer_drawer"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/volume_dialog_components_spacing"

        android:layout_marginRight="@dimen/volume_dialog_ringer_drawer_diff_right_margin"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginEnd="@dimen/volume_dialog_ringer_drawer_diff_end_margin"

        android:layout_marginBottom="@dimen/volume_dialog_background_vertical_margin"

        app:layout_constraintBottom_toTopOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintEnd_toEndOf="@id/volume_dialog_main_slider_container"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_bias="1" />

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"/>



    <include

        android:id="@+id/volume_dialog_main_slider_container"

packages/SystemUI/res/layout/volume_ringer_drawer.xml

+9 −1
Original line number Diff line number Diff line
@@ -18,13 +18,21 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/volume_ringer_drawer"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="center"

    android:layoutDirection="ltr"

    app:layoutDescription="@xml/volume_dialog_ringer_drawer_motion_scene">



    <View

        android:id="@+id/ringer_buttons_background"

        android:layout_width="@dimen/volume_dialog_width"

        android:layout_height="0dp"

        android:layout_marginTop="@dimen/volume_dialog_background_vertical_margin"

        android:layout_marginBottom="@dimen/volume_dialog_background_vertical_margin"

        android:background="@drawable/volume_dialog_ringer_background" />



    <!-- add ringer buttons here -->



</androidx.constraintlayout.motion.widget.MotionLayout>

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -2120,8 +2120,8 @@ 


    <dimen name="volume_dialog_background_square_corner_radius">12dp</dimen>



    <dimen name="volume_dialog_ringer_drawer_left_margin">10dp</dimen>

    <dimen name="volume_dialog_ringer_drawer_diff_right_margin">6dp</dimen>

    <dimen name="volume_dialog_ringer_drawer_margin">10dp</dimen>

    <dimen name="volume_dialog_ringer_drawer_diff_end_margin">6dp</dimen>

    <dimen name="volume_dialog_ringer_drawer_button_size">@dimen/volume_dialog_button_size</dimen>

    <dimen name="volume_dialog_ringer_drawer_button_icon_radius">10dp</dimen>

    <dimen name="volume_dialog_ringer_selected_button_background_radius">20dp</dimen>