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

Commit 55ee66af authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Put app handle color animation behind its own flag" into main

parents e0ed3577 b5402f22

core/java/android/window/DesktopExperienceFlags.java

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

    ENABLE_REENABLE_APP_HANDLE_ANIMATIONS(Flags::reenableAppHandleAnimations,

            false, Flags.FLAG_REENABLE_APP_HANDLE_ANIMATIONS),

    ENABLE_REENABLE_APP_HANDLE_COLOR_ANIMATIONS(Flags::reenableAppHandleColorAnimations,

            false, Flags.FLAG_REENABLE_APP_HANDLE_COLOR_ANIMATIONS),

    ENABLE_REJECT_HOME_TRANSITION(

            Flags::enableRejectHomeTransition, true,

            Flags.FLAG_ENABLE_REJECT_HOME_TRANSITION),

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

+10 −0
Original line number Diff line number Diff line
@@ -1807,6 +1807,16 @@ flag { 
    }

}



flag {

    name: "reenable_app_handle_color_animations"

    namespace: "lse_desktop_experience"

    description: "Re-enables the app handle color animations"

    bug: "441497981"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "remove_desk_on_last_task_removal"

    namespace: "lse_desktop_experience"

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/AppHandleViewHolder.kt

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ class AppHandleViewHolder( 
        isCaptionVisible: Boolean,

    ) {

        setVisibility(isCaptionVisible)

        if (DesktopExperienceFlags.ENABLE_REENABLE_APP_HANDLE_ANIMATIONS.isTrue) {

        if (DesktopExperienceFlags.ENABLE_REENABLE_APP_HANDLE_COLOR_ANIMATIONS.isTrue) {

            animator.animateColorChange(getCaptionHandleBarColor(taskInfo))

        } else {

            (captionHandle as ColoredAppHandle).tint(getCaptionHandleBarColor(taskInfo))