summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2017-06-28 00:20:46 (GMT)
committerArne Coucheron <arco68@gmail.com>2017-07-15 04:51:06 (GMT)
commit0154733bd0b7268d2bbe8df04f41a98a224bc28c (patch)
tree8ec3fc14b58017a11b554728954e3a786b721782
parente015f4a81c44442d2f6901d14363fe7000763fd0 (diff)
downloadandroid_packages_apps_Trebuchet-0154733bd0b7268d2bbe8df04f41a98a224bc28c.zip
android_packages_apps_Trebuchet-0154733bd0b7268d2bbe8df04f41a98a224bc28c.tar.gz
android_packages_apps_Trebuchet-0154733bd0b7268d2bbe8df04f41a98a224bc28c.tar.bz2
Disable QSB on first screen by default
Change-Id: I24f1682cbad10610f04f7b8ada238b43addd23da
-rw-r--r--src/com/android/launcher3/QsbContainerView.java9
-rw-r--r--src_config/com/android/launcher3/config/FeatureFlags.java2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher3/QsbContainerView.java b/src/com/android/launcher3/QsbContainerView.java
index 02d8a13..4b65b3f 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 f771a75..686ba53 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.