Commit Graph

12721 Commits

Author SHA1 Message Date
Zoey Chen
d13e721d2e Merge "[Le Audio] Add a new BroadcastDialog in SystemUI from MediaPanel" into tm-qpr-dev 2022-05-30 02:54:02 +00:00
Beth Thibodeau
1d1c0a90e8 Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 am: 9854e5d1fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I578b92280ba09630ac2b293dea8c21a18de82165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-28 02:49:02 +00:00
Beth Thibodeau
9854e5d1fb Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I58d9a69cf30cc28fbc3fb6aa7efdab7944664872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-28 02:32:49 +00:00
TreeHugger Robot
677db6dba8 Merge "Ignore group alert setting when opening bubbles" into tm-qpr-dev 2022-05-27 20:45:56 +00:00
Beth Thibodeau
fc384f5a18 Add check for null token when updating state
MediaController requires a non-null token as input, which updateState
did not check before calling. The token is required to be non-null
already for active media, but it can be null for resume players, so it's
possible for users to hit a race condition between the notification
removal (token set to null) and a final PlaybackState update (attempting
to use the token).

Also added an annotation to the MediaControllerFactory method so that Kotlin
code is aware of this requirement.

Fixes: 231733532
Test: atest MediaDataManagerTest
Change-Id: Id5e4a52cba74fafa04331a663cd4ce870fe920a2
2022-05-27 15:42:49 -05:00
Jeff DeCew
1ec95ed15c Merge "Remove HeadsUpCoordiator's lifetime extension on action press." into tm-qpr-dev 2022-05-27 20:21:35 +00:00
James O'Leary
edffcc4d43 Merge changes from topic "themesMay2322" into tm-dev am: f5fff77bf8 am: ee60a27cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581098

Change-Id: I977b8d363a7e50abd443e037149cbb8652aa5002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:11:08 +00:00
James O'Leary
ee60a27cf7 Merge changes from topic "themesMay2322" into tm-dev am: f5fff77bf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581098

Change-Id: I94b89e33292bcd83203da8eaac3d5ebbabf4cd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:50:53 +00:00
James O'Leary
f5fff77bf8 Merge changes from topic "themesMay2322" into tm-dev
* changes:
  Update ColorScheme.toString() formatting
  Match latest variant spec; update hue rotation logic
  Match Android's colors to design intent
2022-05-27 16:40:18 +00:00
Zoey Chen
7c86f9eff6 [Le Audio] Add a new BroadcastDialog in SystemUI from MediaPanel
Figma: https://screenshot.googleplex.com/cxMh67ua33Zc9W9.png
Screenshot: https://hsv.googleplex.com/5949719982374912
Screenshot: https://hsv.googleplex.com/5356807666008064

Bug: 228415131
Test: manual, atest MediaControlPanelTest, atest MediaDeviceManagerTest
Change-Id: Ic2984aa0caee299ce405d5581c9c063656e7b296
2022-05-27 14:01:55 +00:00
Ats Jenk
a08dfd344e Ignore group alert setting when opening bubbles
When notifications are shown in a group, group alert setting can be set
to GROUP_ALERT_SUMMARY to notify the user only once per group.
Regardless of this alert setting, user is still allowed to bubble
individiual notifications in a group (button is shown).
Issue was that our check if a notification can be bubbled was applying
the check for alerting on a child notification in a group. Which is not
needed as bubbling should be allowed regardless.
Removing the check for bubbles.

Bug: 214130620
Test: atest NotificationInterruptStateProviderImplTest
Test: manually verified that when there are multiple notifications from
Telegram, they can be opened as bubbles
Test: manually verified with Messages that notifications in a group can
be opened as bubbles

Change-Id: I01258e0db041b8eb04160242f4fd9a875315ad3d
2022-05-26 16:23:54 -07:00
James O'Leary
49fa723e9c Match latest variant spec; update hue rotation logic
- Update a couple rotations to match spec (ex. rotation occurs at 151
degrees instead of 141)
- If hue rotation specs have an entry at 0 degrees, they also need an
entry at 360 degrees. There's no way to determine that, for example,
321 is between 315 and 0, 360 must be listed.
- Find hue rotation in a way that ensures ex. an angle isn't tested for
being between 0 and 360 degrees, as that will always return true.
Instead, use first element, (always 0 degrees), check if angle is
between and the next element, and stop once the next element is 360
degrees (always the last element in the array)
- Remove code that became unused after the above change.

