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

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

Merge "Defer PB animation if previous window cannot show with snapshot." into main

parents a9c33352 19c761e2

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

+11 −0
Original line number Diff line number Diff line
@@ -360,6 +360,17 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "defer_predictive_animation_if_no_snapshot"

  namespace: "windowing_frontend"

  description: "If no snapshot for previous window, start animation until the client has draw."

  bug: "374621014"

  is_fixed_read_only: true

  metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "disallow_app_progress_embedded_window"

  namespace: "windowing_frontend"

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

+3 −0
Original line number Diff line number Diff line
@@ -1570,6 +1570,9 @@ class BackNavigationController { 
            }



            void createStartingSurface(@Nullable TaskSnapshot snapshot) {

                if (Flags.deferPredictiveAnimationIfNoSnapshot() && snapshot == null) {

                    return;

                }

                if (mAdaptors[0].mSwitchType == DIALOG_CLOSE) {

                    return;

                }

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

+4 −1
Original line number Diff line number Diff line
@@ -152,7 +152,10 @@ class SnapshotController { 
                if (mOpenActivities.isEmpty()) {

                    return false;

                }

                if (Flags.alwaysCaptureActivitySnapshot()) {

                // TODO (b/362183912) always capture activity snapshot will cause performance

                //  regression, remove flag after ramp up

                if (!Flags.deferPredictiveAnimationIfNoSnapshot()

                        && Flags.alwaysCaptureActivitySnapshot()) {

                    return true;

                }

                for (int i = mOpenActivities.size() - 1; i >= 0; --i) {