Update creationFlag state only on non PSApp
Essentially reverting original change with the current test passing now. bug: 401529887 Test: atest BubbleTextView Flag: EXEMPT bug fix Change-Id: Id12672cbdf66960915c4dcf75329f0c5df21ce4c
This commit is contained in:
@@ -22,6 +22,7 @@ import static android.text.Layout.Alignment.ALIGN_NORMAL;
|
||||
|
||||
import static com.android.launcher3.Flags.enableContrastTiles;
|
||||
import static com.android.launcher3.Flags.enableCursorHoverStates;
|
||||
import static com.android.launcher3.allapps.AlphabeticalAppsList.PRIVATE_SPACE_PACKAGE;
|
||||
import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
|
||||
import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE;
|
||||
import static com.android.launcher3.icons.BitmapInfo.FLAG_SKIP_USER_BADGE;
|
||||
@@ -99,6 +100,7 @@ import com.android.launcher3.views.FloatingIconViewCompanion;
|
||||
import java.text.NumberFormat;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* TextView that draws a bubble behind the text. We cannot use a LineBackgroundSpan
|
||||
@@ -483,7 +485,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
|
||||
}
|
||||
|
||||
private void setNonPendingIcon(ItemInfoWithIcon info) {
|
||||
int flags = shouldUseTheme() ? FLAG_THEMED : info.bitmap.creationFlags;
|
||||
// Set nonPendingIcon acts as a restart which should refresh the flag state when applicable.
|
||||
int flags = Objects.equals(info.getTargetPackage(), PRIVATE_SPACE_PACKAGE)
|
||||
? info.bitmap.creationFlags : shouldUseTheme() ? FLAG_THEMED : 0;
|
||||
// Remove badge on icons smaller than 48dp.
|
||||
if (mHideBadge || mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {
|
||||
flags |= FLAG_NO_BADGE;
|
||||
|
||||
Reference in New Issue
Block a user