Commit Graph

538607 Commits

Author SHA1 Message Date
TreeHugger Robot
a76e4e87dc Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836 am: 96659e4406 am: b12833ca1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: I0d4075cbc467753dba116847bbf2230c56d5862b
2020-06-15 19:32:00 +00:00
Miranda Kephart
78f2060347 Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 8fce67ebd3 am: 116b1bbfc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: If7a7ef87e22e8f70f0b170e0d3cb8e7fbc048ca5
2020-06-15 19:31:52 +00:00
TreeHugger Robot
34f9e0b883 Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836 am: 63d2c768b5 am: 7049d43685
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: Ibc60cfc298c10a476b726376346a67e389e0e5b2
2020-06-15 19:31:32 +00:00
Automerger Merge Worker
42f8dfeab8 Merge "Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 6025e31c64 am: 785b448531" into rvc-qpr-dev-plus-aosp 2020-06-15 19:30:59 +00:00
TreeHugger Robot
e40ea49cbb Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836 am: 63d2c768b5 am: e333a8f703
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: I2bbb60730e88f09ad375f0fe2827a3e0cf266f50
2020-06-15 19:30:44 +00:00
Miranda Kephart
48485db0a8 Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 6025e31c64 am: 785b448531
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: Ie20c5c3a02fffc05049f7c43c59da3d6869f1cb9
2020-06-15 19:30:36 +00:00
Miranda Kephart
9519294d6b Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 6025e31c64 am: 29f33b805b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: Ia21b9514067b029bb69c20f86c49f26a41019e52
2020-06-15 19:30:25 +00:00
TreeHugger Robot
b12833ca1c Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836 am: 96659e4406
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: If2d4073fd580fce070c39082154ffe0c3e3ddfed
2020-06-15 19:08:06 +00:00
Miranda Kephart
116b1bbfc8 Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 8fce67ebd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: I6e69c751c0279faded0ef82df93787342754a2db
2020-06-15 19:07:44 +00:00
TreeHugger Robot
e333a8f703 Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836 am: 63d2c768b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: I04440f8906b10a9a2f9b75e91bc2fa2ea1598c0f
2020-06-15 19:07:29 +00:00
Miranda Kephart
29f33b805b Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 6025e31c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: I64f950ae118aa62ae24e7252ed04c5cc8ef53167
2020-06-15 19:07:22 +00:00
TreeHugger Robot
7049d43685 Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836 am: 63d2c768b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: Ieb7c19d63bdab84568c494926ecbc7c6dbbd6bee
2020-06-15 19:07:15 +00:00
Miranda Kephart
785b448531 Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a am: 6025e31c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: I705961eb5ad4166679e43c8a09bb2819cc03d6a1
2020-06-15 19:07:00 +00:00
TreeHugger Robot
96659e4406 Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: I631f1f7140c3e96711a674c1874b2021c8a9bc8e
2020-06-15 19:00:45 +00:00
TreeHugger Robot
63d2c768b5 Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11870643

Change-Id: I6c5dda4acd85edcf5ff86e5b7370513581483b7b
2020-06-15 19:00:35 +00:00
TreeHugger Robot
721a3ac836 Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev 2020-06-15 18:55:43 +00:00
Evan Rosky
08582d2e25 Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: f505da86b1 am: 0c83bb2ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: If61fb70a692c2a46e82f389ab6c3babd44674b83
2020-06-15 18:54:56 +00:00
Miranda Kephart
8fce67ebd3 Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: Iec61eeaa297c2f2c4ee646957170bcb9104eeb26
2020-06-15 18:54:44 +00:00
Miranda Kephart
6025e31c64 Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev am: 3a9ce8d11a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851515

Change-Id: I05c2ec3fa2b232296dd3eee02d700a981fd9e86e
2020-06-15 18:54:35 +00:00
Mohammad Samiul Islam
6ef6e83eb9 [automerger skipped] Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: 84db84a65c am: 2586e1a9c9 -s ours
am skip reason: Change-Id I99337ea2898cfdf2cc515819b4f5b5db4b038f31 with SHA-1 a922531124 is in history

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

Change-Id: I75d7b0c9ab0ea50faf44c6ecd800cc35ed6ca1b8
2020-06-15 18:54:34 +00:00
Miranda Kephart
3a9ce8d11a Merge "Revert "Post a silent notification if screenshot is dismissed"" into rvc-dev 2020-06-15 18:45:29 +00:00
Evan Rosky
2d6807c2a7 Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: c9639f43ca am: 50631e6e52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: I6aaaff6d6a80e8f408b1262cc0447125436ed995
2020-06-15 18:41:29 +00:00
Mohammad Samiul Islam
b81c5f6384 [automerger skipped] Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: b0c34b33c1 -s ours am: d02830e2dc -s ours
am skip reason: Change-Id I99337ea2898cfdf2cc515819b4f5b5db4b038f31 with SHA-1 a922531124 is in history

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

Change-Id: Ia596adc1dec83c51080ab7dddae330e38c3f21d2
2020-06-15 18:41:23 +00:00
Automerger Merge Worker
f22496b65f Merge "Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: f505da86b1" into rvc-d1-dev-plus-aosp am: 89eb1eea82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: I817022d6e207b15f0a0e9500fe7e68018cbff36b
2020-06-15 18:41:14 +00:00
Automerger Merge Worker
987604aa8f Merge "Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: 2c1419358d" into rvc-d1-dev-plus-aosp am: b379cc4881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840049

