Merge "Adding a feature flag to disable icon overrides" into tm-dev

This commit is contained in:
Sunny Goyal authored and Android (Google) Code Review committed 2022-04-01 17:26:09 +00:00
commit 59c535bb71
2 files changed
+7 -1

No files matched your search

@@ -261,6 +261,10 @@ public final class FeatureFlags {
public static final BooleanFlag ENABLE_ONE_SEARCH_MOTION = new DeviceFlag(
"ENABLE_ONE_SEARCH_MOTION", true, "Enables animations in OneSearch.");
public static final BooleanFlag USE_LOCAL_ICON_OVERRIDES = getDebugFlag(
"USE_LOCAL_ICON_OVERRIDES", true,
"Use inbuilt monochrome icons if app doesn't provide one");
public static void initialize(Context context) {
synchronized (sDebugFlags) {
for (DebugFlag flag : sDebugFlags) {
@@ -23,6 +23,7 @@ import android.util.ArrayMap;
import android.util.Log;
import com.android.launcher3.R;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.Themes;
import org.xmlpull.v1.XmlPullParser;
@@ -55,7 +56,8 @@ public class LauncherIconProvider extends IconProvider {
*/
public void setIconThemeSupported(boolean isSupported) {
mSupportsIconTheme = isSupported;
mThemedIconMap = isSupported ? null : DISABLED_MAP;
mThemedIconMap = isSupported && FeatureFlags.USE_LOCAL_ICON_OVERRIDES.get()
? null : DISABLED_MAP;
}
@Override