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

Commit 53195175 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Volume UI updates" into pi-dev am: 89c4bd5f 

am: 2aecbf6a

Change-Id: I2e65439d8d4118839f721dec7be480658cb1e60d
parents c5257599 2aecbf6a

core/res/res/values/themes_device_defaults.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -1318,6 +1318,9 @@ easier. 
        <!-- Progress bar attributes -->

        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- volume background -->

        <item name="panelColorBackground">@color/primary_material_light</item>

    </style>

    </style>





    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Light.Dialog">

    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Light.Dialog">

packages/SystemUI/res/drawable/rounded_bg_bottom_background.xml

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

<?xml version="1.0" encoding="utf-8"?>

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

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

       android:shape="rectangle">

       android:shape="rectangle">

    <solid android:color="@*android:color/material_grey_200" />

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

    <corners

    <corners

        android:bottomLeftRadius="@dimen/corner_size"

        android:bottomLeftRadius="@dimen/corner_size"

        android:topLeftRadius="0dp"

        android:topLeftRadius="0dp"

packages/SystemUI/res/layout/volume_dialog.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -73,17 +73,19 @@ 
                    <!-- volume rows added and removed here! :-) -->

                    <!-- volume rows added and removed here! :-) -->

            </LinearLayout>

            </LinearLayout>

            <FrameLayout

            <FrameLayout

                android:layout_height="wrap_content"

                android:id="@+id/settings_container"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="@drawable/rounded_bg_bottom_background">

                android:background="@drawable/rounded_bg_bottom_background">

                <com.android.keyguard.AlphaOptimizedImageButton

                <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/settings"

                    android:id="@+id/settings"

                    android:src="@drawable/ic_settings"

                    android:src="@drawable/ic_settings_16dp"

                    android:layout_width="@dimen/volume_dialog_tap_target_size"

                    android:layout_width="@dimen/volume_dialog_tap_target_size"

                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_height="@dimen/volume_dialog_tap_target_size"

                    android:layout_gravity="center"

                    android:layout_gravity="center"

                    android:contentDescription="@string/accessibility_volume_settings"

                    android:background="?android:selectableItemBackgroundBorderless"

                    android:background="?android:selectableItemBackgroundBorderless"

                    android:tint="#8A000000"

                    android:tint="?android:attr/colorControlNormal"

                    android:soundEffectsEnabled="false" />

                    android:soundEffectsEnabled="false" />

            </FrameLayout>

            </FrameLayout>

        </LinearLayout>

        </LinearLayout>

packages/SystemUI/res/layout/volume_dialog_row.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <LinearLayout

    <LinearLayout

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/volume_dialog_slider_margin_top"

        android:gravity="center"

        android:gravity="center"

        android:layout_gravity="center"

        android:layout_gravity="center"

        android:orientation="vertical" >

        android:orientation="vertical" >
@@ -42,6 +41,8 @@ 
        <FrameLayout

        <FrameLayout

            android:id="@+id/volume_row_slider_frame"

            android:id="@+id/volume_row_slider_frame"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_marginTop="@dimen/volume_dialog_slider_margin_top"

            android:layout_marginBottom="@dimen/volume_dialog_slider_margin_bottom"

            android:layoutDirection="rtl"

            android:layoutDirection="rtl"

            android:layout_height="@dimen/volume_dialog_slider_height">

            android:layout_height="@dimen/volume_dialog_slider_height">

            <SeekBar

            <SeekBar
@@ -60,6 +61,7 @@ 
            android:layout_width="@dimen/volume_dialog_tap_target_size"

            android:layout_width="@dimen/volume_dialog_tap_target_size"

            android:layout_height="@dimen/volume_dialog_tap_target_size"

            android:layout_height="@dimen/volume_dialog_tap_target_size"

            android:background="?android:selectableItemBackgroundBorderless"

            android:background="?android:selectableItemBackgroundBorderless"

            android:layout_marginBottom="@dimen/volume_dialog_row_margin_bottom"

            android:tint="@color/accent_tint_color_selector"

            android:tint="@color/accent_tint_color_selector"

            android:soundEffectsEnabled="false" />

            android:soundEffectsEnabled="false" />

    </LinearLayout>

    </LinearLayout>

packages/SystemUI/res/values/dimens.xml

+8 −2
Original line number Original line Diff line number Diff line
@@ -270,7 +270,7 @@ 




    <dimen name="volume_dialog_panel_width">64dp</dimen>

    <dimen name="volume_dialog_panel_width">64dp</dimen>





    <dimen name="volume_dialog_slider_height">101dp</dimen>

    <dimen name="volume_dialog_slider_height">108dp</dimen>





    <dimen name="volume_dialog_row_height">252dp</dimen>

    <dimen name="volume_dialog_row_height">252dp</dimen>
@@ -280,7 +280,13 @@ 




    <dimen name="volume_dialog_spacer">4dp</dimen>

    <dimen name="volume_dialog_spacer">4dp</dimen>





    <dimen name="volume_dialog_slider_margin_top">13dp</dimen>

    <dimen name="volume_dialog_slider_margin_top">22dp</dimen>



    <dimen name="volume_dialog_slider_margin_bottom">-2dp</dimen>



    <dimen name="volume_dialog_row_margin_bottom">8dp</dimen>



    <dimen name="volume_dialog_settings_icon_size">16dp</dimen>





    <!-- Gravity for the notification panel -->

    <!-- Gravity for the notification panel -->

    <integer name="notification_panel_layout_gravity">0x31</integer><!-- center_horizontal|top -->

    <integer name="notification_panel_layout_gravity">0x31</integer><!-- center_horizontal|top -->