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

Revert "Turn on the transition flag"

Browse Source 
This reverts commit 1be773da62.

Reason for revert: b/187517936

Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
This commit is contained in:
Curtis Belmonte
2021-05-07 22:42:35 +00:00
parent 1be773da62
commit 1e1b259445
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