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

Commit 950c6489 authored by Vania Desmonda's avatar Vania Desmonda
Browse files

Update app handle education tooltip to match Figma specs. 

Flag: com.android.window.flags.enable_desktop_windowing_app_handle_education
Test: manual test
Fixes: 371560323
Fixes: 371185301
Fixes: 371185838
Change-Id: I0f12855afbf43a3011a27761876fbdcd7e97a707
parent ccfbecea

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

+10 −4
Original line number Diff line number Diff line
@@ -19,9 +19,15 @@ 
    android:width="24dp"

    android:height="24dp"

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

    android:viewportHeight="960"

    android:viewportWidth="960">

    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

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

        android:pathData="M419,880Q391,880 366.5,868Q342,856 325,834L107,557L126,537Q146,516 174,512Q202,508 226,523L300,568L300,240Q300,223 311.5,211.5Q323,200 340,200Q357,200 369,211.5Q381,223 381,240L381,712L284,652L388,785Q394,792 402,796Q410,800 419,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 708.5,531.5Q697,520 680,520L461,520L461,440L680,440Q730,440 765,475Q800,510 800,560L800,720Q800,786 753,833Q706,880 640,880L419,880ZM167,340Q154,318 147,292.5Q140,267 140,240Q140,157 198.5,98.5Q257,40 340,40Q423,40 481.5,98.5Q540,157 540,240Q540,267 533,292.5Q526,318 513,340L444,300Q452,286 456,271.5Q460,257 460,240Q460,190 425,155Q390,120 340,120Q290,120 255,155Q220,190 220,240Q220,257 224,271.5Q228,286 236,300L167,340ZM502,620L502,620L502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620L502,620Z" />

        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>

    <path

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

        android:pathData="M8,17h8v2h-8z"/>

    <path

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

        android:pathData="M12,2C7.86,2 4.5,5.36 4.5,9.5c0,3.82 2.66,5.86 3.77,6.5h7.46c1.11,-0.64 3.77,-2.68 3.77,-6.5C19.5,5.36 16.14,2 12,2z"/>

  </vector>

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="rectangle">

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

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

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

        </shape>

    </item>

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
        android:id="@+id/arrow_icon"

        android:layout_width="10dp"

        android:layout_height="12dp"

        android:elevation="2dp"

        android:layout_gravity="center_vertical"

        android:src="@drawable/desktop_windowing_education_tooltip_left_arrow" />

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

+6 −4
Original line number Diff line number Diff line
@@ -16,16 +16,18 @@ 


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

    android:id="@+id/tooltip_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@drawable/desktop_windowing_education_tooltip_background"

    android:orientation="horizontal"

    android:elevation="2dp"

    android:padding="@dimen/desktop_windowing_education_tooltip_padding">



    <ImageView

        android:id="@+id/tooltip_icon"

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:layout_margin="8dp"

        android:layout_gravity="center_vertical"

        android:src="@drawable/app_handle_education_tooltip_icon" />
@@ -34,9 +36,9 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginStart="2dp"

        android:layout_marginHorizontal="8dp"

        android:lineHeight="20dp"

        android:maxWidth="150dp"

        android:maxWidth="220dp"

        android:textColor="@android:color/system_on_tertiary_container_light"

        android:textFontWeight="500"

        android:textSize="14sp" />

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
        android:id="@+id/arrow_icon"

        android:layout_width="12dp"

        android:layout_height="9dp"

        android:elevation="2dp"

        android:layout_gravity="center_horizontal"

        android:src="@drawable/desktop_windowing_education_tooltip_top_arrow" />