Commit Graph

643336 Commits

Author SHA1 Message Date
Kriti Dang
bebdc0ac07 Merge "Adding additional javadocs for setSurroundFormatEnabled" into sc-dev am: d7638021ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14775421

Change-Id: I8a57e65262572e87fc594baebb70432b49670966
2021-06-03 06:15:51 +00:00
Aaron Huang
fcd75fc310 Merge "Make sure the PAC script content is sent again" into sc-dev am: 10cbb66f1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14547067

Change-Id: If9f7e8389a9873337591d3d2a2723963ab67717a
2021-06-03 06:15:41 +00:00
Alex Johnston
d7f32bb992 Merge "Remove requireAutoTime on upgrade" into sc-dev am: c65974f14e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234430

Change-Id: I0a3265a4cc282fa20ad534a6910300f75eb19556
2021-06-03 06:15:01 +00:00
Aaron Huang
42705a516d Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am: 2debdb3ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747451

Change-Id: I96420d51511f91f7b55db4701fdf5ea7f50a8db0
2021-06-03 06:14:47 +00:00
Louis Chang
e3a5d23a74 Merge "Adding TaskFragment to provide the basic policies of a Task" into sc-v2-dev 2021-06-02 05:16:32 +00:00
Louis Chang
94ad41980a Adding TaskFragment to provide the basic policies of a Task
- Delegate the Task#getVisibility to TaskFragment
- Ensure activity visibilities in TaskFragment

Bug: 189384393
Test: build and boot
Change-Id: Ib143e9e58a0ced36cbe5d62e3ce0c93cec770bda
2021-06-02 10:12:02 +08:00
TreeHugger Robot
e0b77bee96 Merge "Initial commit for rotation contextual button" into sc-v2-dev 2021-06-02 02:05:40 +00:00
Evan Rosky
d4fcf3ac04 Merge "Inform SurfaceFlinger about displays which receive input" into sc-v2-dev 2021-06-01 21:17:14 +00:00
Vinit Nayak
14e81630b9 Initial commit for rotation contextual button
Bug: 180046394
Test: Events successfully passed through to launcher
Change-Id: I84c60dc89f560fdaf76afdbed8b5f9ec23b38856
2021-06-01 13:16:48 -07:00
Evan Rosky
08bcd0e804 Merge "Fix a small bug around deferring activity visibility" into sc-v2-dev 2021-06-01 19:20:15 +00:00
Evan Rosky
3c85ed5080 Inform SurfaceFlinger about displays which receive input
Right now, multiple display devices can share a layerstack.
This means that when constructing InputWindowInfo, its
impossible to know which display transform matches the
display viewport that inputflinger dispatches against. To
remedy this, have displaymanager inform surfaceflinger
which displays "receiveInput" using the same logic that
controls which display viewport it sends to inputflinger.

Bug: 179274888
Test: atest SetDisplayStateLockedTest
Change-Id: I85f1d0ac6fcf9c37a523eb80ed02afeff555c93d
2021-06-01 11:58:34 -07:00
Evan Rosky
ecaff118fb Fix a small bug around deferring activity visibility
Making the defer specific to the activity instead of "while
transition running". Otherwise, we can break changes in
visibility that don't occur during a transition while a
transition is running (eg. an app becoming visible due to
an on-top app changing translucency).

Bug: 183993924
Test: atest ActivityVisibilityTests#testConvertTranslucentOnNonTopTranslucentActivity
Change-Id: I1589b4d47733ed4182e1e7b5b10fe7957b8dceea
2021-06-01 10:32:49 -07:00
Kriti Dang
d7638021ed Merge "Adding additional javadocs for setSurroundFormatEnabled" into sc-dev 2021-06-01 10:11:54 +00:00
Aaron Huang
10cbb66f1e Merge "Make sure the PAC script content is sent again" into sc-dev 2021-06-01 08:47:13 +00:00
Wei Sheng Shih
4244ff3aa8 Merge "Ensure no starting window leak in WMShell before adding." into sc-dev am: a1195c85c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341155

Change-Id: Ic806e0c7dd36a2c1f7f7b1180fe2d0869b95bf85
2021-06-01 08:25:05 +00:00
Alex Johnston
c65974f14e Merge "Remove requireAutoTime on upgrade" into sc-dev 2021-06-01 08:17:27 +00:00
Aaron Huang
2debdb3ec2 Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev 2021-06-01 08:08:21 +00:00
Wei Sheng Shih
a1195c85c7 Merge "Ensure no starting window leak in WMShell before adding." into sc-dev 2021-06-01 07:56:40 +00:00
Aaron Huang
40b249c1a6 Make sure the PAC script content is sent again
...when the PAC service crashes.

