Merge "Revert "Introducing new variable to enable/disable shortcuts."" into tm-qpr-dev (698239e1) · Commits · e / os / BlissLauncher3

go/src/com/android/launcher3/model/WidgetsModel.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -41,10 +41,8 @@ import java.util.Set;
		*/
		public class WidgetsModel {

		// True if the widget support is disabled.
		// True is the widget support is disabled.
		public static final boolean GO_DISABLE_WIDGETS = true;
		// True if the shortcut support is disabled.
		public static final boolean GO_DISABLE_SHORTCUTS = true;
		public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;

		private static final ArrayList<WidgetsListBaseEntry> EMPTY_WIDGET_LIST = new ArrayList<>();

src/com/android/launcher3/icons/ShortcutCachingLogic.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.launcher3.icons;

		import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_SHORTCUTS;
		import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_WIDGETS;

		import android.content.ComponentName;
		import android.content.Context;
		@@ -101,7 +101,7 @@ public class ShortcutCachingLogic implements CachingLogic<ShortcutInfo> {
		* Launcher specific checks
		*/
		public static Drawable getIcon(Context context, ShortcutInfo shortcutInfo, int density) {
		if (GO_DISABLE_SHORTCUTS) {
		if (GO_DISABLE_WIDGETS) {
		return null;
		}
		try {

src/com/android/launcher3/model/BgDataModel.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ package com.android.launcher3.model;

		import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY;

		import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_SHORTCUTS;
		import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_WIDGETS;
		import static com.android.launcher3.shortcuts.ShortcutRequest.PINNED;

		import static java.util.stream.Collectors.groupingBy;
		@@ -286,7 +286,7 @@ public class BgDataModel {
		* shortcuts and unpinning any extra shortcuts.
		*/
		public synchronized void updateShortcutPinnedState(Context context, UserHandle user) {
		if (GO_DISABLE_SHORTCUTS) {
		if (GO_DISABLE_WIDGETS) {
		return;
		}

src/com/android/launcher3/shortcuts/ShortcutRequest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.launcher3.shortcuts;

		import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_SHORTCUTS;
		import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_WIDGETS;

		import android.content.ComponentName;
		import android.content.Context;
		@@ -46,7 +46,7 @@ public class ShortcutRequest {
		\| ShortcutQuery.FLAG_MATCH_MANIFEST;
		public static final int PINNED = ShortcutQuery.FLAG_MATCH_PINNED;

		private final ShortcutQuery mQuery = GO_DISABLE_SHORTCUTS ? null : new ShortcutQuery();
		private final ShortcutQuery mQuery = GO_DISABLE_WIDGETS ? null : new ShortcutQuery();

		private final Context mContext;
		private final UserHandle mUserHandle;
		@@ -73,7 +73,7 @@ public class ShortcutRequest {
		* @return A list of ShortcutInfo's associated with the given package.
		*/
		public ShortcutRequest forPackage(String packageName, @Nullable List<String> shortcutIds) {
		if (!GO_DISABLE_SHORTCUTS && packageName != null) {
		if (!GO_DISABLE_WIDGETS && packageName != null) {
		mQuery.setPackage(packageName);
		mQuery.setShortcutIds(shortcutIds);
		}
		@@ -81,7 +81,7 @@ public class ShortcutRequest {
		}

		public ShortcutRequest withContainer(@Nullable ComponentName activity) {
		if (!GO_DISABLE_SHORTCUTS) {
		if (!GO_DISABLE_WIDGETS) {
		if (activity == null) {
		mFailed = true;
		} else {
		@@ -92,7 +92,7 @@ public class ShortcutRequest {
		}

		public QueryResult query(int flags) {
		if (GO_DISABLE_SHORTCUTS \|\| mFailed) {
		if (GO_DISABLE_WIDGETS \|\| mFailed) {
		return QueryResult.DEFAULT;
		}
		mQuery.setQueryFlags(flags);
		@@ -108,7 +108,7 @@ public class ShortcutRequest {

		public static class QueryResult extends ArrayList<ShortcutInfo> {

		static final QueryResult DEFAULT = new QueryResult(GO_DISABLE_SHORTCUTS);
		static final QueryResult DEFAULT = new QueryResult(GO_DISABLE_WIDGETS);

		private final boolean mWasSuccess;

src/com/android/launcher3/util/ShortcutUtil.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ public class ShortcutUtil {
		* Returns true when we should show depp shortcuts in shortcut menu for the item.
		*/
		public static boolean supportsDeepShortcuts(ItemInfo info) {
		return isActive(info) && isApp(info) && !WidgetsModel.GO_DISABLE_SHORTCUTS;
		return isActive(info) && isApp(info) && !WidgetsModel.GO_DISABLE_WIDGETS;
		}

		/**