Merge "Enable slice again" into sc-dev
This commit is contained in:
commit
fd03d04ae0
2 files changed
-6
No files matched your search
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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.");
|
||||
|
||||
Reference in new issue
Block a user