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

Commit 5b97d159 authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Add ringer view binder and fork ringer drawer UI 

Flag: com.android.systemui.volume_redesign
Bug: 369993851
Test: build.
Change-Id: I56d5afa85a8c7f31b177e99674a91c117039f8bc
parent b95e6688

packages/SystemUI/res/drawable/volume_background_top.xml

+20 −21
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

<?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.

-->

<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"/>

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

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

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

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

        </shape>

    </item>

</layer-list>

packages/SystemUI/res/drawable/volume_background_top_legacy.xml

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

        </shape>

    </item>

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

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/colorSurface" />

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

</shape>

packages/SystemUI/res/drawable/volume_drawer_selection_bg.xml

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

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

<?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.
@@ -15,10 +14,11 @@ 
  ~ 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:paddingMode="stack" >

    <size

        android:height="@dimen/volume_ringer_drawer_item_size"

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

    <solid android:color="?android:attr/colorAccent" />

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

        android:height="@dimen/volume_ringer_item_size"

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

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_drawer_selection_bg_legacy.xml

0 → 100644
+24 −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"

            android:paddingMode="stack" >

    <size

        android:height="@dimen/volume_ringer_drawer_item_size"

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

    <solid android:color="?android:attr/colorAccent" />

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

</shape>
 
 No newline at end of file