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

Commit fb164fe1 authored by shaoweishen's avatar shaoweishen
Browse files

[Sound panel] Update Ui layout to match with mertial next 

please check bug for before/after screenshot.

Bug: 191317779
Test: verified on device
Change-Id: Ia570dde71ce9f18376eaba48102cecde6adb85bb
parent 4f2a6225

res/drawable/volume_dialog_button_background_outline.xml

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

       android:shape="rectangle">

    <stroke

        android:color="?androidprv:attr/colorAccentPrimaryVariant"

        android:width="1dp"/>

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

    <padding

        android:left="16dp"

        android:right="16dp"

        android:top="8dp"

        android:bottom="8dp" />

    <solid android:color="@android:color/transparent" />

</shape>
 
 No newline at end of file

res/drawable/volume_dialog_button_background_solid.xml

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

       android:shape="rectangle">

    <stroke

        android:color="@android:color/transparent"

        android:width="1dp"/>

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

    <padding

        android:left="16dp"

        android:right="16dp"

        android:top="8dp"

        android:bottom="8dp" />

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

</shape>
 
 No newline at end of file

res/layout/panel_layout.xml

+10 −18
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/settings_panel_title_margin"

            android:layout_marginBottom="@dimen/settings_panel_title_margin"

            android:layout_marginBottom="@dimen/settings_panel_title_margin_bottom"

            android:gravity="center"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="24sp"
@@ -102,31 +102,23 @@ 
            android:visibility="gone"

            style="@style/TrimmedHorizontalProgressBar"/>



        <include

            android:id="@+id/header_divider"

            layout="@layout/horizontal_divider"/>



        <!-- Note: There is a landscape version of panel_slice_list which supports scrolling. -->

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



        <include

            android:id="@+id/footer_divider"

            layout="@layout/horizontal_divider"

            android:visibility="gone"/>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingTop="8dp"

            android:paddingBottom="8dp">

            android:layout_marginTop="16dp"

            android:layout_marginHorizontal="24dp"

            android:layout_marginBottom="18dp">



            <Button

                android:id="@+id/see_more"

                style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"

                style="@style/PanelOptionRoundedOutlinedButton"

                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_marginStart="12dp"

                android:layout_height="36dp"

                android:minWidth="0dp"

                android:text="@string/see_more"/>



            <Space
@@ -136,10 +128,10 @@ 


            <Button

                android:id="@+id/done"

                style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"

                style="@style/PanelOptionRoundedSolidButton"

                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_marginEnd="12dp"

                android:layout_height="36dp"

                android:minWidth="0dp"

                android:text="@string/done"/>

        </LinearLayout>

    </LinearLayout>

res/layout/panel_slice_row.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ 
        style="@style/Widget.SliceView.Panel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"/>

        android:paddingVertical="@dimen/panel_slice_vertical_padding"

        android:paddingHorizontal="@dimen/panel_slice_Horizontal_padding"/>

</LinearLayout>
 
 No newline at end of file

res/layout/panel_slice_slider_row.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
        style="@style/Widget.SliceView.Panel.Slider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="0dp"

        android:paddingEnd="0dp"/>

        android:paddingVertical="@dimen/panel_slice_vertical_padding"

        android:paddingHorizontal="@dimen/panel_slice_Horizontal_padding"/>

</LinearLayout>
 
 No newline at end of file