Commit Graph

751507 Commits

Author SHA1 Message Date
Tom Natan
2fc7d892bb Merge "Check if keyguard is showing instead of occluded for compat UI." into tm-dev am: 687af63e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17081766

Change-Id: I4ee8be64429eb2901a443058f1b8b1128851bcc5
2022-03-07 15:45:59 +00:00
Tom Natan
4097299927 Merge "[16/n] Letterbox Education: focus on the dialog title for accessibility." into tm-dev am: 2e12d3499c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084163

Change-Id: Ib4c85270692c49596090ae612bafbff4e9420f7f
2022-03-07 15:45:30 +00:00
TreeHugger Robot
d6f6279032 Merge "[Motion] LS split shade: fix bad AOD <-> LS media transition" into tm-dev am: ecd166ee7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071384

Change-Id: Ic8906d06156c9298c08cd21f650b89bbec751522
2022-03-07 15:45:14 +00:00
Yuncheol Heo
225c7f1625 Merge "Revert "Expose ActivityOptions.fromBundle() as ModuleApi."" into tm-dev am: 9048187a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16942381

Change-Id: I49fcfd9900ea77929fe83f4fb3b0c984f696cfc6
2022-03-07 15:44:54 +00:00
Tom Natan
687af63e66 Merge "Check if keyguard is showing instead of occluded for compat UI." into tm-dev 2022-03-07 15:35:08 +00:00
Tom Natan
2e12d3499c Merge "[16/n] Letterbox Education: focus on the dialog title for accessibility." into tm-dev 2022-03-07 15:32:28 +00:00
TreeHugger Robot
ecd166ee7c Merge "[Motion] LS split shade: fix bad AOD <-> LS media transition" into tm-dev 2022-03-07 15:22:59 +00:00
Yuncheol Heo
9048187a34 Merge "Revert "Expose ActivityOptions.fromBundle() as ModuleApi."" into tm-dev 2022-03-07 15:21:18 +00:00
TreeHugger Robot
30ee16fe85 Merge "Fix missing operation when hiding window for rotation" into tm-dev am: 25b45cfd6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17103843

Change-Id: Id93b481a57b8b4ed7b7372eac0d6ed39048962d8
2022-03-07 15:04:11 +00:00
Kholoud Mohamed
0a5d96c9d9 Merge changes from topic "retailDemo" into tm-dev am: ae758aa7a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071466

Change-Id: Ic5cde60a6f5fa9b40e8d2ad165239b41c0c51ab6
2022-03-07 15:03:40 +00:00
kholoud mohamed
48efc85db2 Add new permission PROVISION_DEMO_DEVICE am: 53a01ab1ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071465

Change-Id: Ife27e597e7e2452d86b6702e56fd7470ae1d94b8
2022-03-07 15:03:37 +00:00
Andrei-Valentin Onea
0430c2b433 Merge "Move out mediaprovider allowlist entries" into tm-dev am: ee984194ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17044771

Change-Id: I0f930f71c2eff76be78f2536486de137a399db0b
2022-03-07 15:01:02 +00:00
TreeHugger Robot
25b45cfd6c Merge "Fix missing operation when hiding window for rotation" into tm-dev 2022-03-07 14:42:47 +00:00
Kholoud Mohamed
ae758aa7a5 Merge changes from topic "retailDemo" into tm-dev
* changes:
  Allow holders of PROVISION_DEMO_DEVICE to provision a device
  Add new permission PROVISION_DEMO_DEVICE
2022-03-07 14:37:26 +00:00
Andrei-Valentin Onea
ee984194ab Merge "Move out mediaprovider allowlist entries" into tm-dev 2022-03-07 14:34:10 +00:00
Oliver Woodman
df08f79864 Merge "Mediarouter: clean up callbacks" into tm-dev am: d3b1abefd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071600

Change-Id: I9e8568db58f701542eec4488b0dde4791c228a31
2022-03-07 13:13:48 +00:00
Christian Göllner
73404ab060 Merge changes from topics "presubmit-am-383593e5942445eb8d161d1e83da2250", "presubmit-am-d7f8eeae4f3640ce9f6884b186ad4fc4", "presubmit-am-de00cd8bc3af4ee0ba3508d2af5b09e2" into tm-dev am: 5876d9b67c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17048650

