From 985825edbfd5a1cb3266ab0431e71d8de3526cfc Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Mon, 12 Oct 2020 19:09:31 +0800 Subject: [PATCH] Hide the contextual home architecture. The contextual home will default to being disabled in Android S. Changing the feature flag could reenable it. Fixes: 168179764 Test: launch Settings and don't see contextual cards Change-Id: I9591b50c4fe882c8605a71490f56aef4156b3e80 --- .../android/settings/homepage/SettingsHomepageActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index a8426437f57..237318f4dc1 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -20,6 +20,7 @@ import android.animation.LayoutTransition; import android.app.ActivityManager; import android.app.settings.SettingsEnums; import android.os.Bundle; +import android.util.FeatureFlagUtils; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -33,6 +34,7 @@ import androidx.fragment.app.FragmentTransaction; import com.android.settings.R; import com.android.settings.accounts.AvatarViewMixin; +import com.android.settings.core.FeatureFlags; import com.android.settings.core.HideNonSystemOverlayMixin; import com.android.settings.homepage.contextualcards.ContextualCardsFragment; import com.android.settings.overlay.FeatureFactory; @@ -58,7 +60,8 @@ public class SettingsHomepageActivity extends FragmentActivity { getLifecycle().addObserver(new AvatarViewMixin(this, avatarView)); getLifecycle().addObserver(new HideNonSystemOverlayMixin(this)); - if (!getSystemService(ActivityManager.class).isLowRamDevice()) { + if (FeatureFlagUtils.isEnabled(this, FeatureFlags.CONTEXTUAL_HOME) + && !getSystemService(ActivityManager.class).isLowRamDevice()) { // Only allow contextual feature on high ram devices. showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content); }