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

Commit 16bee985 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Add Lottie Animation to App-to-Web education" into main

parents 62db07ae fb4c37a7

core/java/android/window/DesktopExperienceFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_APPLY_DESK_ACTIVATION_ON_USER_SWITCH),

    ENABLE_APP_HANDLE_POSITION_REPORTING(Flags::enableAppHandlePositionReporting, false,

            Flags.FLAG_ENABLE_APP_HANDLE_POSITION_REPORTING),

    ENABLE_APP_TO_WEB_EDUCATION_ANIMATION(Flags::enableAppToWebEducationAnimation, false,

            Flags.FLAG_ENABLE_APP_TO_WEB_EDUCATION_ANIMATION),

    ENABLE_BLOCK_NON_DESKTOP_DISPLAY_WINDOW_DRAG_BUGFIX(

            Flags::enableBlockNonDesktopDisplayWindowDragBugfix, false,

            Flags.FLAG_ENABLE_BLOCK_NON_DESKTOP_DISPLAY_WINDOW_DRAG_BUGFIX),

core/java/android/window/flags/lse_desktop_experience.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,16 @@ flag { 
    bug: "332414819"

}



flag {

    name: "enable_app_to_web_education_animation"

    namespace: "lse_desktop_experience"

    description: "Show the App-to-web education animation."

    bug: "359226240"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_block_non_desktop_display_window_drag_bugfix"

    namespace: "lse_desktop_experience"

libs/WindowManager/Shell/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ android_library { 
        "jsr330",

        "kotlinx-coroutines-android",

        "kotlinx-coroutines-core",

        "lottie",

        "mechanics",

        "perfetto_trace_java_protos",

    ],

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

+9 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:paddingHorizontal="32dp"

    android:paddingVertical="24dp"

    android:background="@drawable/desktop_windowing_education_promo_background">



    <TextView

        android:id="@+id/education_text"

        android:layout_width="wrap_content"
@@ -32,5 +33,12 @@ 
        android:textFontWeight="400"

        android:fontFamily="google-sans-text"

        android:layout_gravity="center_horizontal"

        android:gravity="center"/>

        android:gravity="center"

        android:layout_marginBottom="24dp"/>



    <ImageView

        android:id="@+id/education_image"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal" />

</LinearLayout>

libs/WindowManager/Shell/res/raw/app_to_web_education_image.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.