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

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

Merge "Remove enabled flag defer_predictive_animation_if_no_snapshot..." into main

parents 88b0cd12 0fc9ad51

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

+0 −22
Original line number Diff line number Diff line
@@ -297,17 +297,6 @@ flag { 
  }

}



flag {

  name: "always_capture_activity_snapshot"

  namespace: "windowing_frontend"

  description: "Always capture activity snapshot regardless predictive back status"

  bug: "362183912"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "ensure_keyguard_does_transition_starting"

  namespace: "windowing_frontend"
@@ -351,17 +340,6 @@ 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: "predictive_back_system_override_callback"

    namespace: "windowing_frontend"

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

+1 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ class BackNavigationController { 
            }



            void createStartingSurface(@Nullable TaskSnapshot snapshot) {

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

                if (snapshot == null) {

                    return;

                }

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

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

+0 −8
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ import android.util.ArrayMap; 
import android.view.WindowManager;

import android.window.TaskSnapshot;



import com.android.window.flags.Flags;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -147,12 +145,6 @@ class SnapshotController { 
                if (mOpenActivities.isEmpty()) {

                    return false;

                }

                // 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) {

                    if (!mOpenActivities.get(i).mOptInOnBackInvoked) {

                        return false;