Merge "Support simple A-Z search in Taskbar All Apps." into udc-dev (296f8776) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsContainerView.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.view.View;

		import com.android.launcher3.R;
		import com.android.launcher3.allapps.ActivityAllAppsContainerView;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;

		/** All apps container accessible from taskbar. */
		@@ -37,6 +38,10 @@ public class TaskbarAllAppsContainerView extends

		@Override
		protected View inflateSearchBox() {
		if (isSearchSupported()) {
		return super.inflateSearchBox();
		}

		// Remove top padding of header, since we do not have any search
		mHeader.setPadding(mHeader.getPaddingLeft(), 0,
		mHeader.getPaddingRight(), mHeader.getPaddingBottom());
		@@ -50,7 +55,7 @@ public class TaskbarAllAppsContainerView extends

		@Override
		protected boolean isSearchSupported() {
		return false;
		return FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get();
		}

		@Override

+3 −3

Original line number	Diff line number	Diff line
		@@ -222,9 +222,9 @@ public final class FeatureFlags {
		"ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT", DISABLED,
		"Enables displaying the all apps button in the hotseat.");

		public static final BooleanFlag ENABLE_ALL_APPS_ONE_SEARCH_IN_TASKBAR = getDebugFlag(270393900,
		"ENABLE_ALL_APPS_ONE_SEARCH_IN_TASKBAR", DISABLED,
		"Enables One Search box in Taskbar All Apps.");
		public static final BooleanFlag ENABLE_ALL_APPS_SEARCH_IN_TASKBAR = getDebugFlag(270393900,
		"ENABLE_ALL_APPS_SEARCH_IN_TASKBAR", DISABLED,
		"Enables Search box in Taskbar All Apps.");

		public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(270393906,
		"ENABLE_SPLIT_FROM_WORKSPACE", ENABLED,