aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix errorprone warnings" into main am: 8a281b4ef8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/3464325

Change-Id: I6aba6d6e91489d7ed319be2a76b2b1d5f850e700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2025-01-28 19:38:45 -08:00
committed by Automerger Merge Worker
parent b7ea931aee 8a281b4ef8
commit b6e2e21180
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/BubbleTextView.java
View File

@@ -1106,7 +1106,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
public void applyDotState(ItemInfo itemInfo, boolean animate) {
if (mIcon instanceof FastBitmapDrawable) {
if (mIcon != null) {
boolean wasDotted = mDotInfo != null;
mDotInfo = mActivity.getDotInfoForItem(itemInfo);
boolean isDotted = mDotInfo != null;

2
src/com/android/launcher3/Workspace.java
View File

@@ -1750,7 +1750,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
}
final DragView dv;
if (contentView instanceof View) {
if (contentView != null) {
dv = mDragController.startDrag(
contentView,
draggableView,

22
src/com/android/launcher3/search/StringMatcherUtility.java
View File

@@ -127,17 +127,17 @@ public class StringMatcherUtility {
if (query == null || target == null) {
return false;
}
switch (mCollator.compare(query, target)) {
case 0:
return true;
case -1:
// The target string can contain a modifier which would make it larger than
// the query string (even though the length is same). If the query becomes
// larger after appending a unicode character, it was originally a prefix of
// the target string and hence should match.
return mCollator.compare(query + MAX_UNICODE, target) > -1;
default:
return false;
int compare = mCollator.compare(query, target);
if (compare == 0) {
return true;
} else if (compare < 0) {
// The target string can contain a modifier which would make it larger than
// the query string (even though the length is same). If the query becomes
// larger after appending a unicode character, it was originally a prefix of
// the target string and hence should match.
return mCollator.compare(query + MAX_UNICODE, target) >= 0;
} else {
return false;
}
}