Change-Id: Ibfccf9733ca7975a735f92b0fa3ba071a5de5d2c
2020-06-15 18:40:45 +00:00
Automerger Merge Worker
9d9c99cd35 Merge "Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: b2a13977ea am: 46a576978a" into rvc-qpr-dev-plus-aosp 2020-06-15 18:40:42 +00:00
Winson Chung
207097a393 Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: b2a13977ea am: 46a576978a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840049

Change-Id: Icceda9779b14289797def6c996b1ff59223414a3
2020-06-15 18:40:34 +00:00
Mohammad Samiul Islam
83aa2e75f5 Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: 84db84a65c am: 693bd372d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837601

Change-Id: Iefc085d05fd122171948972272c87819fdcd5b24
2020-06-15 18:40:31 +00:00
Winson Chung
788fbb3f17 Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: b2a13977ea am: 9b62b34ae7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840049

Change-Id: I9612613b7920749c30a560cce35872b93827bbc5
2020-06-15 18:40:13 +00:00
TreeHugger Robot
6765dab60b Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5 am: ac3dde8b1d am: f5e07e0ae4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: I398312adee86d61aae4e4d2260eb9380c5117191
2020-06-15 18:39:57 +00:00
TreeHugger Robot
f7f75c0cb8 Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5 am: 518c3b664e am: 6cd4c7d6a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: Icae1ff5bafda2a832062a95f58eff49b043b4c07
2020-06-15 18:39:30 +00:00
TreeHugger Robot
aeb95b5950 Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5 am: 518c3b664e am: 4b91502b43
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: I4733cab55bf6da65e78abbab435d7d6cb572eccd
2020-06-15 18:39:11 +00:00
Evan Rosky
50631e6e52 Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: c9639f43ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: I0722357e8de2fdd2febe22713559f8c35579dfe3
2020-06-15 18:28:16 +00:00
Mohammad Samiul Islam
d02830e2dc [automerger skipped] Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: b0c34b33c1 -s ours
am skip reason: Change-Id I99337ea2898cfdf2cc515819b4f5b5db4b038f31 with SHA-1 a922531124 is in history

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

Change-Id: I723098cb6e6b978a667f1ab86fa948e696bf8a53
2020-06-15 18:28:10 +00:00
Automerger Merge Worker
89eb1eea82 Merge "Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: f505da86b1" into rvc-d1-dev-plus-aosp 2020-06-15 18:27:40 +00:00
Automerger Merge Worker
b379cc4881 Merge "Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: 2c1419358d" into rvc-d1-dev-plus-aosp 2020-06-15 18:27:29 +00:00
Evan Rosky
ba64220a21 Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: f505da86b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: I956b800b0289878e7080cfde4ed5365c20a3cccd
2020-06-15 18:27:28 +00:00
Winson Chung
2c6a5bc964 Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: 2c1419358d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840049

Change-Id: I45504847a62883ad28369d98504c4b7c6f4672f3
2020-06-15 18:27:23 +00:00
Evan Rosky
0c83bb2ec2 Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309 am: f505da86b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: I7a8ba9ca80a42ec2a1dc36dbbc1efcf5a7125210
2020-06-15 18:27:21 +00:00
Mohammad Samiul Islam
693bd372d1 Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: 84db84a65c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837601

Change-Id: I371fb6bc7c541e70b73e34df54319106eac56c6f
2020-06-15 18:27:14 +00:00
Mohammad Samiul Islam
2586e1a9c9 Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: 84db84a65c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837601

Change-Id: Ia3a636cb9cbc14f56063391b72287e01d7e31832
2020-06-15 18:27:08 +00:00
Winson Chung
9b62b34ae7 Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: b2a13977ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840049

Change-Id: I14b165549a19f665875de799c95fb8d3c3badcb3
2020-06-15 18:27:02 +00:00
Winson Chung
46a576978a Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: b2a13977ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840049

Change-Id: I2c9e9ce0ebf7d29f32058f4bce604d94416b340a
2020-06-15 18:26:56 +00:00
TreeHugger Robot
f5e07e0ae4 Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5 am: ac3dde8b1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: I522c576201c1b38a9cf66166742ed1f659424456
2020-06-15 18:26:50 +00:00
TreeHugger Robot
6cd4c7d6a4 Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5 am: 518c3b664e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: I41d4e0c5abf28ac710dd9ef03d6914dd1b78495c
2020-06-15 18:26:34 +00:00
TreeHugger Robot
4b91502b43 Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8b5 am: 518c3b664e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: I33bb84eb208bc575477a99cf0fd8fceea837dfb3
2020-06-15 18:26:17 +00:00
Evan Rosky
c9639f43ca Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: Ia98e38cdbfb483ca509d34c30d2dde796eaaa850
2020-06-15 18:16:23 +00:00
Mohammad Samiul Islam
b0c34b33c1 Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837601

Change-Id: I5c04041cb9698ab890fa28e402283d58fb993524
2020-06-15 18:16:09 +00:00
Evan Rosky
f505da86b1 Merge "Adjust drag regions to accomodate split-minimized home" into rvc-dev am: 40f7d48309
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744161

Change-Id: I9259dcbc993f82ea0ce836c970f1180a1eb59ad2
2020-06-15 18:16:01 +00:00
Automerger Merge Worker
99b110d522 Merge "Merge "PiP: Animate resize even if the bounds are the same." into rvc-dev am: 32724409f5 am: 79ed496224" into rvc-d1-dev-plus-aosp am: 68e4151916
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11856229

Change-Id: Ia148c205ab103824a65a8db857f0d2e15043838e
2020-06-15 18:15:51 +00:00