Bug: 185409199
Test: manual
Original-Change: https://android-review.googlesource.com/1711211
Merged-In: Ic76428f42f37f8552a526190764ad32e2874adb0
Change-Id: Ic76428f42f37f8552a526190764ad32e2874adb0
2021-06-01 07:33:01 +00:00
TreeHugger Robot
3976945b9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75d739ff27 -s ours am: 947270efc3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a27d488689cd22dd66fd8601be7bb1a43b99755
2021-06-01 07:17:26 +00:00
TreeHugger Robot
947270efc3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75d739ff27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a88f0af4607b01760981889c6fbdd84f8a8be6e
2021-06-01 06:52:32 +00:00
TreeHugger Robot
75d739ff27 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-01 06:31:40 +00:00
TreeHugger Robot
15bb1b06fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3baa739ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23035e73cabb808c070d881eae8d1f3bd02d3ea7
2021-06-01 06:21:20 +00:00
TreeHugger Robot
1e13aafb40 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0fac4b5f27 -s ours am: 3dce19b16d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28e10eb302b3ddeeafba7a1296b4a803efd9d9bc
2021-06-01 06:21:17 +00:00
TreeHugger Robot
a1f010604f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eee72b4605 -s ours am: 3db4dc09ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I093bb17f704a7a44b8d99226aecbce13233287ec
2021-06-01 06:21:14 +00:00
TreeHugger Robot
17e3cae38d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 863a81ff67 -s ours am: 9a32f30094 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a3dd38beadae63aca54c22bbcb91986ac4fc947
2021-06-01 06:21:09 +00:00
TreeHugger Robot
b17e49885f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 638d1924ed -s ours am: 928b1e8347 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1712ef8d1882bde5ef6b6333a338fbc34d3f5481
2021-06-01 06:21:03 +00:00
TreeHugger Robot
088a08fb5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5030dc3ff7 -s ours am: 5c9d4bc279 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0654ef5cc1af5621eaffdf855f1338645dfc9378
2021-06-01 06:20:52 +00:00
TreeHugger Robot
bca26d3212 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eb7d47937b -s ours am: 2859febee5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd97a7bf56bbdbcebb6c1cc0119a1c17419a1f6f
2021-06-01 06:20:44 +00:00
TreeHugger Robot
a3baa739ab Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-01 06:15:35 +00:00
TreeHugger Robot
3dce19b16d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0fac4b5f27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I95df7604f08299c1a03deaa8d57b212ab067e449
2021-06-01 06:11:03 +00:00
TreeHugger Robot
3db4dc09ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eee72b4605 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0cd4360d36b85115fe85f2b92796f1cb8e1f4b8a
2021-06-01 06:10:49 +00:00
TreeHugger Robot
9a32f30094 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 863a81ff67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1aeb6615c6b521abb42810d88931a7002ee8fa87
2021-06-01 06:10:36 +00:00
TreeHugger Robot
928b1e8347 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 638d1924ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6fa1fb29b2e1fbe46eebada52820149112c43fce
2021-06-01 06:10:22 +00:00
TreeHugger Robot
5c9d4bc279 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5030dc3ff7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e1f07fa53e86ddf8b669dc4777f190d6ee04ed6
2021-06-01 06:10:09 +00:00
TreeHugger Robot
c3b0739b91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 196e02bd0d -s ours am: 768f97d605 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00df14132c26d175fc79e4659b514fb75759521a
2021-06-01 06:08:52 +00:00
TreeHugger Robot
8c3d528a43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 34adaebd45 -s ours am: 4c9b4b5c33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb218ff8506beb9a992783ff95440b920a91740e
2021-06-01 06:08:35 +00:00
TreeHugger Robot
3069be45ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9c0f8a3757 -s ours am: 90edda4634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7671c1b19d6b593e5f7cc5d53ead1d521b7e6d3
2021-06-01 06:08:25 +00:00
TreeHugger Robot
440dffc615 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 323242a261 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I58b43aef1a68e81a2437b95f06a931c55e37b732
2021-06-01 06:07:52 +00:00
TreeHugger Robot
2859febee5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: eb7d47937b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30b1327f3f5702d3c11590d4d608562c76b4af92
2021-06-01 06:07:24 +00:00
TreeHugger Robot
768f97d605 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 196e02bd0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f5583ab5e88e3f9df83180e66ba9a1a78ff2a4c
2021-06-01 06:07:12 +00:00
TreeHugger Robot
4c9b4b5c33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 34adaebd45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddd5f08a9dadc4890db408f08cfba114cece5430
2021-06-01 06:06:59 +00:00
TreeHugger Robot
90edda4634 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9c0f8a3757 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78c0420f8b9538fbc14b65f90526467974876875
2021-06-01 06:06:45 +00:00
TreeHugger Robot
0fac4b5f27 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-01 06:04:15 +00:00
TreeHugger Robot
323242a261 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-01 06:02:55 +00:00
TreeHugger Robot
25cb6a40ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f84a8bc6f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I459705e817c5d3eda21e6f08682c5e84d824746a
2021-06-01 05:58:21 +00:00
TreeHugger Robot
160602d073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5283151457 -s ours am: 03b8e083a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d9fd0292a781133ae62758623faa5047a5e0edf
2021-06-01 05:58:16 +00:00
TreeHugger Robot
ebc9896dba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 834fcc1639 -s ours am: f5c8fddb59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79ae459d63ee9910092c6868e9ed5c6a1270d306
2021-06-01 05:58:12 +00:00
TreeHugger Robot
23df93b888 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2580e23d4e -s ours am: c49855b03b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I005eae983fff4a8b591e8cbda0ff32bd8cca6f48
2021-06-01 05:58:04 +00:00
TreeHugger Robot
0e922a7d0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e261aaef20 -s ours am: ab716ff80b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f91eed75a5d152c43a216c74c993a226320ea83
2021-06-01 05:57:55 +00:00