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

Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad am: 3fb211bc4e

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

Change-Id: I81047287cc44f058d03a3209d82f9985ab30a3c2
This commit is contained in:
TreeHugger Robot
2021-05-07 09:29:46 +00:00
committed by Automerger Merge Worker
parent aa904a9ea2 3fb211bc4e
commit e2608c118b
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) {
final boolean isSilkyHome = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME);
final boolean isTransitionEnabled = Settings.Global.getInt(context.getContentResolver(),
SETTINGS_SHARED_AXIS_ENABLED, 0) == 1;
SETTINGS_SHARED_AXIS_ENABLED, 1) == 1;
return isSilkyHome && isTransitionEnabled;
}

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

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