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

Commit 7431e168 authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Updating freeform app header to match latest spec 

Edits padding and margins of maximize window button to match the lastest
freeform app header spec.

Bug: 327514620
Test: Manual testing

Change-Id: I1af2ebfcb7624a15d9d923757234e61be339c20b
parent 02d1ac8f

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            <shape

                android:shape="ring"

                android:thickness="3dp"

                android:innerRadius="17dp"

                android:innerRadius="14dp"

                android:useLevel="true">

            </shape>

        </rotate>

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

+4 −4
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
  ~ limitations under the License.

  -->

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

    android:width="48dp"

    android:height="48dp"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportHeight="960"

    android:viewportWidth="960">

    <path

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

        android:pathData="M180,840Q156,840 138,822Q120,804 120,780L120,180Q120,156 138,138Q156,120 180,120L780,120Q804,120 822,138Q840,156 840,180L840,780Q840,804 822,822Q804,840 780,840L180,840ZM180,780L780,780Q780,780 780,780Q780,780 780,780L780,277L180,277L180,780Q180,780 180,780Q180,780 180,780Z" />

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

        android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320L160,320L160,720Q160,720 160,720Q160,720 160,720Z"/>

</vector>
 
 No newline at end of file

libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml

+6 −3
Original line number Diff line number Diff line
@@ -80,9 +80,12 @@ 


    <com.android.wm.shell.windowdecor.MaximizeButtonView

        android:id="@+id/maximize_button_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="44dp"

        android:layout_height="40dp"

        android:layout_gravity="end"

        android:layout_marginHorizontal="8dp"

        android:paddingHorizontal="5dp"

        android:paddingVertical="3dp"

        android:clickable="true"

        android:focusable="true"/>

libs/WindowManager/Shell/res/layout/maximize_menu_button.xml

+5 −5
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ 
        android:id="@+id/progress_bar"

        style="?android:attr/progressBarStyleHorizontal"

        android:progressDrawable="@drawable/circular_progress"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:layout_width="34dp"

        android:layout_height="34dp"

        android:indeterminate="false"

        android:visibility="invisible"/>



    <ImageButton

        android:id="@+id/maximize_window"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:padding="9dp"

        android:layout_width="34dp"

        android:layout_height="34dp"

        android:padding="5dp"

        android:contentDescription="@string/maximize_button_text"

        android:tint="?androidprv:attr/materialColorOnSurface"

        android:background="?android:selectableItemBackgroundBorderless"