Merge "Support simple A-Z search in Taskbar All Apps." into udc-dev am: 296f8776f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22454482 Change-Id: I9990522ae951111f7c56091b648f8ea514e899ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
+6
-1
@@ -21,6 +21,7 @@ import android.view.View;
|
|||||||
|
|
||||||
import com.android.launcher3.R;
|
import com.android.launcher3.R;
|
||||||
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
|
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
|
||||||
|
import com.android.launcher3.config.FeatureFlags;
|
||||||
import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;
|
import com.android.launcher3.taskbar.overlay.TaskbarOverlayContext;
|
||||||
|
|
||||||
/** All apps container accessible from taskbar. */
|
/** All apps container accessible from taskbar. */
|
||||||
@@ -37,6 +38,10 @@ public class TaskbarAllAppsContainerView extends
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected View inflateSearchBox() {
|
protected View inflateSearchBox() {
|
||||||
|
if (isSearchSupported()) {
|
||||||
|
return super.inflateSearchBox();
|
||||||
|
}
|
||||||
|
|
||||||
// Remove top padding of header, since we do not have any search
|
// Remove top padding of header, since we do not have any search
|
||||||
mHeader.setPadding(mHeader.getPaddingLeft(), 0,
|
mHeader.setPadding(mHeader.getPaddingLeft(), 0,
|
||||||
mHeader.getPaddingRight(), mHeader.getPaddingBottom());
|
mHeader.getPaddingRight(), mHeader.getPaddingBottom());
|
||||||
@@ -50,7 +55,7 @@ public class TaskbarAllAppsContainerView extends
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isSearchSupported() {
|
protected boolean isSearchSupported() {
|
||||||
return false;
|
return FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -222,9 +222,9 @@ public final class FeatureFlags {
|
|||||||
"ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT", DISABLED,
|
"ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT", DISABLED,
|
||||||
"Enables displaying the all apps button in the hotseat.");
|
"Enables displaying the all apps button in the hotseat.");
|
||||||
|
|
||||||
public static final BooleanFlag ENABLE_ALL_APPS_ONE_SEARCH_IN_TASKBAR = getDebugFlag(270393900,
|
public static final BooleanFlag ENABLE_ALL_APPS_SEARCH_IN_TASKBAR = getDebugFlag(270393900,
|
||||||
"ENABLE_ALL_APPS_ONE_SEARCH_IN_TASKBAR", DISABLED,
|
"ENABLE_ALL_APPS_SEARCH_IN_TASKBAR", DISABLED,
|
||||||
"Enables One Search box in Taskbar All Apps.");
|
"Enables Search box in Taskbar All Apps.");
|
||||||
|
|
||||||
public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(270393906,
|
public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(270393906,
|
||||||
"ENABLE_SPLIT_FROM_WORKSPACE", ENABLED,
|
"ENABLE_SPLIT_FROM_WORKSPACE", ENABLED,
|
||||||
|
|||||||
Reference in New Issue
Block a user