diff options
author | Louis Begin <w15621@motorola.com> | 2017-02-27 14:33:11 +0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-03-08 16:10:46 -0800 |
commit | b07a355fe24d70b4affbe2afaf74a8568b2e0e08 (patch) | |
tree | 69a7f3f438bbea41c1502400a52bdb89a136ac52 /src/com/android/launcher3/qsb | |
parent | 3ba48fa019048b69aace5c88373bb3c59f3c2c1d (diff) | |
download | android_packages_apps_Trebuchet-b07a355fe24d70b4affbe2afaf74a8568b2e0e08.tar.gz android_packages_apps_Trebuchet-b07a355fe24d70b4affbe2afaf74a8568b2e0e08.tar.bz2 android_packages_apps_Trebuchet-b07a355fe24d70b4affbe2afaf74a8568b2e0e08.zip |
Add checks for FeatureFlags.QSB_ON_FIRST_SCREEN
When false, it correctly does not show the QSB but leaves
a default style search bar which cannot be removed.
Add checks to control default view visibility in device
profile layout & re-layout, QSB container and in
Workspace's onMeasure
Bug: 35967694
Change-Id: I3d0f89e1022d838eeb95762fd1fb3f7257956c41
Diffstat (limited to 'src/com/android/launcher3/qsb')
-rw-r--r-- | src/com/android/launcher3/qsb/QsbContainerView.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java index 38a3e1f58..4dc3c1c0d 100644 --- a/src/com/android/launcher3/qsb/QsbContainerView.java +++ b/src/com/android/launcher3/qsb/QsbContainerView.java @@ -40,6 +40,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; import com.android.launcher3.Utilities; 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 @@ -89,7 +90,11 @@ public class QsbContainerView extends FrameLayout { LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mWrapper = new FrameLayout(getActivity()); - mWrapper.addView(createQsb(mWrapper)); + + // Only add the view when enabled + if (FeatureFlags.QSB_ON_FIRST_SCREEN) { + mWrapper.addView(createQsb(mWrapper)); + } return mWrapper; } @@ -197,6 +202,11 @@ public class QsbContainerView extends FrameLayout { } private void rebindFragment() { + // Exit if the embedded qsb is disabled + if (!FeatureFlags.QSB_ON_FIRST_SCREEN) { + return; + } + if (mWrapper != null && getActivity() != null) { mWrapper.removeAllViews(); mWrapper.addView(createQsb(mWrapper)); |