Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
779,506 Commits 3 Branches 0 Tags
7d779b689dd06b3ba04708d3f6212570bb9986df
Commit Graph

779506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Caitlin Shkuratov
7d779b689d [Dock Defend] Ensure the bottom of the battery icon is always aligned 
with the bottom of the other icons, even if the shield is displayed.

Bug: 255625888
Test: manual: Verify battery icon bottom stays aligned with other icon
bottoms both with and without the shield. See video attached to bug.
Change-Id: Ib203e8ce27d515a177e8371958fa43ecf8b20e74

Change-Id: I1d8c53cc2beae90f6dca14cf339733bfb085a56e
 2022-11-11 19:13:54 +00:00
Caitlin Shkuratov
1b65e52344 [Dock Defend] Add an optional shield to the status bar battery drawable. 
The shield will be displayed when the battery is marked as overheated.

Bug: 255625888
Test: manual: issue `adb shell am broadcast -a com.android.systemui.demo
-e command battery -e overheated true` and verify the battery icon
displays a shield
Test: See bug for manual demo video
Test: statusbar.battery tests

Change-Id: I6b3036ae47ad7b5ae8dc78f83d019130935c9b50
 2022-11-11 19:13:49 +00:00
Matt Pietal
2c34290e87 Merge changes I645115ab,I73b51987,Id1b79253 into tm-qpr-dev 
* changes:
  Scrims - Don't blend with bouncer when shade is collapsing
  Transitions - Add dreaming state
  Transitions - Make them cancelable
 2022-11-10 20:51:06 +00:00
