From ff13792b8326750ec683b19c555fa0908564f514 Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Fri, 17 Jan 2020 12:01:26 -0800 Subject: [PATCH] Adds Launcher flag to enable Universal Smartspace. Test: Used the flag Bug: 141701658 Change-Id: Id06016e313b05ae70b693c39e2e1cde2576cfbb1 --- src/com/android/launcher3/Workspace.java | 2 +- src/com/android/launcher3/config/FeatureFlags.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 9a3a379697..327896013f 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -496,7 +496,7 @@ public class Workspace extends PagedView // In transposed layout, we add the QSB in the Grid. As workspace does not touch the // edges, we do not need a full width QSB. qsb = LayoutInflater.from(getContext()) - .inflate(R.layout.search_container_workspace,firstPage, false); + .inflate(R.layout.search_container_workspace, firstPage, false); } CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(), 1); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 75609fe68e..f10aca509e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -140,6 +140,10 @@ public final class FeatureFlags { "ENABLE_DATABASE_RESTORE", true, "Enable database restore when new restore session is created"); + public static final TogglableFlag ENABLE_UNIVERSAL_SMARTSPACE = new TogglableFlag( + "ENABLE_UNIVERSAL_SMARTSPACE", false, + "Replace Smartspace with a version rendered by System UI."); + public static void initialize(Context context) { // Avoid the disk read for user builds if (Utilities.IS_DEBUG_DEVICE) {