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

Commit 2b6902c9 authored by Ats Jenk's avatar Ats Jenk
Browse files

Improve caption layout 

Add rounded corners to the caption bar and center back, handle and close
button images.

Test: visually verify the styling
Bug: 253705823
Change-Id: I5e0a4f03e9fb7b4ea079fcae3ce27ba33165eacc
parent 2689585c

libs/WindowManager/Shell/res/drawable/decor_back_button_dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
        >

    <group android:scaleX="0.5"

           android:scaleY="0.5"

           android:translateX="8.0"

           android:translateY="8.0" >

           android:translateX="4.0"

           android:translateY="4.0" >

        <path

            android:fillColor="@android:color/black"

            android:pathData="MM24,40.3 L7.7,24 24,7.7 26.8,10.45 15.3,22H40.3V26H15.3L26.8,37.5Z"/>

libs/WindowManager/Shell/res/drawable/decor_caption_title.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ 
<shape android:shape="rectangle"

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

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

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

</shape>

libs/WindowManager/Shell/res/drawable/decor_close_button_dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
        android:viewportHeight="32.0">

    <group android:scaleX="0.5"

            android:scaleY="0.5"

            android:translateX="8.0"

            android:translateY="8.0" >

            android:translateX="4.0"

            android:translateY="4.0" >

        <path

            android:fillColor="@android:color/black"

            android:pathData="M12.45,38.35 L9.65,35.55 21.2,24 9.65,12.45 12.45,9.65 24,21.2 35.55,9.65 38.35,12.45 26.8,24 38.35,35.55 35.55,38.35 24,26.8Z"/>

libs/WindowManager/Shell/res/drawable/decor_handle_dark.xml

+4 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <group android:translateY="8.0">

        <path

            android:fillColor="@android:color/black" android:pathData="M3,5V3H21V5Z"/>

    </group>

</vector>

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
        View handle = caption.findViewById(R.id.caption_handle);

        VectorDrawable handleBackground = (VectorDrawable) handle.getBackground();

        handleBackground.setTintList(buttonTintColor);

        caption.setBackgroundColor(v == View.VISIBLE ? Color.WHITE : Color.TRANSPARENT);

        caption.getBackground().setTint(v == View.VISIBLE ? Color.WHITE : Color.TRANSPARENT);

    }



    private void closeDragResizeListener() {