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

Commit ca884cad authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Remove flag keep_app_window_hide_while_locked" into main

parents 21d36fe6 4cf89bd1

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

+0 −11
Original line number Diff line number Diff line
@@ -427,17 +427,6 @@ flag { 
    }

}



flag {

    name: "keep_app_window_hide_while_locked"

    namespace: "windowing_frontend"

    description: "Do not let app window visible while device is locked"

    is_fixed_read_only: true

    bug: "378088391"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "port_window_size_animation"

    namespace: "windowing_frontend"

services/core/java/com/android/server/wm/WindowState.java

+1 −1
Original line number Diff line number Diff line
@@ -2772,7 +2772,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            final boolean wasShowWhenLocked = (sa.flags & FLAG_SHOW_WHEN_LOCKED) != 0;

            final boolean removeShowWhenLocked = (mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) == 0;

            sa.flags = (sa.flags & ~mask) | (mAttrs.flags & mask);

            if (Flags.keepAppWindowHideWhileLocked() && wasShowWhenLocked && removeShowWhenLocked) {

            if (wasShowWhenLocked && removeShowWhenLocked) {

                // Trigger unoccluding animation if needed.

                mActivityRecord.checkKeyguardFlagsChanged();

                mActivityRecord.deferStartingWindowRemovalForKeyguardUnoccluding();