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

Commit 3b59c649 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Change predictive back system animations flag to runtime flag 

Bug: 320510464
Flag: ACONFIG com.android.systemui.predictive_back_system_anims DISABLED
Test: presubmit
Change-Id: I800106eb2a1beeb4e212878c57005c035c305123
parent f8fc22ce

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

+2 −3
Original line number Diff line number Diff line
@@ -69,11 +69,10 @@ flag { 
}



flag {

    name: "predictive_back_system_animations"

    name: "predictive_back_system_anims"

    namespace: "systemui"

    description: "Predictive back for system animations"

    bug: "319421778"

    is_fixed_read_only: true

    bug: "320510464"

}



flag {

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.wm.shell.back;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_HOME;

import static com.android.window.flags.Flags.predictiveBackSystemAnimations;

import static com.android.window.flags.Flags.predictiveBackSystemAnims;

import static com.android.wm.shell.common.ExecutorUtils.executeRemoteCallWithTaskPermission;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION;
@@ -244,7 +244,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
    private void setupAnimationDeveloperSettingsObserver(

            @NonNull ContentResolver contentResolver,

            @NonNull @ShellBackgroundThread final Handler backgroundHandler) {

        if (predictiveBackSystemAnimations()) {

        if (predictiveBackSystemAnims()) {

            ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Back animation aconfig flag is enabled, therefore "

                    + "developer settings flag is ignored and no content observer registered");

            return;
@@ -267,7 +267,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
     */

    @ShellBackgroundThread

    private void updateEnableAnimationFromFlags() {

        boolean isEnabled = predictiveBackSystemAnimations() || isDeveloperSettingEnabled();

        boolean isEnabled = predictiveBackSystemAnims() || isDeveloperSettingEnabled();

        mEnableAnimations.set(isEnabled);

        ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Back animation enabled=%s", isEnabled);

    }