Merge "Change predictive back system animations flag to runtime flag" into main
diff --git a/src/com/android/settings/development/BackAnimationPreferenceController.java b/src/com/android/settings/development/BackAnimationPreferenceController.java
index ed63896..09af27a 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.content.Context;
import android.provider.Settings;
@@ -57,7 +57,7 @@
@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 dc4f56a..1d93e88 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 @@
}
@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());
}