diff options
-rw-r--r-- | src/com/android/launcher3/QsbContainerView.java | 9 | ||||
-rw-r--r-- | src_config/com/android/launcher3/config/FeatureFlags.java | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher3/QsbContainerView.java b/src/com/android/launcher3/QsbContainerView.java index 02d8a13ff..4b65b3fbe 100644 --- a/src/com/android/launcher3/QsbContainerView.java +++ b/src/com/android/launcher3/QsbContainerView.java @@ -36,6 +36,7 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import com.android.launcher3.compat.AppWidgetManagerCompat; +import com.android.launcher3.config.FeatureFlags; /** * A frame layout which contains a QSB. This internally uses fragment to bind the view, which @@ -99,7 +100,9 @@ public class QsbContainerView extends FrameLayout { sSavedWidgetId = savedInstanceState.getInt(QSB_WIDGET_ID, -1); } mWrapper = new FrameLayout(getActivity()); - mWrapper.addView(createQsb(inflater, mWrapper)); + if (FeatureFlags.QSB_ON_FIRST_SCREEN) { + mWrapper.addView(createQsb(inflater, mWrapper)); + } return mWrapper; } @@ -218,7 +221,9 @@ public class QsbContainerView extends FrameLayout { private void rebindFragment() { if (mWrapper != null && getActivity() != null) { mWrapper.removeAllViews(); - mWrapper.addView(createQsb(getActivity().getLayoutInflater(), mWrapper)); + if (FeatureFlags.QSB_ON_FIRST_SCREEN) { + mWrapper.addView(createQsb(getActivity().getLayoutInflater(), mWrapper)); + } } } diff --git a/src_config/com/android/launcher3/config/FeatureFlags.java b/src_config/com/android/launcher3/config/FeatureFlags.java index f771a75f0..686ba5316 100644 --- a/src_config/com/android/launcher3/config/FeatureFlags.java +++ b/src_config/com/android/launcher3/config/FeatureFlags.java @@ -32,7 +32,7 @@ public final class FeatureFlags { public static boolean LAUNCHER3_ALL_APPS_PULL_UP = true; // Feature flag to enable moving the QSB on the 0th screen of the workspace. - public static final boolean QSB_ON_FIRST_SCREEN = true; + public static final boolean QSB_ON_FIRST_SCREEN = false; // When enabled the all-apps icon is not added to the hotseat. public static final boolean NO_ALL_APPS_ICON = true; // When enabled fling down gesture on the first workspace triggers search. |