Test: atest ColorSchemeTest (unit test); atest SystemPaletteTest (CTS).
Spent ~4 hours trying a variety of wallpapers, and seed colors, and
used dumpsys to verify results match UX spec. Create spreadsheet for UX
to fill out their spec, then another spreadsheet that contains the
dumpsys results for blue/red/yellow/green seed colors across all theme
variants, and the preset colors for Ice Cream and Fruit Salad variants.
Confirmed the runtime results, as reported by dumpsys, match the spec
in all cases.
Bug: 213314628
Change-Id: Id35faa294bf82c0e81c2690c65c42218a87c236a
2022-05-26 19:52:52 +00:00
Flare Chiu
802d9387bd Merge "Revert "Run unlock animation on MODE_ONLY_WAKE"" into tm-dev am: 39f79b0fad am: dbb2c0886d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18610066

Change-Id: Idabfc00e6ea8261bb50ee20574e04a480b0bc7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:45:26 +00:00
Flare Chiu
dbb2c0886d Merge "Revert "Run unlock animation on MODE_ONLY_WAKE"" into tm-dev am: 39f79b0fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18610066

Change-Id: Idc35d94562677c77f0fa5044acb6b78779018bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:09:41 +00:00
Flare Chiu
39f79b0fad Merge "Revert "Run unlock animation on MODE_ONLY_WAKE"" into tm-dev 2022-05-26 13:31:45 +00:00
Flare Chiu
776d4ec451 Revert "Run unlock animation on MODE_ONLY_WAKE"
This reverts commit 5481291dca.

Reason for revert: DroidMonitor: Potential culprit for Bug 233958841 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I4f28fac9784da045866bb592c163f834c0dc856b
2022-05-26 03:24:59 +00:00
TreeHugger Robot
d98578c101 Merge "Run unlock animation on MODE_ONLY_WAKE" into tm-dev am: e196a94cba am: 37a6f17a9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18595501

Change-Id: I0d132639166b939c59e6eaf54f949900c27a5cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 23:39:18 +00:00
TreeHugger Robot
37a6f17a9b Merge "Run unlock animation on MODE_ONLY_WAKE" into tm-dev am: e196a94cba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18595501

Change-Id: I6dedd9e7ef58e3d6feb5f397fb836c0dc2afba7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 23:12:27 +00:00
TreeHugger Robot
e196a94cba Merge "Run unlock animation on MODE_ONLY_WAKE" into tm-dev 2022-05-25 23:03:07 +00:00
Jeff DeCew
96e6e1cc4d Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb8785 am: b3d48b82bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581099

Change-Id: I29bd21445e7f0d7437140b20bfb1ae4c53c3c817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 15:15:23 +00:00
Jeff DeCew
b3d48b82bb Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb8785
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581099

Change-Id: Ie49d9b3fe6cf62f8a27bcc07b267510528dc898f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 14:58:24 +00:00
Matt Pietal
5481291dca Run unlock animation on MODE_ONLY_WAKE
When the screen times out, the device may not immediately lock based
upon a user setting. In this case, keyguard is visible but not fully
locked. If the user uses bio auth, MODE_ONLY_WAKE is used but the
keyguard is not properly dismissed. Issue a call to keyguardDone so
that the correct animation is shown.

Fixes: 231553219
Test: atest BiometricsUnlockControllerTest

