Merge "Cleanup WIDGETS_IN_LAUNCHER_PREVIEW." into udc-dev (f8b4a4cc) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -142,10 +142,6 @@ public final class FeatureFlags {
		"Enables haptics opening/closing All apps");

		// TODO(Block 6): Clean up flags
		public static final BooleanFlag WIDGETS_IN_LAUNCHER_PREVIEW = getDebugFlag(270393268,
		"WIDGETS_IN_LAUNCHER_PREVIEW", ENABLED,
		"Enables widgets in Launcher preview for the Wallpaper app.");

		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.");

src/com/android/launcher3/graphics/LauncherPreviewRenderer.java

+3 −17

Original line number	Diff line number	Diff line
		@@ -105,7 +105,6 @@ import com.android.launcher3.widget.BaseLauncherAppWidgetHostView;
		import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
		import com.android.launcher3.widget.LauncherWidgetHolder;
		import com.android.launcher3.widget.LocalColorExtractor;
		import com.android.launcher3.widget.NavigableAppWidgetHostView;
		import com.android.launcher3.widget.custom.CustomWidgetManager;
		import com.android.launcher3.widget.util.WidgetSizes;

		@@ -281,9 +280,7 @@ public class LauncherPreviewRenderer extends ContextWrapper
		} else {
		mWallpaperColorResources = null;
		}
		mAppWidgetHost = FeatureFlags.WIDGETS_IN_LAUNCHER_PREVIEW.get()
		? new LauncherPreviewAppWidgetHost(context)
		: null;
		mAppWidgetHost = new LauncherPreviewAppWidgetHost(context);
		}

		/** Populate preview and render it. */
		@@ -416,19 +413,8 @@ public class LauncherPreviewRenderer extends ContextWrapper

		private void inflateAndAddWidgets(
		LauncherAppWidgetInfo info, LauncherAppWidgetProviderInfo providerInfo) {
		AppWidgetHostView view;
		if (FeatureFlags.WIDGETS_IN_LAUNCHER_PREVIEW.get()) {
		view = mAppWidgetHost.createView(mContext, info.appWidgetId, providerInfo);
		} else {
		view = new NavigableAppWidgetHostView(this) {
		@Override
		protected boolean shouldAllowDirectClick() {
		return false;
		}
		};
		view.setAppWidget(-1, providerInfo);
		view.updateAppWidget(null);
		}
		AppWidgetHostView view = mAppWidgetHost.createView(
		mContext, info.appWidgetId, providerInfo);

		if (mWallpaperColorResources != null) {
		view.setColorResources(mWallpaperColorResources);