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

Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733

Change-Id: Iadfd17fb25a633c4b08666e1af1494a46e7feacc
This commit is contained in:
Curtis Belmonte
2021-05-08 07:47:12 +00:00
committed by Automerger Merge Worker
parent f138b5698f 5ece4babd3
commit 28a2cec4bb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Utils.java
View File

@@ -1205,7 +1205,7 @@ public final class Utils extends com.android.settingslib.Utils {
public static boolean isPageTransitionEnabled(Context context) { public static boolean isPageTransitionEnabled(Context context) {
final boolean isSilkyHome = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME); final boolean isSilkyHome = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME);
final boolean isTransitionEnabled = Settings.Global.getInt(context.getContentResolver(), final boolean isTransitionEnabled = Settings.Global.getInt(context.getContentResolver(),
SETTINGS_SHARED_AXIS_ENABLED, 1) == 1; SETTINGS_SHARED_AXIS_ENABLED, 0) == 1;
return isSilkyHome && isTransitionEnabled; return isSilkyHome && isTransitionEnabled;
} }

2
tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
View File

@@ -65,7 +65,7 @@ public class SettingsHomepageActivityTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
ShadowUtils.setIsPageTransitionEnabled(true); ShadowUtils.setIsPageTransitionEnabled(false);
} }
@Test @Test