From 161f280616791d18916862a4b5b1dad2d8f7f281 Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Tue, 16 Jan 2024 17:19:48 +0000 Subject: [PATCH] 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: I591133ce8d4c85c7c056b66f1c21ce8d0c40960e --- .../development/BackAnimationPreferenceController.java | 4 ++-- .../development/BackAnimationPreferenceControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/development/BackAnimationPreferenceController.java b/src/com/android/settings/development/BackAnimationPreferenceController.java index 8c731a46b13..4d9cf727680 100644 --- a/src/com/android/settings/development/BackAnimationPreferenceController.java +++ b/src/com/android/settings/development/BackAnimationPreferenceController.java @@ -16,7 +16,7 @@ package com.android.settings.development; -import static com.android.window.flags.Flags.predictiveBackSystemAnimations; +import static com.android.window.flags.Flags.predictiveBackSystemAnims; import android.annotation.Nullable; import android.content.Context; @@ -57,7 +57,7 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc @Override public boolean isAvailable() { - return !predictiveBackSystemAnimations(); + return !predictiveBackSystemAnims(); } @Override diff --git a/tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java index dc4f56a2c02..1d93e88b64a 100644 --- a/tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java @@ -91,13 +91,13 @@ public class BackAnimationPreferenceControllerTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS) + @RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS) public void controllerNotAvailable_whenAconfigFlagEnabled() { assertFalse(mController.isAvailable()); } @Test - @RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS) + @RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS) public void controllerAvailable_whenAconfigFlagDisabled() { assertTrue(mController.isAvailable()); }