Change-Id: I7e3395922635a7488db29b27c742b70a2ae89a36
2022-03-07 13:13:20 +00:00
Oliver Woodman
d3b1abefd0 Merge "Mediarouter: clean up callbacks" into tm-dev 2022-03-07 13:03:22 +00:00
Christian Göllner
5876d9b67c Merge changes from topics "presubmit-am-383593e5942445eb8d161d1e83da2250", "presubmit-am-d7f8eeae4f3640ce9f6884b186ad4fc4", "presubmit-am-de00cd8bc3af4ee0ba3508d2af5b09e2" into tm-dev
* changes:
  [Motion] Split-shade expansion on LS: disable depth effect
  [Motion] Split-shade expansion on LS: decrease duration of scrim fade
  Lockscreen shade transition: rename and split resources
2022-03-07 13:01:25 +00:00
TreeHugger Robot
80b09c14a8 Merge "[Media TTT] Add analytics logs for the receiver chip." into tm-dev am: edcc80f4b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071700

Change-Id: Ib33577bcd3155628dfd2f5a136d1777ef0959d63
2022-03-07 12:53:13 +00:00
TreeHugger Robot
5f1584ef24 Merge "[Media TTT] Add analytics logs for the sender chip." into tm-dev am: d120ca75ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071926

Change-Id: I8c8de502996f3334d124b0abef3b458a48640224
2022-03-07 12:52:58 +00:00
TreeHugger Robot
74ec8b5099 Merge "[Media TTT] Refactor media states to use an enum instead of sealed classes." into tm-dev am: bb1a04a502
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070719

