OSDN Git Service
Phil Weaver [Sat, 8 Apr 2017 00:56:21 +0000 (00:56 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257 am:
68a93d2be2 am:
c7db1bf43a am:
593df9d186 am:
92e6a1d941 am:
fbc531077f
am:
c0f68af9b7
Change-Id: I28a55f71e1f907fc55172c0ce99a54711d4fa0c9
Phil Weaver [Sat, 8 Apr 2017 00:54:07 +0000 (00:54 +0000)]
Merge "Make a11y node info parceling more robust" into oc-dev
am:
ca24a97a15
Change-Id: Ib16dc8e0d61828df63457b90bb3bcc92f6fc033c
Karthik Ravi Shankar [Sat, 8 Apr 2017 00:53:04 +0000 (00:53 +0000)]
Merge "Fix when vr app launches 2d activity" into oc-dev
am:
45539511c0
Change-Id: Ieffa9bdd8082190afb2992269f07693270bb927b
Phil Weaver [Sat, 8 Apr 2017 00:47:42 +0000 (00:47 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257 am:
68a93d2be2 am:
c7db1bf43a am:
593df9d186 am:
92e6a1d941
am:
fbc531077f
Change-Id: I563b550545e9daaec96038cfbdb8db5c5879240b
TreeHugger Robot [Sat, 8 Apr 2017 00:45:51 +0000 (00:45 +0000)]
Merge "Make a11y node info parceling more robust" into oc-dev
Phil Weaver [Sat, 8 Apr 2017 00:41:39 +0000 (00:41 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397 am:
88bd259e8d am:
1552348b31 am:
2da1b658dd am:
92f33c145a
am:
135f59e851
Change-Id: I03362877872dab8fe140f2403f89c990e36d203a
TreeHugger Robot [Sat, 8 Apr 2017 00:40:58 +0000 (00:40 +0000)]
Merge "Fix when vr app launches 2d activity" into oc-dev
Phil Weaver [Sat, 8 Apr 2017 00:40:34 +0000 (00:40 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257 am:
68a93d2be2 am:
c7db1bf43a am:
593df9d186
am:
92e6a1d941
Change-Id: I80af3b8d0da4b81c0a48ddcc2c3a9f817afb5c00
Phil Weaver [Sat, 8 Apr 2017 00:38:32 +0000 (00:38 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397 am:
88bd259e8d am:
1552348b31 am:
2da1b658dd am:
92f33c145a
am:
a33972edaa
Change-Id: I112b8cbbefc601808eaf3eedf80e7b89e6632467
Winson Chung [Sat, 8 Apr 2017 00:37:10 +0000 (00:37 +0000)]
Merge "Ensure that a PIP activity gets stopped before MW/PIP mode changes." into oc-dev
am:
7ddf4b3e11
Change-Id: I2c5f687c792d5198fe07f75c5b333acbb7885133
Wei Jia [Sat, 8 Apr 2017 00:33:57 +0000 (00:33 +0000)]
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev
am:
e79081aeaa
Change-Id: Ia96dc51f195e6bb42fb64acca3b33225eff01cfc
Phil Weaver [Sat, 8 Apr 2017 00:32:45 +0000 (00:32 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397 am:
88bd259e8d am:
1552348b31 am:
2da1b658dd
am:
92f33c145a
Change-Id: Ic35648954364d76611eec65c422cd39b019df418
Phil Weaver [Sat, 8 Apr 2017 00:32:44 +0000 (00:32 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397 am:
88bd259e8d am:
1552348b31 am:
2da1b658dd
am:
92f33c145a
Change-Id: I07b4674c7ef04b620815f7c65b5d1d09d1017220
Phil Weaver [Sat, 8 Apr 2017 00:32:37 +0000 (00:32 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257 am:
68a93d2be2 am:
c7db1bf43a
am:
593df9d186
Change-Id: I464fafbf67c1985cc56188914e0fabcc0970fac2
Winson Chung [Sat, 8 Apr 2017 00:30:30 +0000 (00:30 +0000)]
Merge "Ensure that a PIP activity gets stopped before MW/PIP mode changes." into oc-dev
Phil Weaver [Sat, 8 Apr 2017 00:25:13 +0000 (00:25 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397 am:
88bd259e8d am:
1552348b31
am:
2da1b658dd
Change-Id: Ie7a69da3ceb6e270e162de5da167560e0fb3dc15
Phil Weaver [Sat, 8 Apr 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257 am:
68a93d2be2
am:
c7db1bf43a
Change-Id: I19e1e68857f43e9d36240753d2f5c72374b566b1
TreeHugger Robot [Sat, 8 Apr 2017 00:24:08 +0000 (00:24 +0000)]
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev
Phil Weaver [Sat, 8 Apr 2017 00:17:24 +0000 (00:17 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257
am:
68a93d2be2
Change-Id: I3ea690e5ee140b0f0e38935adabda3aeeb9e57cb
Phil Weaver [Sat, 8 Apr 2017 00:17:11 +0000 (00:17 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397 am:
88bd259e8d
am:
1552348b31
Change-Id: I8736c7cebdc8dc954b6e008e0c61c6b85f4d8fcb
Phil Weaver [Sat, 8 Apr 2017 00:09:44 +0000 (00:09 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37
am:
f580a2c257
Change-Id: I25bc8884d004bfc9790d40cb8f1ad1a285203e98
Phil Weaver [Sat, 8 Apr 2017 00:09:40 +0000 (00:09 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397
am:
88bd259e8d
Change-Id: I78596326137bb4fcd01f6f2b9d81787d9ccb9cf9
Bryce Lee [Sat, 8 Apr 2017 00:03:05 +0000 (00:03 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
am:
6f36255adc
Change-Id: I39c456cfb25d030a482ff4c17760b55409f58b96
Phil Weaver [Sat, 8 Apr 2017 00:02:10 +0000 (00:02 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f
am:
ba05c14397
Change-Id: I9b44e3353c2140d074f7eb38342257334330fb6f
Phil Weaver [Sat, 8 Apr 2017 00:02:02 +0000 (00:02 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f
am:
879bdbeb37
Change-Id: I7e7f391e2fe53d60a13b8c96d5ba1cab6e880b48
Felipe Leme [Sat, 8 Apr 2017 00:01:51 +0000 (00:01 +0000)]
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev
am:
5c8d88e855
Change-Id: Ia363ebbbf73514936776b7b0a9ca7ba0f65bf1bc
Phil Weaver [Sat, 8 Apr 2017 00:00:43 +0000 (00:00 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8 am:
3241198caa am:
9ff56373ff am:
8ebb1df537 am:
04520478fb
am:
549694b096
Change-Id: I208845530ca784f4472d245e0ccab9338f6d4069
Phil Weaver [Fri, 7 Apr 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819
am:
e3a1b81c8f
Change-Id: I221aecc956ab769246b0aaee7507a468c106c43d
TreeHugger Robot [Fri, 7 Apr 2017 23:57:23 +0000 (23:57 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
Phil Weaver [Fri, 7 Apr 2017 23:55:41 +0000 (23:55 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8 am:
3241198caa am:
9ff56373ff am:
8ebb1df537 am:
04520478fb
am:
643d02bde0
Change-Id: Ie1eda87359fbf6ddaf87a88cf28718215c03f6dd
Phil Weaver [Fri, 7 Apr 2017 23:54:43 +0000 (23:54 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423
am:
8e6d10c65f
Change-Id: I6ce318f51b1a7ead1898c6a6c61d9ca5e48f2fd1
TreeHugger Robot [Fri, 7 Apr 2017 23:52:05 +0000 (23:52 +0000)]
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev
Phil Weaver [Fri, 7 Apr 2017 23:51:01 +0000 (23:51 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1
am:
d7552dc819
Change-Id: I926e8b686895d4dcb401e0274b786702a5648307
Phil Weaver [Fri, 7 Apr 2017 23:50:32 +0000 (23:50 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef am:
b35d6eadf3 am:
576768a022 am:
78aa850127 am:
582dc7eb8d
am:
292af1c8e8
Change-Id: I982a9cc7e5b8938b28be4477584c02797ef36dd5
Phil Weaver [Fri, 7 Apr 2017 23:49:19 +0000 (23:49 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8 am:
3241198caa am:
9ff56373ff am:
8ebb1df537
am:
04520478fb
Change-Id: Ib2f1ddee4a1453b07dbde3282fab5de44be01891
Phil Weaver [Fri, 7 Apr 2017 23:47:12 +0000 (23:47 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef am:
b35d6eadf3 am:
576768a022 am:
78aa850127 am:
582dc7eb8d
am:
97347441ea
Change-Id: I00048504492ff5d5f8b8956a75ac31d5e44ad8f2
Phil Weaver [Fri, 7 Apr 2017 23:47:07 +0000 (23:47 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d
am:
e4beeeb423
Change-Id: I6a369b43c54463330d6aa8a2f4ad9b5f5e46e887
Phil Weaver [Fri, 7 Apr 2017 23:47:03 +0000 (23:47 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8 am:
3241198caa am:
9ff56373ff am:
8ebb1df537
am:
04520478fb
Change-Id: I12ead2e4ef5b01c37e5c7583e7f188f08ce3ca3c
Phil Weaver [Fri, 7 Apr 2017 23:43:28 +0000 (23:43 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01
am:
7cb5e1dfd1
Change-Id: I8e51350ae38384dfb9ae034d73fe9087837b27f7
Phil Weaver [Fri, 7 Apr 2017 23:43:01 +0000 (23:43 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c
am:
384e51767d
Change-Id: I566fa4ea9d3d15e1a65fbae11d20defb37868dd6
Phil Weaver [Fri, 7 Apr 2017 23:40:40 +0000 (23:40 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef am:
b35d6eadf3 am:
576768a022 am:
78aa850127
am:
582dc7eb8d
Change-Id: I7acac13ebb9b6c41feea6c2edc1f37231973d9c7
Phil Weaver [Fri, 7 Apr 2017 23:40:03 +0000 (23:40 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef am:
b35d6eadf3 am:
576768a022 am:
78aa850127
am:
582dc7eb8d
Change-Id: Icab9eec928b57d957eb6c0251948d008916b5491
Phil Weaver [Fri, 7 Apr 2017 23:39:58 +0000 (23:39 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8 am:
3241198caa am:
9ff56373ff
am:
8ebb1df537
Change-Id: Idcb33dc49c7f93ebbac86c7f8d99c33ecb296cdf
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours
am:
d3a4f4a33c
Change-Id: I2c1d0fb08ed990e4deb03361dddb1075d1ac7fad
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev
am:
88698afd01
Change-Id: I37194d958aa5fc21ece027c288e2f9a0a239cd93
Phil Weaver [Fri, 7 Apr 2017 23:32:32 +0000 (23:32 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef am:
b35d6eadf3 am:
576768a022
am:
78aa850127
Change-Id: Ib44e1d477230767f5e03f63cb96a342a4bd929fb
Phil Weaver [Fri, 7 Apr 2017 23:32:28 +0000 (23:32 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8 am:
3241198caa
am:
9ff56373ff
Change-Id: I53855b4dc3bba60226751fdaaaa722636c226486
Phil Weaver [Fri, 7 Apr 2017 23:30:19 +0000 (23:30 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07
am:
3a7cf1f057 -s ours
Change-Id: I0000c6df3ca0375022535be19cf0f9a76ed07e39
Phil Weaver [Fri, 7 Apr 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev
Phil Weaver [Fri, 7 Apr 2017 23:25:03 +0000 (23:25 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8
am:
3241198caa
Change-Id: I370bd8804cd24fb3b67160da1e76084abce525cf
Phil Weaver [Fri, 7 Apr 2017 23:24:59 +0000 (23:24 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef am:
b35d6eadf3
am:
576768a022
Change-Id: If36bfc0a6ec317b6d46a0de7fe24a8be38ef59c7
Android Build Merger (Role) [Fri, 7 Apr 2017 23:18:11 +0000 (23:18 +0000)]
Merge "Make a11y node info parceling more robust am:
487d869733 am:
aa2da19dc6" into oc-dev-plus-aosp
Phil Weaver [Fri, 7 Apr 2017 23:17:32 +0000 (23:17 +0000)]
Make a11y node info parceling more robust am:
487d869733
am:
aa2da19dc6
Change-Id: I9d21c5a5975cbf6d3e5096124e29d1e8b03ddc03
Phil Weaver [Fri, 7 Apr 2017 23:17:08 +0000 (23:17 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef
am:
b35d6eadf3
Change-Id: I460b2e5df5cc1946eec4e9366e22c5de188642c9
Phil Weaver [Fri, 7 Apr 2017 23:17:02 +0000 (23:17 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev
am:
ce5c8cb6b8
Change-Id: I6cd7aa39d267bbecbbed54f564dc90b520fe5773
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073
am:
93c47c9d07
Change-Id: I8677c77968c202c8c6a0553db919610a140fda58
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am:
487d869733
am:
27e1f88a28
Change-Id: Ic602da1e45e4e906d9e3475a229886913e5dec16
Phil Weaver [Fri, 7 Apr 2017 23:10:27 +0000 (23:10 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev
Phil Weaver [Fri, 7 Apr 2017 23:09:35 +0000 (23:09 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c
am:
4c898e40ef
Change-Id: Icdb456c12bf0e0d3675ab15fa0b82b482ff4ddeb
Phil Weaver [Fri, 7 Apr 2017 23:09:30 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am:
487d869733
Change-Id: I5c85f0dd279f8263aad5b76cbf51dd9d4e0ef549
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am:
487d869733
Change-Id: I57d8feb17000692b6b93d976de43362ce3a34001
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am:
1d8eb49073
Change-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44
Phil Weaver [Fri, 7 Apr 2017 23:02:10 +0000 (23:02 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1
am:
c30868369c
Change-Id: If1cfc920db5aea27397a8f79125db944d5c4580b
Phil Weaver [Fri, 7 Apr 2017 22:53:58 +0000 (22:53 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df
am:
a0f874d5c1
Change-Id: I2bc5c091c1c685da2be951e4294483519481789f
Karthik Ravi Shankar [Fri, 7 Apr 2017 00:02:01 +0000 (17:02 -0700)]
Fix when vr app launches 2d activity
When a 2D app is launched from a VR app, since the VR app was on
DEFAULT_DISPLAY, the 2D app is also moved to DEFAULT_DISPLAY. This needs
to be addressed by moving any non-VR 2D app launch in VR mode to the
virtual display.
Bug:
37111307
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testVrActivityLaunch
Test: #testVrActivityReLaunch
Test: #testPostVrLaunch
Change-Id: I83bffe94bb89415a6b3c026dd7077e70fe36fee0
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Phil Weaver [Fri, 7 Apr 2017 22:46:31 +0000 (22:46 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09
am:
d87b12a4df
Change-Id: Ic10324338024f86cfc64b3e01c6380b26334d5a3
Phil Weaver [Fri, 7 Apr 2017 22:39:22 +0000 (22:39 +0000)]
Make a11y node info parceling more robust
am:
d0e54c1c09
Change-Id: Ie4c34b84540bc928859ef1c271b4eb9d520fa6bc
Shunta Sato [Fri, 7 Apr 2017 22:37:41 +0000 (22:37 +0000)]
Merge "Return to Home stack when a context of tasks launched from Home finished" into oc-dev
am:
d275c9a65c
Change-Id: I04432d298ec4aa604e9615eefb38d4f250839697
Philip P. Moltmann [Fri, 7 Apr 2017 22:36:36 +0000 (22:36 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev
am:
5cd4797c7a
Change-Id: Ie76ce6bbdef0b2d9cce0f954bcc1efdfcc9d0149
TreeHugger Robot [Fri, 7 Apr 2017 22:30:59 +0000 (22:30 +0000)]
Merge "Return to Home stack when a context of tasks launched from Home finished" into oc-dev
Wei Jia [Tue, 4 Apr 2017 23:00:03 +0000 (16:00 -0700)]
MediaPlayer: add 2 more info notifications for playback error
Test: mediaplayer doesn't send error notify to client when only one track has error.
Bug:
24761723
Change-Id: I7221dfdbc6a256532186c654406bbe06de831798
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
(Manual merge from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852
TreeHugger Robot [Fri, 7 Apr 2017 22:21:37 +0000 (22:21 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
(Manual merge from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852
Jorim Jaggi [Fri, 7 Apr 2017 22:14:59 +0000 (22:14 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev
am:
bc4bd823d9
Change-Id: I1c23329a3a18fb58d42c13e91e030f589e19025b
Todd Kennedy [Fri, 7 Apr 2017 22:10:43 +0000 (22:10 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev
am:
e467be5e14
Change-Id: Ib3551cf0dce0afc169b89bc504b8f9ef88746423
Wale Ogunwale [Fri, 7 Apr 2017 22:09:30 +0000 (22:09 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev
am:
77d23337fb
Change-Id: I6c978ab89f31308e359119e6196df909812b3e77
Mihai Nita [Fri, 7 Apr 2017 22:08:21 +0000 (22:08 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev
am:
7354ee76aa
Change-Id: Iec7350226e00bca1acf7e24bbf447f95c53b5c51
Bryce Lee [Fri, 7 Apr 2017 22:06:52 +0000 (22:06 +0000)]
Do not make strong reference to Resources.
This CL removes the strong reference added for mapping display ids
and Resources to Displays. Instead, the key pair is now the display
id and ResourcesKey, and the mapping is pruned when key is
invalidated.
Change-Id: If91368171212b28c40e03c15fb39c72412a44811
Fixes:
36625868
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases --test android.app.cts.DisplayTest#testRotation
TreeHugger Robot [Fri, 7 Apr 2017 22:05:14 +0000 (22:05 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev
* changes:
Introduce android.anim thread in system_server
Fix thread booster
TreeHugger Robot [Fri, 7 Apr 2017 22:04:04 +0000 (22:04 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 22:00:40 +0000 (22:00 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:56:32 +0000 (21:56 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev
Wei Jia [Fri, 7 Apr 2017 21:54:06 +0000 (21:54 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
am:
4c2a62edb6
Change-Id: Ib1b36bf7efe6aea88fa3f370e6e20d897c98b734
Robert Carr [Fri, 7 Apr 2017 21:52:59 +0000 (21:52 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev
am:
ca2622b860
Change-Id: Ibd108646edf7217a9f7656b3c83cd87820649c2d
Wale Ogunwale [Fri, 7 Apr 2017 21:51:50 +0000 (21:51 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev
am:
735a5e1438
Change-Id: Ibef3a6f9e14e7bcb7466832bb6fe147afe7d37d0
TreeHugger Robot [Fri, 7 Apr 2017 21:46:34 +0000 (21:46 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:44:45 +0000 (21:44 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:42:46 +0000 (21:42 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev
Winson Chung [Fri, 7 Apr 2017 01:44:25 +0000 (18:44 -0700)]
Ensure that a PIP activity gets stopped before MW/PIP mode changes.
- Adds a workaround to ensure that onStop() is dispatched to the PIP
activities when the PIP is dismissed
- Consolidating dismiss PIP behavior to call moveTaskToFullscreen().
Now we are consistent, and when we expand the PIP, we call
moveTaskToFullscreen(top), and when dismissing the PIP we call
moveTaskToFullscreen(bottom)
- Fixing issue where we were dispatching extra MW/PIP mode changes when
just expanding the PIP
- Fixing typo in last commit where PIP mode change was not getting
scheduled correctly
- Fixing issue where move-to-fullscreen log was sent for each task
Bug:
36567036
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testStopBeforeMultiWindowCallbacksOnDismiss
Change-Id: I303b88d75e9f136da0c238ef5987804e0684c78e
Signed-off-by: Winson Chung <winsonc@google.com>
Kevin Chyn [Fri, 7 Apr 2017 21:00:58 +0000 (21:00 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am:
1a199ba7e1
Change-Id: Ie74c7067b38d1e34e5fbc3b3d83cbf692f444a53
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 15:53:41 +0000 (08:53 -0700)]
Show recents at correct time when starting activity in docked stack
Previous logic relied on the returnTo type of the task of the activity
we are launching which can get the wrong signal at times because the
original task might have been started from home, but since we are
already in docked mode it shouldn't cause recents activity to be
launched.
We now decide if recents ability should be shown based on if the home
stack is currently visible at the time we started the new activity.
Also, renamed ActivityStack.getStackVisibilityLocked() to
ActivityStack.shouldBeVisible() since it is used to determine if the
stack should be visible and also so it isn't confused with the new
method ActivityStack.isVisible() which returns true if the stack is
currently visible.
Test: manual
Change-Id: I051e72ce93c886d25526af2afef851c95812ab3e
Fixes:
37005549
Andrii Kulian [Fri, 7 Apr 2017 20:30:17 +0000 (20:30 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
am:
4eab3cb11a
Change-Id: I93855ada112e51892d5978c23de506388593aa9e
Andrii Kulian [Fri, 7 Apr 2017 20:22:54 +0000 (20:22 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
Shunta Sato [Mon, 11 Jul 2016 04:32:52 +0000 (13:32 +0900)]
Return to Home stack when a context of tasks launched from Home finished
When the following conditions happen together, another context in
Application stack was launched unexpectedly:
- There is a context of tasks in Application stack, which is launched
from a task on Home stack.
- All tasks/activities in the context are finishing.
Solution:
Add a condition check to see if the task is NOT one of the task
finishing on-top of the top running task.
Bug:
30883775
Test: manual
Author: Ichitaro Kohara <ichitaro.kohara@sonymobile.com>
Change-Id: I5d6097a7c8dc2733ff684957370c987dd158e329
Charles He [Fri, 7 Apr 2017 20:16:20 +0000 (20:16 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
am:
23a7c1e870
Change-Id: I10b10af2f7caac3bfd2ec9b28335fdf4a1647b2c
Jorim Jaggi [Tue, 28 Mar 2017 17:50:01 +0000 (18:50 +0100)]
Introduce android.anim thread in system_server
We create a new thread on which everything is running that
directly impacts window animations, i.e. layout, anim tick and
starting window creation. This is such that any work on
android.display can not lead to jank in the window animation,
specifically lock contention on activity manager lock that blocks
callbacks from android.display into AM can not lead to window
animation jank.
Test: Run animation, take systrace, make sure animation is on
android.anim
Test: AppWindowContainerControllerTestTest: AppWindowContainerControllerTestss
Fixes:
36792959
Change-Id: I5d41419a709b7984724e7053a3afdcc1ffe1aaa2
Charles He [Fri, 7 Apr 2017 20:06:16 +0000 (20:06 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
Todd Kennedy [Fri, 7 Apr 2017 18:38:39 +0000 (11:38 -0700)]
copy 'visbileToInstantApps' setting
Change-Id: I342a133ae8d7f38008cb03706d160e6f2e2cca97
Fixes:
37002720
Test: Start instant app [adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d http://www.realestate.com.au/property-apartment-nsw-pyrmont-
124879602] and see that hitting the 'share' icon works
OSDN Git Service