Change-Id: Ib3fa05f2a1054b122a80ca5d27b0a99d12dd27f2
2022-05-25 10:46:00 -04:00
Jeff DeCew
c003cb8785 Revert suppression of recalculation to fix jump after aod->ls animation
The change I6575f733b17d6c8905150c0a7854d752dd0a5cfe suppressed recalculation of the number of notifications whenever dozeAmount != 0.  However, this meant that from the time the device was locked to the time it finished the screen on animation, the number of notifications that fit on the device was never updated.  In cases where notifications changed while on aod, this meant the number could be completely wrong.  But even without that, this meant that when locking the device and then unlocking, the count would be based on the height of the notifications given their non-keyguard expansion state (i.e. first notification expanded) which meant that we almost always showed too few notifications during the aod->ls transition.

I am unable to reproduce b/229882633 (which that CL was fixing) until I also revert I139d25e2bb57257a18f18f6288f3e18b7a1b72d1 which landed a week later.

Bug: 229882633
Fixes: 232079794
Test: atest NotificationPanelViewControllerTest
Test: numerous failed attempts to reproduce b/229882633#comment2
Test: unlock; screen off (to aod); screen on (to ls); observe no jumps
Test: post notify notifications with "no text" ; slow animations; lock; aod -> ls; post notifications via shell during animation; observe no jumps during or at end of animation
Change-Id: Ib3a3c6377a71cc4c1a1b06eb652237a5493a56d0
2022-05-25 10:59:29 +00:00
Jeff DeCew
351e90af38 Remove HeadsUpCoordiator's lifetime extension on action press.
Fixes: 233864220
Test: atest HeadsUpCoordinatorTest
Change-Id: I10ca619b2d863d35c3c8204561081aa6479146d2
2022-05-25 10:50:58 +00:00
Lyn Han
be0f9f70d4 Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3fd am: 0dd9f89200
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566290

Change-Id: I89bdf35e00f0e1c822720b153619a8daa7b453f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:19:52 +00:00
Lyn Han
0dd9f89200 Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566290

Change-Id: I05724615a419501bbf88b6f2305899b71ef12782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:02:19 +00:00
Lyn Han
5bcfb4c3fd Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev 2022-05-25 02:49:22 +00:00
TreeHugger Robot
ad395487d1 Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8ec3 am: 98a9953334
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577092

Change-Id: I1e2c3e27fe426c28e7d211922b5c37eb531b19bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:34:58 +00:00
TreeHugger Robot
98a9953334 Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8ec3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577092

Change-Id: I6daa729fb8d09005fa84ecbc54d450da257238f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:15:03 +00:00
TreeHugger Robot
27a45d8ec3 Merge changes I0ababa6b,I1a1ad69b into tm-dev
* changes:
  Run cancelAction if bouncer is canceled
  Fix bouncer flicker on lockscreen shade transition
2022-05-24 21:49:10 +00:00
Lyn Han
849235c84c Merge "Fix white line before shelf on lockscreen" into tm-dev am: 565c12dd94 am: ed0976bfa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18132915

Change-Id: Iaa549961520a906a53c6dd799a7715166cd70867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:40:41 +00:00
Lyn Han
ed0976bfa6 Merge "Fix white line before shelf on lockscreen" into tm-dev am: 565c12dd94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18132915

Change-Id: I041cd00443e444f56e01f313e06afc80f7df4943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:38:17 +00:00
Lyn Han
565c12dd94 Merge "Fix white line before shelf on lockscreen" into tm-dev 2022-05-24 19:34:01 +00:00
Lyn Han
8352301fa7 Revert "Make media squishy for portrait shade open and close"
This reverts commit 3f2eea4703.

Reason for revert: http://b/229046375 - slower shade open when shade is full

Change-Id: I65d627310986cafd01e32ccaba4050c62b4c1253
2022-05-24 12:11:08 -07:00
TreeHugger Robot
803622fd23 Merge "Inflate media notification icons in MediaCoordinator" into tm-dev am: e76c9147b6 am: 19fdc6a19e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432858

Change-Id: Iaa34105cf572bf53eb56cac95573afe0a7266ddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 16:12:51 +00:00
TreeHugger Robot
19fdc6a19e Merge "Inflate media notification icons in MediaCoordinator" into tm-dev am: e76c9147b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432858

