Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd03d04a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable slice again" into sc-dev

parents bcf2ecc9 da74a445

quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { 
            case LayoutType.ICON_SINGLE_VERTICAL_TEXT:

                return VIEW_TYPE_SEARCH_ICON;

            case LayoutType.ICON_SLICE:

                if (FeatureFlags.DISABLE_SLICE_IN_ALLAPPS.get()) {

                    return -1;

                }

                if (t.getSliceUri() != null) {

                    return VIEW_TYPE_SEARCH_SLICE;

                }

src/com/android/launcher3/config/FeatureFlags.java

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ public final class FeatureFlags { 
    public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(

            "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");



    public static final BooleanFlag DISABLE_SLICE_IN_ALLAPPS = getDebugFlag(

            "DISABLE_SLICE_IN_ALLAPPS", true, "Disable slice in all apps");



    public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(

            "FOLDER_NAME_SUGGEST", true,

            "Suggests folder names instead of blank text.");