Aaron Liu
7b0af20371 Merge "[Bouncer] Move bouncer title to bottom." into tm-qpr-dev 2022-11-10 20:08:41 +00:00
Evan Laird
559acbfde9 Merge "Enable network type icon overlays by carrier Id" into tm-qpr-dev 2022-11-10 20:01:23 +00:00
Aaron Liu
d4286fa1a8 Merge "[Bouncer] Set message for dismiss api." into tm-qpr-dev 2022-11-10 19:47:54 +00:00
Vinit Nayak
3f1d875795 Merge "Improve Split portrait gesture animation" into tm-qpr-dev 2022-11-10 19:19:39 +00:00
Yalan Yiue
2d5c31acdf Merge "[Partial Screensharing] Hide 'show touches' in SysUI Recorder" into tm-qpr-dev 2022-11-10 19:11:22 +00:00
TreeHugger Robot
2aea66b332 Merge "Don't dismiss the keyguard from the binder thread" into tm-qpr-dev 2022-11-10 18:57:13 +00:00
TreeHugger Robot
0f8d00ae59 Merge "Show the "Face unlock unavailable" message on bouncer as well" into tm-qpr-dev 2022-11-10 18:25:21 +00:00
Michał Brzeziński
193046441b Merge "Fixing scrims jumping when media player state changes" into tm-qpr-dev 2022-11-10 18:22:55 +00:00
Yasin Kilicdere
e9bad1ca98 Merge "Add traces to WallpaperManagerService and WallpaperService." into tm-qpr-dev 2022-11-10 17:57:36 +00:00
Michael Mikhail
d1cf8adeda Merge "[Media TTT] Displayed View Keeps Screen On" into tm-qpr-dev 2022-11-10 17:26:26 +00:00
TreeHugger Robot
a6cdf01a6b Merge "Fixed permananent failure behaviors" into tm-qpr-dev 2022-11-10 17:25:24 +00:00
Kriti Dang
7239296def Merge "Retrive the value of user-pref, if its not stored in persistentDataStore" into tm-qpr-dev 2022-11-10 17:14:55 +00:00
Kriti Dang
b1f110a768 Merge "Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode.""" into tm-qpr-dev 2022-11-10 17:14:55 +00:00
Fabian Kozynski
07c35c080f [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours am: b88d1edcf5 -s ours am: 3d8fd88272 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I37f89a43532ef333cb65bbd62c154932244a69bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 17:12:03 +00:00
Fabian Kozynski
eabe13f80b [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours am: 6135ae4a38 -s ours am: a8120f3a4d -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I87b003218a6bcf96019a774356dc6bdf23849f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 17:11:50 +00:00
Fabian Kozynski
3d8fd88272 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours am: b88d1edcf5 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I793ccf4f6b248d2417dfe07a7d9661dc87504c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 16:43:14 +00:00
Fabian Kozynski
a8120f3a4d [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours am: 6135ae4a38 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I45a4eedd7af3193445464c06dc1673a37b7b97f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 16:43:12 +00:00
Fabian Kozynski
b88d1edcf5 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: Ie79f598c7f3b076bdbb38ae3d02c95eda31e12c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:56:33 +00:00
Fabian Kozynski
6135ae4a38 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I0b1dea98270d93b3187ed63e711409030c24bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:55:45 +00:00
Fabian Kozynski
5354054d12 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I6ff27e2d1318aac7a78609a1ec48614ccf6dba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:28:40 +00:00
Fabian Kozynski
ec9ad94152 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I2b7706b9ae0f0121b4c7df09e91c01b741435cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:28:27 +00:00
Evan Laird
bb7f96387d Enable network type icon overlays by carrier Id 
This CL builds out a new configuration resource
`carrierid_icon_overrides`, and a format that allows for overriding a
known network type with an arbitrary icon.

We store a mapping of all known carrierId overrides that exist, and
check for an override for the `carrierId & networkType` combination at
runtime.

This CL also caches the calculation in SystemUI since it represents a
new expensive calculation potential at the time of display for the icon.

Lastly, add demo mode command parsing for carrierId

Test: atest MobileStateTest; atest NetworkControllerDataTest
Test: manual using `-e carrierid <id>` network subcommand
Bug: 241996752
Change-Id: Id0e8acf179db5c3a70f4caf31e58f8d8040690a0
 2022-11-10 10:04:50 -05:00
Fabian Kozynski
1afdf37316 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: Ib99c0417de67f2dbfbd8ad71ab38ea503d210936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 14:59:46 +00:00
Fabian Kozynski
3f4a4083e3 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I7d395ec75d402c5a207b340ed5e34dca5f1abbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 14:59:42 +00:00
Jason Mylen
b4c0589530 Merge "Remove conflicting vibration-only haptic causing inconsistent touch feedback." into tm-qpr-dev 2022-11-10 14:43:01 +00:00
Fabian Kozynski
7515e83e2b Merge changes I61922e99,I656b81fe into tm-qpr-dev 
* changes:
  Add code for collecting panel activity component
  Add meta data for panel
 2022-11-10 14:25:02 +00:00
Fabian Kozynski
39357500b7 Merge "Disable click on privacy chip before provision" into sc-dev 2022-11-10 14:19:46 +00:00
Matt Pietal
314d44fec2 Scrims - Don't blend with bouncer when shade is collapsing 
In the case of having transitioned back to KEYGUARD state, never blend
with the bouncer scrims unless the bouncer is actively in
transit. This prevents the scrim from flashing after collapsing the
shade over lockscreen.

Fixes: 248405303
Test: atest ScrimControllerTest
Test: manually display shade, lockscreen, bouncer and change dark modes
Change-Id: I645115abeb09822a99508b9d9f1fc974b7ce31be
 2022-11-10 13:33:39 +00:00
Naomi Musgrave
f509069081 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b am: 4bcc341683 am: 34554688b3 am: 36a89352b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I5731a9093631a5b38f025ea4bd3e5da30fbb2529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 13:15:08 +00:00
Naomi Musgrave
24906beaf4 Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24 am: 7dbcebf2ae am: 35bed006a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I617347ee10a1c87cd04d443ffb23953ee5ae927b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 13:14:56 +00:00
Matt Pietal
a9094c9563 Transitions - Add dreaming state 
Add support for states in and out of dreaming. At the moment, AOD is
equivalent to DOZING but these will be separated out in the future.

Test: atest KeyguardTransitionRepositoryTest
KeyguardRepositoryImplTest
Bug: 195430376

Change-Id: I73b51987f01540cc3d321f23286a3344d0847f9c
 2022-11-10 13:13:41 +00:00
Matt Pietal
d3783f7bac Transitions - Make them cancelable 
Data layer - Add 'isKeyguardGoingAway' information, allow transitions
to be cancelable and add in Cancel state.

Domain layer - Listen for state transitions and then attempt to
cancel/interrupt them under the right circumstances, such as when the
power button is pressed in the middle of an aod -> lockscreen
transition.

Bouncer fixes - hide() was never called when using the back gesture,
resulting in incorrect bouncer state.

Test: atest KeyguardTransitionRepositoryTest
KeyguardRepositoryImplTest KeyguardBouncerTest BouncerInteractorTest
Bug: 195430376

Change-Id: Id1b79253ab6334e8e5941c89e94e267126b08ecb
 2022-11-10 13:02:19 +00:00
Naomi Musgrave
36a89352b6 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b am: 4bcc341683 am: 34554688b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I6a49b023d6ed14bf2a3759ab86376819c0b808b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 12:44:26 +00:00
Naomi Musgrave
35bed006a0 Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24 am: 7dbcebf2ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I54e9460a4f8f655b941ded5472e18fbc34058b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 12:44:18 +00:00
Chandru
4fc67c1e80 Show the "Face unlock unavailable" message on bouncer as well 
Other changes:
  - Updates the char limit on face unlock unavailable message
  - https://localization.google.com/query/10894717

Fixes: 247688462
Test: atest KeyguardIndicationControllerTest
Change-Id: I8341db47318a2cf00b04aaf9f42e8ab0392b46fe
 2022-11-10 12:12:49 +00:00
Naomi Musgrave
34554688b3 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b am: 4bcc341683 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I253b9569c522386b35988e3a93c2772032287952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:59:13 +00:00
Naomi Musgrave
7dbcebf2ae Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I3589a3b1582e0112f991b02d4712b450033ae889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:58:30 +00:00
Naomi Musgrave
4bcc341683 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I2559c38571060d6a80ee540e38304c5db3912da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:46:44 +00:00
Naomi Musgrave
4f9eeddd24 Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I7f90c6b8522de5a5a5a9a6c521ee23222bfb2773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:32:04 +00:00
Naomi Musgrave
abe61d163b Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I618ec4e09eb7565214e635516981d8737bf6c750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:31:57 +00:00
Naomi Musgrave
6c525cb8cd Merge "Ignore failing tests to unblock presubmit" into sc-dev 2022-11-10 11:09:44 +00:00
Naomi Musgrave
4937db2448 Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev 
* changes:
  [automerge] Ignore failing tests to unblock presubmit 2p: f7d94af58a
  Ignore failing tests to unblock presubmit
 2022-11-10 11:09:44 +00:00
Rhed Jao
8d6647d473 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-qpr-dev am: cd8ca0377a -s ours am: ace29d1a74 -s ours am: 9311d2ddbd -s ours am: d6d9543d55 -s ours am: 9b6a6d8ff1 -s ours am: ffa19755af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief8ed38e7ad14d673f8eb15d4fcc8f49527dca6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:03:05 +00:00
Rhed Jao
4288bc3c32 [automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 0015463fac -s ours am: 2fba984433 -s ours am: 7bebc7276f -s ours am: 57c63f5646 -s ours am: d3aa9a113a -s ours am: 01fba79a63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27c560d7c8731f51fc054644ea160750e1a7294e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:03:00 +00:00
Jackal Guo
729bbe7d4a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev am: efd2f4cdcb am: 9e9dcb3da2 -s ours am: aab929d14a -s ours am: 90638d62d1 -s ours am: 522804796b -s ours am: 4d418d2a08 -s ours am: f293f84763 -s ours am: 8b0e49fe9a -s ours am: de43adf7a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id804882164e4e02f03bcd5a492a5d1e3d329925d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:02:45 +00:00
Jackal Guo
997575a8e8 [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 8b2e092146 am: 0b7ea025f1 -s ours am: ccd922ec12 -s ours am: 586eb03a2f -s ours am: 496bd133c6 -s ours am: 69aa04ff54 -s ours am: 228e969aa9 -s ours am: 3f29198e29 -s ours am: e07cff290b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07f661ec95f89f945aaa5a7ef65b3c662677600a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:02:37 +00:00
yyalan
e17b87946d [Partial Screensharing] Hide 'show touches' in SysUI Recorder 
Disable and hide 'Show Touches' Switch when Single App is selected as the screen share option.

Bug: 241366482
Test: com.android.systemui.screenrecord.ScreenRecordPermissionDialogTest
Change-Id: I7344669b0a08ea971c76950bac429152711f3fda
 2022-11-10 10:45:21 +00:00