Change-Id: I9e36e6b89e17a1fd0cb4db98041e40689ce381f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 16:11:02 +00:00
TreeHugger Robot
e76c9147b6 Merge "Inflate media notification icons in MediaCoordinator" into tm-dev 2022-05-24 15:46:36 +00:00
Matt Pietal
1de979862b Run cancelAction if bouncer is canceled
The cancelAction was never run on non-UDFPS devices when the bouncer
was canceled. The check for bouncerIsOrWillBeShowing() will always be
true, so move the call to cancel AFTER the bouncer hide() invocation.

Fixes: 233741191
Test: atest StatusBarKeyguardViewManagerTest
Change-Id: I0ababa6b69cdc3fea558c063a8d3839172470ee1
2022-05-24 11:31:46 -04:00
Matt Pietal
1736839a69 Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0f6 am: 04c8307b4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167

Change-Id: I1fed977891faaa0622a95dcad860f0b4827326b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:22:43 +00:00
Matt Pietal
04c8307b4b Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167

Change-Id: I53a35ece2fca66f4a4db8233359a48f02e454bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:03:09 +00:00
Matt Pietal
468ccad0f6 Merge "[LockScreen] Update bar state in NPVC." into tm-dev 2022-05-24 13:41:26 +00:00
Shawn Lin
7c604236cc Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev am: 15cb562bcd am: 02c07a76ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485561

Change-Id: Ifab44e33ac17ab673954019236b74f1fe4bfa4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 04:11:22 +00:00
Shawn Lin
02c07a76ba Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev am: 15cb562bcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485561

Change-Id: Ic3858acd6fa4b2f686a124685d977bb3bc1b06e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 02:50:03 +00:00
Shawn Lin
15cb562bcd Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev 2022-05-24 02:30:28 +00:00
TreeHugger Robot
fd77d42f79 Merge "Use doze amount to ensure notification stability when going to sleep" into tm-qpr-dev 2022-05-24 01:44:18 +00:00
Aaron Liu
036054e88c [LockScreen] Update bar state in NPVC.
When view is attached to window in NPVC, we add a listener to the bar
state controller; however we do not update to the existing bar state if
any. This means that if the listener is added before the bar state
change is made, then we will default to 0 (SHADE) for NVPC. We have
experienced strange LS states because of this.

Bug: 230911766
Test: Added a 5s delay to adding the callback to experience the weird
state. Added a unit test.

Change-Id: Ieb6d6537eb002b03beceef6f701b826df48feeeb
2022-05-23 23:55:15 +00:00
Nate Myren
9943d0ac60 Merge "Update Safety Tile config value" into tm-dev am: 32cc80fe88 am: f12e01d130
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18495743

Change-Id: I54b8afae89847d15dbba8134b0ccb803446839f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 23:01:49 +00:00
Nate Myren
f12e01d130 Merge "Update Safety Tile config value" into tm-dev am: 32cc80fe88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18495743

Change-Id: I8410cefcf463fea7b49967980476f4c2f2f92612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 22:34:41 +00:00
Nate Myren
32cc80fe88 Merge "Update Safety Tile config value" into tm-dev 2022-05-23 21:29:06 +00:00
Julia Tuttle
29ce997ade Inflate media notification icons in MediaCoordinator
In the old pipeline, notifications were inflated before the media
notification(s) were filtered out and used to populate the quick
settings, lockscreen, or AOD media views.

In the new pipeline, MediaCoordinator filters out media notifications
before PreparationCoordinator inflates them, so they're never inflated.

This is mostly okay, except that the AOD (and maybe lockscreen?) media
views use one of the media notification's icons to label the media
metadata, and that icon was no longer getting inflated.

Therefore, have MediaCoordinator do the necessary subset of the work of
PreparationCoordinator for the media notifications it filters out:
create and update icons for notifications it filters out, report
inflation errors back to StatusBarService, and do the bookkeeping
necessary to do the right thing (create, update, or nothing) each time
we see a notification.

Bug: 228397680
Test: atest MediaCoordinatorTest (added some test cases)
Change-Id: Ic42c276e5a973cdd260a8c4729a5abdf53987199
2022-05-23 16:15:40 -04:00