Change-Id: I8a283402d1490a360813b4b1e269056d8a8ba367
2022-03-07 12:52:17 +00:00
TreeHugger Robot
edcc80f4b0 Merge "[Media TTT] Add analytics logs for the receiver chip." into tm-dev 2022-03-07 12:48:07 +00:00
TreeHugger Robot
d120ca75ca Merge "[Media TTT] Add analytics logs for the sender chip." into tm-dev 2022-03-07 12:47:57 +00:00
TreeHugger Robot
bb1a04a502 Merge "[Media TTT] Refactor media states to use an enum instead of sealed classes." into tm-dev 2022-03-07 12:47:50 +00:00
Vincent Wang
fbc0ae17e8 [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: a14f1e84ce -s ours am: cb8114beed -s ours am: e63f7097e6 -s ours am: 09f49ac613 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

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

Change-Id: Ia8d4fd26266be51288b416f0bded7318c9d48cb7
2022-03-07 12:40:46 +00:00
Vincent Wang
c613e1a0b2 [automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-qpr1-dev am: 7ebb45fa2c -s ours am: a23ed4a4f3 -s ours am: 73423a2658 -s ours am: 007c28bbcb -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I80d1d10c6864213e74c43908dd637cf2ffd31deb
2022-03-07 12:40:40 +00:00
Presubmit Automerger Backend
7411ddaa3c [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 0699193115 am: d6fe29d6e6 -s ours am: 1f2262c366 -s ours am: 57527068f0 -s ours am: 5c2d65774a -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: Ic27597f0bef7c0460f95efefc5da320188e872d9
2022-03-07 12:40:38 +00:00
Vincent Wang
09f49ac613 [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: a14f1e84ce -s ours am: cb8114beed -s ours am: e63f7097e6 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

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

Change-Id: I88997316c1b6034c536ff6c47b1e78d77a19c482
2022-03-07 12:31:57 +00:00
Vincent Wang
007c28bbcb [automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-qpr1-dev am: 7ebb45fa2c -s ours am: a23ed4a4f3 -s ours am: 73423a2658 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I5555b57531960a2fa324719a0afd646e5c027e41
2022-03-07 12:29:12 +00:00
Presubmit Automerger Backend
5c2d65774a [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 0699193115 am: d6fe29d6e6 -s ours am: 1f2262c366 -s ours am: 57527068f0 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I43176995811e0ca8c14bf76ae159d40ff9209139
2022-03-07 12:28:45 +00:00
Robert Horvath
3dbfb2ad0e Merge "Expose getPreferKeepClearForFocusDelay as TestApi" into tm-dev am: d0b6f0a400
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16932090

Change-Id: I1ac9eaa54f943d477dd2c5b5e6af4e58b2e5b15d
2022-03-07 12:28:34 +00:00
Robert Horvath
d0b6f0a400 Merge "Expose getPreferKeepClearForFocusDelay as TestApi" into tm-dev 2022-03-07 12:19:45 +00:00
TreeHugger Robot
3c6d192ab0 Merge "Allowing activity occludes keyguard if activity has showWhenLocked flag" into tm-dev am: 9e7f7c1107
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004227

Change-Id: If13976f460fad06654551169c0587b608ee51965
2022-03-07 12:18:40 +00:00
Vincent Wang
38cd517601 [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: 26ff1a0252 -s ours am: 0e77b7ec8a -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

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

Change-Id: I18798a9401d701031b58f9926147507e27c90a3f
2022-03-07 12:18:21 +00:00
Vincent Wang
e63f7097e6 [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: a14f1e84ce -s ours am: cb8114beed -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

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

Change-Id: Id802ee6d3055b9e4e95c91770caccf54014dc211
2022-03-07 12:18:01 +00:00
Automerger Merge Worker
068bbab05c [automerger skipped] Merge changes from topic "am-c4facceaa73943ff9227fdc04b1856ab" into tm-dev am: a8a257997b -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: If3d8b073f6fa31c0ff788299ff00de7afb29d7e0
2022-03-07 12:17:49 +00:00
Vincent Wang
df61debd9b [automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-mainline-prod am: 00dd9ef1c2 -s ours am: 080bd910d2 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I4179f6bc75a654c2533453e75bf324e0a99d66bf
2022-03-07 12:17:42 +00:00
Vincent Wang
73423a2658 [automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-qpr1-dev am: 7ebb45fa2c -s ours am: a23ed4a4f3 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I1118e974d7973468fbdd723c593c7d4bcf49347e
2022-03-07 12:17:36 +00:00
Presubmit Automerger Backend
57527068f0 [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 0699193115 am: d6fe29d6e6 -s ours am: 1f2262c366 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: Ic37623fe42cec175f66dac28eb65885aef44c75e
2022-03-07 12:17:11 +00:00
TreeHugger Robot
9e7f7c1107 Merge "Allowing activity occludes keyguard if activity has showWhenLocked flag" into tm-dev 2022-03-07 12:13:04 +00:00
Vincent Wang
0e77b7ec8a [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: 26ff1a0252 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

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

Change-Id: I84dd0fe713f84c28a3e2db212c179c87062262ca
2022-03-07 12:08:39 +00:00
Automerger Merge Worker
a8a257997b Merge changes from topic "am-c4facceaa73943ff9227fdc04b1856ab" into tm-dev
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-mainline-prod am: 00dd9ef1c2 -s ours
  [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 0699193115 am: 859f984157 -s ours
2022-03-07 12:08:36 +00:00
Vincent Wang
9bd6ff8911 [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-v2-dev am: 3e38a2d46e -s ours am: 7ebe9b1609 -s ours am: 005b864a3c -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I4183bbd69e7d2e47c568862df430c349ffbdf45d
2022-03-07 12:08:23 +00:00
Vincent Wang
cb8114beed [automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: a14f1e84ce -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

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

Change-Id: Ifdb4b6748a8d3bcbd6e3fa7a54ce5bd5b1615c42
2022-03-07 12:08:14 +00:00
Vincent Wang
3655f545a5 [automerger skipped] Merge changes from topic "presubmit-am-511bbd56532d40a893027c683b6a4446" into sc-v2-dev-plus-aosp am: c530fb1d32 -s ours am: 88b795001d -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b027f is already in history

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

Change-Id: I53d834eb39123b190749dd92b7ec491632a0c612
2022-03-07 12:08:13 +00:00
Presubmit Automerger Backend
f207c2fb97 [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 08d1494421 am: 1632d59830 -s ours am: cf4e9e137f -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b027f is already in history

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

Change-Id: I8d066e947a8e9ed9699f3e65237327bf22863147
2022-03-07 12:08:12 +00:00
Vincent Wang
080bd910d2 [automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-mainline-prod am: 00dd9ef1c2 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: Id04c0aaae2340f8d92e54eaa12224a008a404f3a
2022-03-07 12:08:10 +00:00
John Wu
25ff0bd84d Merge "Update PackageInfo APIs to reflect shared UID status" into tm-dev am: a8196fc56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17050883

Change-Id: I969bf7c378ce8ae204334da3b5409c41c55374b9
2022-03-07 12:08:00 +00:00
Presubmit Automerger Backend
116946a21e [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 0699193115 am: 859f984157 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history

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

Change-Id: I239bc5b8d58a318bcab81d4cc4b88ee30ace7482
2022-03-07 12:07:51 +00:00