Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing notifs after swipe" into tm-qpr-dev

Browse Source
This commit is contained in:
Lyn Han
2022-09-08 16:42:46 +00:00
committed by Android (Google) Code Review
parent 9962ee2c9f 076abc38ce
commit 61d96df6f2
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java
View File

@@ -170,7 +170,8 @@ public class Bubble implements BubbleViewProvider {
@VisibleForTesting(visibility = PRIVATE) @VisibleForTesting(visibility = PRIVATE)
public Bubble(@NonNull final String key, @NonNull final ShortcutInfo shortcutInfo, public Bubble(@NonNull final String key, @NonNull final ShortcutInfo shortcutInfo,
final int desiredHeight, final int desiredHeightResId, @Nullable final String title, final int desiredHeight, final int desiredHeightResId, @Nullable final String title,
int taskId, @Nullable final String locus, Executor mainExecutor) { int taskId, @Nullable final String locus, Executor mainExecutor,
final Bubbles.BubbleMetadataFlagListener listener) {
Objects.requireNonNull(key); Objects.requireNonNull(key);
Objects.requireNonNull(shortcutInfo); Objects.requireNonNull(shortcutInfo);
mMetadataShortcutId = shortcutInfo.getId(); mMetadataShortcutId = shortcutInfo.getId();
@@ -188,11 +189,12 @@ public class Bubble implements BubbleViewProvider {
mShowBubbleUpdateDot = false; mShowBubbleUpdateDot = false;
mMainExecutor = mainExecutor; mMainExecutor = mainExecutor;
mTaskId = taskId; mTaskId = taskId;
mBubbleMetadataFlagListener = listener;
} }
@VisibleForTesting(visibility = PRIVATE) @VisibleForTesting(visibility = PRIVATE)
public Bubble(@NonNull final BubbleEntry entry, public Bubble(@NonNull final BubbleEntry entry,
@Nullable final Bubbles.BubbleMetadataFlagListener listener, final Bubbles.BubbleMetadataFlagListener listener,
final Bubbles.PendingIntentCanceledListener intentCancelListener, final Bubbles.PendingIntentCanceledListener intentCancelListener,
Executor mainExecutor) { Executor mainExecutor) {
mKey = entry.getKey(); mKey = entry.getKey();
@@ -830,6 +832,7 @@ public class Bubble implements BubbleViewProvider {
pw.print(" desiredHeight: "); pw.println(getDesiredHeightString()); pw.print(" desiredHeight: "); pw.println(getDesiredHeightString());
pw.print(" suppressNotif: "); pw.println(shouldSuppressNotification()); pw.print(" suppressNotif: "); pw.println(shouldSuppressNotification());
pw.print(" autoExpand: "); pw.println(shouldAutoExpand()); pw.print(" autoExpand: "); pw.println(shouldAutoExpand());
pw.print(" bubbleMetadataFlagListener null: " + (mBubbleMetadataFlagListener == null));
if (mExpandedView != null) { if (mExpandedView != null) {
mExpandedView.dump(pw); mExpandedView.dump(pw);
} }

1
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
View File

@@ -309,6 +309,7 @@ public class BubbleController implements ConfigurationChangeListener {
protected void onInit() { protected void onInit() {
mBubbleData.setListener(mBubbleDataListener); mBubbleData.setListener(mBubbleDataListener);
mBubbleData.setSuppressionChangedListener(this::onBubbleMetadataFlagChanged); mBubbleData.setSuppressionChangedListener(this::onBubbleMetadataFlagChanged);
mDataRepository.setSuppressionChangedListener(this::onBubbleMetadataFlagChanged);
mBubbleData.setPendingIntentCancelledListener(bubble -> { mBubbleData.setPendingIntentCancelledListener(bubble -> {
if (bubble.getBubbleIntent() == null) { if (bubble.getBubbleIntent() == null) {

1
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java
View File

@@ -158,7 +158,6 @@ public class BubbleData {
@Nullable @Nullable
private Listener mListener; private Listener mListener;
@Nullable
private Bubbles.BubbleMetadataFlagListener mBubbleMetadataFlagListener; private Bubbles.BubbleMetadataFlagListener mBubbleMetadataFlagListener;
private Bubbles.PendingIntentCanceledListener mCancelledListener; private Bubbles.PendingIntentCanceledListener mCancelledListener;

11
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDataRepository.kt
View File

@@ -25,6 +25,7 @@ import android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LA
import android.content.pm.UserInfo import android.content.pm.UserInfo
import android.os.UserHandle import android.os.UserHandle
import android.util.Log import android.util.Log
import com.android.wm.shell.bubbles.Bubbles.BubbleMetadataFlagListener
import com.android.wm.shell.bubbles.storage.BubbleEntity import com.android.wm.shell.bubbles.storage.BubbleEntity
import com.android.wm.shell.bubbles.storage.BubblePersistentRepository import com.android.wm.shell.bubbles.storage.BubblePersistentRepository
import com.android.wm.shell.bubbles.storage.BubbleVolatileRepository import com.android.wm.shell.bubbles.storage.BubbleVolatileRepository
@@ -47,6 +48,13 @@ internal class BubbleDataRepository(
private val ioScope = CoroutineScope(Dispatchers.IO) private val ioScope = CoroutineScope(Dispatchers.IO)
private var job: Job? = null private var job: Job? = null
// For use in Bubble construction.
private lateinit var bubbleMetadataFlagListener: BubbleMetadataFlagListener
fun setSuppressionChangedListener(listener: BubbleMetadataFlagListener) {
bubbleMetadataFlagListener = listener
}
/** /**
* Adds the bubble in memory, then persists the snapshot after adding the bubble to disk * Adds the bubble in memory, then persists the snapshot after adding the bubble to disk
* asynchronously. * asynchronously.
@@ -197,7 +205,8 @@ internal class BubbleDataRepository(
entity.title, entity.title,
entity.taskId, entity.taskId,
entity.locus, entity.locus,
mainExecutor mainExecutor,
bubbleMetadataFlagListener
) )
} }
} }