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

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

Merge "Fix volume panel shadows" into pi-dev am: 79634c70 

am: aefa2f60

Change-Id: If4ff44b3ec5e96d66f15f17204e0b3b60f2e8f73
parents aca4dda1 aefa2f60

packages/SystemUI/res/layout/volume_dialog.xml

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

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

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:padding="@dimen/volume_dialog_panel_transparent_padding"

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

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

    android:theme="@style/qs_theme"

    android:theme="@style/qs_theme">

    android:clipChildren="false"

    android:clipToPadding="false">

    <!-- right-aligned to be physically near volume button -->

    <!-- right-aligned to be physically near volume button -->

    <LinearLayout

    <LinearLayout

        android:id="@+id/volume_dialog"

        android:id="@+id/volume_dialog"
@@ -30,9 +27,11 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical|right"

        android:layout_gravity="center_vertical|right"

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

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

        android:layout_margin="@dimen/volume_dialog_base_margin"

        android:paddingRight="@dimen/volume_dialog_panel_transparent_padding_right"

        android:paddingTop="@dimen/volume_dialog_panel_transparent_padding"

        android:paddingBottom="@dimen/volume_dialog_panel_transparent_padding"

        android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding"

        android:orientation="vertical"

        android:orientation="vertical"

        android:clipChildren="false"

        android:clipToPadding="false" >

        android:clipToPadding="false" >





        <FrameLayout

        <FrameLayout
@@ -42,7 +41,6 @@ 
            android:layout_marginBottom="@dimen/volume_dialog_spacer"

            android:layout_marginBottom="@dimen/volume_dialog_spacer"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:layout_gravity="right"

            android:layout_gravity="right"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:clipToPadding="false"

            android:background="@drawable/rounded_bg_full">

            android:background="@drawable/rounded_bg_full">

            <com.android.keyguard.AlphaOptimizedImageButton

            <com.android.keyguard.AlphaOptimizedImageButton
@@ -65,7 +63,6 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:orientation="vertical"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:translationZ="@dimen/volume_dialog_elevation"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:clipToPadding="false"

            android:background="@drawable/rounded_bg_full" >

            android:background="@drawable/rounded_bg_full" >

            <LinearLayout

            <LinearLayout

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,9 @@ 
    <!-- The width of the panel that holds the quick settings. -->

    <!-- The width of the panel that holds the quick settings. -->

    <dimen name="qs_panel_width">@dimen/notification_panel_width</dimen>

    <dimen name="qs_panel_width">@dimen/notification_panel_width</dimen>





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

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



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





    <!-- the amount the volume panel should be offset at the end from the view next to it (or

    <!-- the amount the volume panel should be offset at the end from the view next to it (or

    the screen edge, in portrait-->

    the screen edge, in portrait-->