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

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

Merge "Bind volume ringer view to model" into main

parents ba54db89 897c87ce

packages/SystemUI/res/drawable/volume_dialog_background_small_radius.xml

0 → 100644
+21 −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_square_corner_radius" />

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_drawer_selection_bg.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:paddingMode="stack" >

    <size

        android:height="@dimen/volume_ringer_item_size"

        android:width="@dimen/volume_ringer_item_size" />

        android:height="@dimen/volume_dialog_ringer_drawer_button_size"

        android:width="@dimen/volume_dialog_ringer_drawer_button_size" />

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

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_ringer_item_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:shape="rectangle" >

    <size android:width="@dimen/volume_ringer_item_size" android:height="@dimen/volume_ringer_item_size"/>

    <size android:width="@dimen/volume_dialog_ringer_drawer_button_size" android:height="@dimen/volume_dialog_ringer_drawer_button_size"/>

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

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/volume_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
        android:layout_height="wrap_content"

        android:background="@drawable/volume_dialog_background"

        android:divider="@drawable/volume_dialog_spacer"

        android:paddingVertical="@dimen/volume_dialog_vertical_padding"

        android:gravity="center_horizontal"

        android:orientation="vertical"

        android:paddingVertical="@dimen/volume_dialog_vertical_padding"

        android:showDividers="middle">



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

packages/SystemUI/res/layout/volume_ringer_button.xml

0 → 100644
+31 −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.

  -->

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content" >



    <ImageButton

        android:id="@+id/volume_drawer_button"

        android:layout_width="@dimen/volume_dialog_ringer_drawer_button_size"

        android:layout_height="@dimen/volume_dialog_ringer_drawer_button_size"

        android:padding="@dimen/volume_dialog_ringer_drawer_button_icon_radius"

        android:layout_marginBottom="@dimen/volume_dialog_components_spacing"

        android:contentDescription="@string/volume_ringer_mode"

        android:gravity="center"

        android:src="@drawable/volume_ringer_item_bg"

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



</FrameLayout>