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

Remove silky flag from misc files

Browse Source 
Remove the silky condition.

Bug: 183670633
Test: robotests
Change-Id: I53cff0b149afb26d40f9b3af21c1b384058b306b
This commit is contained in:
Yanting Yang
2021-06-02 18:58:15 +08:00
parent e678e2da06
commit 1aadccac6d
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,6 @@ import androidx.preference.PreferenceGroup;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.profileselector.ProfileFragmentBridge;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -1228,10 +1227,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(),
return Settings.Global.getInt(context.getContentResolver(),
SETTINGS_SHARED_AXIS_ENABLED, 0) == 1;
return isSilkyHome && isTransitionEnabled;
}
}