Merge "Using DiffUtil for calculating widget diff instead of a custom... (cc10ed55) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/widget/model/WidgetListSpaceEntry.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -33,9 +33,4 @@ public class WidgetListSpaceEntry extends WidgetsListBaseEntry {
		Collections.EMPTY_LIST);
		mPkgItem.title = "";
		}

		@Override
		public int getRank() {
		return RANK_WIDGETS_TOP_SPACE;
		}
		}

src/com/android/launcher3/widget/model/WidgetsListBaseEntry.java

+0 −24

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

		package com.android.launcher3.widget.model;

		import static java.lang.annotation.RetentionPolicy.SOURCE;

		import androidx.annotation.IntDef;

		import com.android.launcher3.model.WidgetItem;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.PackageItemInfo;
		import com.android.launcher3.widget.WidgetItemComparator;

		import java.lang.annotation.Retention;
		import java.util.List;
		import java.util.stream.Collectors;

		@@ -48,23 +43,4 @@ public abstract class WidgetsListBaseEntry {
		this.mWidgets =
		items.stream().sorted(new WidgetItemComparator()).collect(Collectors.toList());
		}

		/**
		* Returns the ranking of this entry in the
		* {@link com.android.launcher3.widget.picker.WidgetsListAdapter}.
		*
		* <p>Entries with smaller value should be shown first. See
		* {@link com.android.launcher3.widget.picker.WidgetsDiffReporter} for more details.
		*/
		@Rank
		public abstract int getRank();

		@Retention(SOURCE)
		@IntDef({RANK_WIDGETS_TOP_SPACE, RANK_WIDGETS_LIST_HEADER, RANK_WIDGETS_LIST_CONTENT})
		public @interface Rank {
		}

		public static final int RANK_WIDGETS_TOP_SPACE = 1;
		public static final int RANK_WIDGETS_LIST_HEADER = 2;
		public static final int RANK_WIDGETS_LIST_CONTENT = 3;
		}

src/com/android/launcher3/widget/model/WidgetsListContentEntry.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -61,12 +61,6 @@ public final class WidgetsListContentEntry extends WidgetsListBaseEntry {
		+ mMaxSpanSizeInCells;
		}

		@Override
		@Rank
		public int getRank() {
		return RANK_WIDGETS_LIST_CONTENT;
		}

		/**
		* Returns a copy of this {@link WidgetsListContentEntry} with updated
		* {@param maxSpanSizeInCells}.

src/com/android/launcher3/widget/model/WidgetsListHeaderEntry.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -85,12 +85,6 @@ public final class WidgetsListHeaderEntry extends WidgetsListBaseEntry {
		return "Header:" + mPkgItem.packageName + ":" + mWidgets.size();
		}

		@Override
		@Rank
		public int getRank() {
		return RANK_WIDGETS_LIST_HEADER;
		}

		public boolean isSearchEntry() {
		return mIsSearchEntry;
		}

src/com/android/launcher3/widget/picker/WidgetsDiffCallback.java

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.launcher3.widget.picker;

		import androidx.recyclerview.widget.DiffUtil.Callback;

		import com.android.launcher3.widget.model.WidgetsListBaseEntry;

		import java.util.List;

		/**
		* DiffUtil callback to compare widgets
		*/
		public class WidgetsDiffCallback extends Callback {

		private final List<WidgetsListBaseEntry> mOldEntries;
		private final List<WidgetsListBaseEntry> mNewEntries;

		public WidgetsDiffCallback(
		List<WidgetsListBaseEntry> oldEntries,
		List<WidgetsListBaseEntry> newEntries) {
		mOldEntries = oldEntries;
		mNewEntries = newEntries;
		}

		@Override
		public int getOldListSize() {
		return mOldEntries.size();
		}

		@Override
		public int getNewListSize() {
		return mNewEntries.size();
		}

		@Override
		public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
		// Items are same if they point to the same package entry
		WidgetsListBaseEntry oldItem = mOldEntries.get(oldItemPosition);
		WidgetsListBaseEntry newItem = mNewEntries.get(newItemPosition);
		return oldItem.getClass().equals(newItem.getClass())
		&& oldItem.mPkgItem.equals(newItem.mPkgItem);
		}

		@Override
		public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
		// Always update all entries since the icon may have changed
		return false;
		}
		}