Merge "Change predictive back system animations flag to runtime flag" into main

This commit is contained in:
Johannes Gallmann
2024-01-17 10:55:24 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 4 deletions

View File

@@ -16,7 +16,7 @@
package com.android.settings.development; 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.content.Context;
import android.provider.Settings; import android.provider.Settings;
@@ -57,7 +57,7 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return !predictiveBackSystemAnimations(); return !predictiveBackSystemAnims();
} }
@Override @Override

View File

@@ -91,13 +91,13 @@ public class BackAnimationPreferenceControllerTest {
} }
@Test @Test
@RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS) @RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS)
public void controllerNotAvailable_whenAconfigFlagEnabled() { public void controllerNotAvailable_whenAconfigFlagEnabled() {
assertFalse(mController.isAvailable()); assertFalse(mController.isAvailable());
} }
@Test @Test
@RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS) @RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS)
public void controllerAvailable_whenAconfigFlagDisabled() { public void controllerAvailable_whenAconfigFlagDisabled() {
assertTrue(mController.isAvailable()); assertTrue(mController.isAvailable());
} }