PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add predictive back aconfig flag

Browse Source 
Bug: 309545085
Flag: ACONFIG com.android.window.flags.predictive_back_system_animations DISABLED
Test: atest BackAnimationPreferenceControllerTest; Manual, i.e. building and verifying correct behaviour for different flag configurations
Change-Id: I3f478dc23bbfeb1f13cae64f3d04b3210841731d
This commit is contained in:
Johannes Gallmann
2023-11-30 13:32:04 +00:00
parent 210d884fb5
commit af96028267
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/BackAnimationPreferenceController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.development; package com.android.settings.development;
import static com.android.window.flags.Flags.predictiveBackSystemAnimations;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
@@ -55,6 +57,11 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc
mFragment = fragment; mFragment = fragment;
} }
@Override
public boolean isAvailable() {
return !predictiveBackSystemAnimations();
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return BACK_NAVIGATION_ANIMATION_KEY; return BACK_NAVIGATION_ANIMATION_KEY;

22
tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java
View File

@@ -29,6 +29,10 @@ import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.UserHandle; import android.os.UserHandle;
import android.platform.test.annotations.RequiresFlagsDisabled;
import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@@ -37,8 +41,11 @@ import androidx.preference.SwitchPreference;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import com.android.window.flags.Flags;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@@ -58,6 +65,9 @@ public class BackAnimationPreferenceControllerTest {
private BackAnimationPreferenceController mController; private BackAnimationPreferenceController mController;
private Looper mLooper; private Looper mLooper;
@Rule
public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
@@ -80,6 +90,18 @@ public class BackAnimationPreferenceControllerTest {
mController.displayPreference(screen); mController.displayPreference(screen);
} }
@Test
@RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS)
public void controllerNotAvailable_whenAconfigFlagEnabled() {
assertFalse(mController.isAvailable());
}
@Test
@RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS)
public void controllerAvailable_whenAconfigFlagDisabled() {
assertTrue(mController.isAvailable());
}
@Test @Test
public void onPreferenceChange_switchEnabled_shouldEnableBackAnimations() { public void onPreferenceChange_switchEnabled_shouldEnableBackAnimations() {
mController.onPreferenceChange(mPreference, true /* new value */); mController.onPreferenceChange(mPreference, true /* new value */);