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

Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev am: 4de2f90856

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002365

Change-Id: Ibbf649e9a2713b694da2719fdc14d7e5de4e83ed
This commit is contained in:
Mady Mellor
2021-06-16 20:43:38 +00:00
committed by Automerger Merge Worker
parent 958a05c7df 4de2f90856
commit 8b1c336522
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
View File

@@ -288,6 +288,7 @@ public class BubblesTest extends SysuiTestCase {
// TODO: Fix // TODO: Fix
mPositioner = new TestableBubblePositioner(mContext, mWindowManager); mPositioner = new TestableBubblePositioner(mContext, mWindowManager);
mPositioner.setMaxBubbles(5);
mBubbleData = new BubbleData(mContext, mBubbleLogger, mPositioner, syncExecutor); mBubbleData = new BubbleData(mContext, mBubbleLogger, mPositioner, syncExecutor);
TestableNotificationInterruptStateProviderImpl interruptionStateProvider = TestableNotificationInterruptStateProviderImpl interruptionStateProvider =

1
packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java
View File

@@ -233,6 +233,7 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase {
when(mZenModeController.getConfig()).thenReturn(mZenModeConfig); when(mZenModeController.getConfig()).thenReturn(mZenModeConfig);
mPositioner = new TestableBubblePositioner(mContext, mWindowManager); mPositioner = new TestableBubblePositioner(mContext, mWindowManager);
mPositioner.setMaxBubbles(5);
mBubbleData = new BubbleData(mContext, mBubbleLogger, mPositioner, syncExecutor); mBubbleData = new BubbleData(mContext, mBubbleLogger, mPositioner, syncExecutor);
TestableNotificationInterruptStateProviderImpl interruptionStateProvider = TestableNotificationInterruptStateProviderImpl interruptionStateProvider =

12
packages/SystemUI/tests/src/com/android/systemui/wmshell/TestableBubblePositioner.java
View File

@@ -22,9 +22,11 @@ import android.graphics.Insets;
import android.graphics.Rect; import android.graphics.Rect;
import android.view.WindowManager; import android.view.WindowManager;
import com.android.wm.shell.R;
import com.android.wm.shell.bubbles.BubblePositioner; import com.android.wm.shell.bubbles.BubblePositioner;
public class TestableBubblePositioner extends BubblePositioner { public class TestableBubblePositioner extends BubblePositioner {
private int mMaxBubbles;
public TestableBubblePositioner(Context context, public TestableBubblePositioner(Context context,
WindowManager windowManager) { WindowManager windowManager) {
@@ -33,5 +35,15 @@ public class TestableBubblePositioner extends BubblePositioner {
updateInternal(Configuration.ORIENTATION_PORTRAIT, updateInternal(Configuration.ORIENTATION_PORTRAIT,
Insets.of(0, 0, 0, 0), Insets.of(0, 0, 0, 0),
new Rect(0, 0, 500, 1000)); new Rect(0, 0, 500, 1000));
mMaxBubbles = context.getResources().getInteger(R.integer.bubbles_max_rendered);
}
public void setMaxBubbles(int max) {
mMaxBubbles = max;
}
@Override
public int getMaxBubbles() {
return mMaxBubbles;
} }
} }