OSDN Git Service
Christopher Tate [Sun, 14 Aug 2016 00:45:20 +0000 (00:45 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev am:
6ae8693cd7 am:
0fdb14ae80
am:
3af9d12cce
Change-Id: Ieda56c13a9b2e3252c7679a1a026efec06a757e2
Christopher Tate [Sun, 14 Aug 2016 00:45:17 +0000 (00:45 +0000)]
Remember all wallpapers' backup-allow state am:
c613c63096 am:
67c0d08a46
am:
544a8bd01e
Change-Id: I2a8784957187b426ea1cc788f47acb60026d9eef
Adrian Roos [Sun, 14 Aug 2016 00:45:13 +0000 (00:45 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev am:
6912cf9b30 am:
75ff71de77
am:
7d3af99180
Change-Id: I61b667ef772b2ccc025e52e6767403a786c6a1bc
Adrian Roos [Sun, 14 Aug 2016 00:45:09 +0000 (00:45 +0000)]
Fix LockscreenWallpaper jank am:
d866b02d54 am:
bce85f3986
am:
de3e10b81c
Change-Id: I4f11f357835d314b445db488d14e4a44a8f768dc
Robert Carr [Sun, 14 Aug 2016 00:41:42 +0000 (00:41 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev am:
64d7220153 am:
8c9aa63827
am:
7faf386ef3
Change-Id: I6af0e16c731a0d3c43908b24a9b5223fa1c801f0
Robert Carr [Sun, 14 Aug 2016 00:41:39 +0000 (00:41 +0000)]
Copy exiting app token list while stepping animation. am:
46831fa9ff am:
8cf4062a07
am:
05328cc9bf
Change-Id: Ib4354dfe25aad63a9c540e3ba03e67fca3b175cb
Hui Shu [Sun, 14 Aug 2016 00:41:36 +0000 (00:41 +0000)]
Merge "Fix documentation." into nyc-mr1-dev am:
caef4afe42 am:
42373881fe
am:
9c164ceb81
Change-Id: I1dad362b353581d9551fb58445af108a066cc335
Hui Shu [Sun, 14 Aug 2016 00:41:33 +0000 (00:41 +0000)]
Fix documentation. am:
bd042e666a am:
440d84f99a
am:
68cee7e245
Change-Id: I33cc61c64c85a8b0bee7338feb55d5551cc2fd26
Phil Weaver [Sun, 14 Aug 2016 00:41:28 +0000 (00:41 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35 am:
b0d9af4e2b am:
136111cb96
am:
1441b44507
Change-Id: I448cf735060d356f5dbfe454e3d91887882745ce
Adrian Roos [Sun, 14 Aug 2016 00:34:47 +0000 (00:34 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am:
1ee928a62a am:
6d635c1960
am:
cbeab0167f
Change-Id: I995873a027c929b414ea0b4a9b623ef92bd0018b
Adrian Roos [Sun, 14 Aug 2016 00:34:13 +0000 (00:34 +0000)]
Assist: Allow disabling the disclosure animation am:
2335bd6787 am:
57d1601849
am:
ae96089711
Change-Id: I3d086e48a7ea312ae972495a157f18b62bc36e13
Phil Weaver [Sun, 14 Aug 2016 00:34:08 +0000 (00:34 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35 am:
9e07404742
am:
e9c343d728
Change-Id: I19eb7d8b9530a87889ea94ff6a9ca0559efed89f
Alison Cichowlas [Sun, 14 Aug 2016 00:34:05 +0000 (00:34 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev am:
c7d6af6cd0 am:
4445f1e74e
am:
717fa52ebd
Change-Id: I95337fa34789cf82c98b5e8e8598cf2f1387d461
Colin Cross [Sat, 13 Aug 2016 18:20:37 +0000 (11:20 -0700)]
resolve merge conflicts of
f95418e to master
Change-Id: If2b4d34b3ba64f61214b72fd71f8767500e68a53
TreeHugger Robot [Sat, 13 Aug 2016 01:12:41 +0000 (01:12 +0000)]
Merge changes I4af0d9ba,Ic1923343
* changes:
Migrate BugreportReceiverTest to JUnit 4.
Migrate NetworkPolicyManagerServiceTest to JUnit 4.
Rob Carr [Sat, 13 Aug 2016 01:10:31 +0000 (01:10 +0000)]
Merge "Fix build break due to merge."
Christopher Tate [Sat, 13 Aug 2016 00:46:45 +0000 (00:46 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev am:
6ae8693cd7
am:
0fdb14ae80
Change-Id: Ib3f07fd3a91aaabecbce24c68c50d0b13a210c5e
Christopher Tate [Sat, 13 Aug 2016 00:46:35 +0000 (00:46 +0000)]
Remember all wallpapers' backup-allow state am:
c613c63096
am:
67c0d08a46
Change-Id: Ia3d358e8da3a68defccefedc0e23719b25e41bbf
Christopher Tate [Sat, 13 Aug 2016 00:39:07 +0000 (00:39 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev
am:
6ae8693cd7
Change-Id: Iade90bf272d1b05c18b79c679c53ada2a8782742
Christopher Tate [Sat, 13 Aug 2016 00:39:01 +0000 (00:39 +0000)]
Remember all wallpapers' backup-allow state
am:
c613c63096
Change-Id: I0f1e1bf9c747c6b8678e121517f230d6a9e934dc
Adrian Roos [Sat, 13 Aug 2016 00:28:09 +0000 (00:28 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev am:
6912cf9b30
am:
75ff71de77
Change-Id: Ie81379189c19be45c5c1002c8ad3916bad20d56f
Adrian Roos [Sat, 13 Aug 2016 00:28:03 +0000 (00:28 +0000)]
Fix LockscreenWallpaper jank am:
d866b02d54
am:
bce85f3986
Change-Id: Ia8138f5db517412c9fc8491cca69caf82a881530
TreeHugger Robot [Sat, 13 Aug 2016 00:24:10 +0000 (00:24 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev
Adrian Roos [Sat, 13 Aug 2016 00:20:10 +0000 (00:20 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev
am:
6912cf9b30
Change-Id: Ib9c4252cf57d59daded6f2c5cdec143ece1a28fb
Adrian Roos [Sat, 13 Aug 2016 00:20:08 +0000 (00:20 +0000)]
Fix LockscreenWallpaper jank
am:
d866b02d54
Change-Id: Iad0c7104d644ebe5fa86a12cc765fc0916103c19
TreeHugger Robot [Sat, 13 Aug 2016 00:13:18 +0000 (00:13 +0000)]
Merge "Update navup button content description when it's menu."
TreeHugger Robot [Sat, 13 Aug 2016 00:12:59 +0000 (00:12 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev
Robert Carr [Sat, 13 Aug 2016 00:04:03 +0000 (00:04 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev am:
64d7220153
am:
8c9aa63827
Change-Id: I3def8f6d7fdc08104a0b428f436967481dd578fb
Robert Carr [Sat, 13 Aug 2016 00:03:55 +0000 (00:03 +0000)]
Copy exiting app token list while stepping animation. am:
46831fa9ff
am:
8cf4062a07
Change-Id: Iee486eaeaca5211c2ee284602b9e593be385e03c
Robert Carr [Fri, 12 Aug 2016 23:55:31 +0000 (23:55 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
am:
64d7220153
Change-Id: I02e3fc3a6738f6b691b57fa3f2771d647e93cd7a
Robert Carr [Fri, 12 Aug 2016 23:55:28 +0000 (23:55 +0000)]
Copy exiting app token list while stepping animation.
am:
46831fa9ff
Change-Id: I53c41afd54b9a315a0734dce357b1eef8485b84b
TreeHugger Robot [Fri, 12 Aug 2016 23:48:12 +0000 (23:48 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
Felipe Leme [Fri, 12 Aug 2016 22:55:17 +0000 (15:55 -0700)]
Migrate BugreportReceiverTest to JUnit 4.
BUG:
30839080
Change-Id: I4af0d9ba26eb07dd78f1eef26c4edb7d3e03f582
Felipe Leme [Fri, 12 Aug 2016 22:19:40 +0000 (15:19 -0700)]
Migrate NetworkPolicyManagerServiceTest to JUnit 4.
BUG:
30839080
Change-Id: Ic192334389eed7596e1f7cb8ce98a5169262418c
Robert Carr [Fri, 12 Aug 2016 23:42:51 +0000 (16:42 -0700)]
Fix build break due to merge.
mAttachedWindow was refactored away.
Change-Id: I4706b2ccf3418511ba91af63e29585519a99770b
TreeHugger Robot [Fri, 12 Aug 2016 23:36:43 +0000 (23:36 +0000)]
Merge "Allow calls to TimedRemoteCaller in parallel."
Hui Shu [Fri, 12 Aug 2016 23:19:45 +0000 (23:19 +0000)]
Merge "Fix documentation." into nyc-mr1-dev am:
caef4afe42
am:
42373881fe
Change-Id: I08d8c3868c396da7a63ce4c716f3267d225390fe
Hui Shu [Fri, 12 Aug 2016 23:19:41 +0000 (23:19 +0000)]
Fix documentation. am:
bd042e666a
am:
440d84f99a
Change-Id: I1d0c75c6692557e1d66ca66036bceda6ca62c702
Phil Weaver [Fri, 12 Aug 2016 23:19:37 +0000 (23:19 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35 am:
b0d9af4e2b
am:
136111cb96
Change-Id: Ie8283c36b339d5baf9473817fe00a858b8f16321
Adrian Roos [Fri, 12 Aug 2016 23:18:23 +0000 (23:18 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am:
1ee928a62a
am:
6d635c1960
Change-Id: I0766aefff761f7a79f9c78bdf57e46429132ceb7
Adrian Roos [Fri, 12 Aug 2016 23:16:53 +0000 (23:16 +0000)]
Assist: Allow disabling the disclosure animation am:
2335bd6787
am:
57d1601849
Change-Id: I5954913f4f210e47d5e3a297f25d3f646cdd2a4b
Jeff Sharkey [Fri, 12 Aug 2016 22:32:47 +0000 (22:32 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev am:
54250f58b2 am:
d30d36c13b
am:
bbfd6c460b
Change-Id: I52254ba589717af888f77670a180c048489f2368
Jeff Sharkey [Fri, 12 Aug 2016 22:32:44 +0000 (22:32 +0000)]
Add property to force restorecon to run. am:
6da39a4406 am:
b0648a173c
am:
a8276cbb41
Change-Id: I0930617d5789444fe02632173a497a7076733403
Rob Carr [Fri, 12 Aug 2016 22:32:38 +0000 (22:32 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev am:
4a86fbc4d9 am:
251cd37b78
am:
0e5bd6c891
Change-Id: I7888cece47eda22cfa006afbf667207e629a7cae
Robert Carr [Fri, 12 Aug 2016 22:32:33 +0000 (22:32 +0000)]
Fix NPE in deferToPendingTransaction. am:
c24078f1a2 am:
885452fe7c
am:
409484440c
Change-Id: Ia7494ade982bcc0eec871cea6c0cd8b930602283
Adrian Roos [Fri, 12 Aug 2016 22:29:36 +0000 (15:29 -0700)]
Fix LockscreenWallpaper jank
Change-Id: I3f11d26eaa51eb509284fb1bb25eab03a4f243a0
Fixes:
30493315
Elliott Hughes [Fri, 12 Aug 2016 22:26:37 +0000 (22:26 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1 am:
2f4c6e3d0d am:
c41a11a0ee
am:
59d4a4ddd0
Change-Id: I6b762f35f7f9bc28e893a058d0c87056786aae2d
Chong Zhang [Fri, 12 Aug 2016 22:26:33 +0000 (22:26 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am:
b6ee436eee am:
998b21c6b6
am:
d14f0980da
Change-Id: Iabd07f20674194d75aad4b375e362198516c0173
Chong Zhang [Fri, 12 Aug 2016 22:20:54 +0000 (22:20 +0000)]
DO NO MERGE -- Revert the following two commits as they're causing flickering am:
44bd57ee25 am:
26509f52d3
am:
8a688436ac -s ours
Change-Id: I9326eeee2a34aca480940dc260fe67ec6c20f02f
Rob Carr [Fri, 12 Aug 2016 22:11:27 +0000 (22:11 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev am:
60ce77aa38 am:
4c1a2d5f99
am:
9d37d21518
Change-Id: I80875640811cf45d1ffa2a39d84d3756636bec21
Robert Carr [Fri, 12 Aug 2016 22:11:22 +0000 (22:11 +0000)]
Account for scaling of surfaceInset area in magnification. am:
298f9278fd am:
b207428305
am:
23f27428f2
Change-Id: Ice16e3fcaf22faa41b80020d1b1bd8e7694d38be
Robert Carr [Fri, 12 Aug 2016 20:50:38 +0000 (13:50 -0700)]
Copy exiting app token list while stepping animation.
Stepping the animation can lead to WindowStateAnimator#finishExit,
which can lead to WindowManagerService#removeWindowInnerLocked, which
can immediately call WindowSurfacePlacer.performSurfacePlacement. From
here we will directly modify mExitingAppTokens for each stack and remove
tokens where exiting is complete. I think removeWindowInnerLocked making
a direct call to performSurfacePlacement is questionable...but changing
semantics there is very risky. For now, simply avoid processing tokens
in the animator if the surface placer has removed them. It seems all we
would want to do is trigger a layout pass, which has just occured anyway.
Bug:
30813094
Change-Id: Iaff77d227e09839f7e6edda6b8f188d164e6da74
Hui Shu [Fri, 12 Aug 2016 21:29:50 +0000 (21:29 +0000)]
Merge "Fix documentation." into nyc-mr1-dev
am:
caef4afe42
Change-Id: Icae5423ea33b2cbbfe120540818a23bdab0a8d2b
Hui Shu [Fri, 12 Aug 2016 21:29:47 +0000 (21:29 +0000)]
Fix documentation.
am:
bd042e666a
Change-Id: Ib749bd51c24a2012cd2b0d87ed70c034f410bc58
Hui Shu [Fri, 12 Aug 2016 21:24:42 +0000 (21:24 +0000)]
Merge "Fix documentation." into nyc-mr1-dev
Phil Weaver [Fri, 12 Aug 2016 21:22:04 +0000 (21:22 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35
am:
9e07404742
Change-Id: Ib855aa8aef984477c1bdfdac5c505381a4a219c8
Philip P. Moltmann [Thu, 11 Aug 2016 00:21:18 +0000 (17:21 -0700)]
Allow calls to TimedRemoteCaller in parallel.
Before the second thread canceled the call from the first thread as the
awaitedSequenceId was set to the second thread.
Change-Id: I7de709dee260a009761e0a3e73f3fe0695d2da2a
Phil Weaver [Fri, 12 Aug 2016 21:14:48 +0000 (21:14 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35
am:
b0d9af4e2b
Change-Id: I95224013192c03b686be454fccf5aef65717a699
Christopher Tate [Fri, 12 Aug 2016 21:13:02 +0000 (14:13 -0700)]
Remember all wallpapers' backup-allow state
...not just system wallpapers.
Bug
30751829
Change-Id: If9f5df33e587e31080a7e65b1cbcae03f9a39f3c
Phil Weaver [Fri, 12 Aug 2016 21:05:15 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: I260318856e390a585b0fdf404a10916f2ee5af82
Phil Weaver [Fri, 12 Aug 2016 21:05:00 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: Ib6c15ab515cf7d2b4bd55453b195bf82d225f272
Alison Cichowlas [Fri, 12 Aug 2016 20:38:04 +0000 (20:38 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev am:
c7d6af6cd0
am:
4445f1e74e
Change-Id: Idc63aff5b4ae607f74bf0e9f7cfa111250c35eda
Adrian Roos [Fri, 12 Aug 2016 20:35:38 +0000 (20:35 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
am:
1ee928a62a
Change-Id: Ia37585801686d1533dfec798a2928469907a0477
Alison Cichowlas [Fri, 12 Aug 2016 20:35:27 +0000 (20:35 +0000)]
Add restart to GlobalActions. am:
f8eca405c1
am:
091fc718d4
Change-Id: Ib0cc25ec7887366ee65a27aed7497cdbbac861b1
Adrian Roos [Fri, 12 Aug 2016 20:35:22 +0000 (20:35 +0000)]
Assist: Allow disabling the disclosure animation
am:
2335bd6787
Change-Id: I2a88e088da3062b7bd10581650de526629973c67
Jeff Sharkey [Fri, 12 Aug 2016 20:35:20 +0000 (20:35 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev am:
54250f58b2
am:
d30d36c13b
Change-Id: Id1c20d75ee02714714cf77ad37a37b88e44c936f
Jeff Sharkey [Fri, 12 Aug 2016 20:35:14 +0000 (20:35 +0000)]
Add property to force restorecon to run. am:
6da39a4406
am:
b0648a173c
Change-Id: I2f244b6a467df6674da4fcac380b9f276a1ee6ca
Rob Carr [Fri, 12 Aug 2016 20:35:06 +0000 (20:35 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev am:
4a86fbc4d9
am:
251cd37b78
Change-Id: I1006878a32a0be2608fb29667b401e4be64e1a6b
Robert Carr [Fri, 12 Aug 2016 20:34:31 +0000 (20:34 +0000)]
Fix NPE in deferToPendingTransaction. am:
c24078f1a2
am:
885452fe7c
Change-Id: I8d2f3da3203237e4406ad8f7938b062f8e2fb293
Chih-Hung Hsieh [Fri, 12 Aug 2016 20:33:02 +0000 (13:33 -0700)]
resolve merge conflicts of
84717d4 to master
Change-Id: I74381544f1157572a212460462e73fd82c12168d
TreeHugger Robot [Fri, 12 Aug 2016 20:28:10 +0000 (20:28 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
Elliott Hughes [Fri, 12 Aug 2016 20:19:16 +0000 (20:19 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1 am:
2f4c6e3d0d
am:
c41a11a0ee
Change-Id: I48c43a9675568c6b6edbf2a94f51a21770196f2c
Alison Cichowlas [Fri, 12 Aug 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev
am:
c7d6af6cd0
Change-Id: I171146f2ebce01147af8816ee8b69765d46f7ecf
Alison Cichowlas [Fri, 12 Aug 2016 20:18:41 +0000 (20:18 +0000)]
Add restart to GlobalActions.
am:
f8eca405c1
Change-Id: Ib9664d086e2ac57db905fbfa03329c1a990051fc
Jeff Sharkey [Fri, 12 Aug 2016 20:18:38 +0000 (20:18 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev
am:
54250f58b2
Change-Id: Ie7fedd80755d76f144a6bfdd50c3c34dc6da7f0e
Jeff Sharkey [Fri, 12 Aug 2016 20:18:35 +0000 (20:18 +0000)]
Add property to force restorecon to run.
am:
6da39a4406
Change-Id: I5eb34da7d5e9a30c23c338cfe1f69d8d3a01854e
Alison Cichowlas [Fri, 12 Aug 2016 20:12:37 +0000 (20:12 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 20:12:15 +0000 (20:12 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev
Rob Carr [Fri, 12 Aug 2016 20:10:46 +0000 (20:10 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev
am:
4a86fbc4d9
Change-Id: I9d36ac2b39d872dd91d0888e355f7c7098522c30
Robert Carr [Fri, 12 Aug 2016 20:10:43 +0000 (20:10 +0000)]
Fix NPE in deferToPendingTransaction.
am:
c24078f1a2
Change-Id: I9755399b591ab66e35884bdd37432a2350ad68e0
Elliott Hughes [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1
am:
2f4c6e3d0d
Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
Rob Carr [Fri, 12 Aug 2016 20:00:05 +0000 (20:00 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev
Chong Zhang [Fri, 12 Aug 2016 19:58:59 +0000 (19:58 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am:
b6ee436eee
am:
998b21c6b6
Change-Id: Ida9b5486a8aee873893a7d14b9aa07b83692049b
Chong Zhang [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
DO NO MERGE -- Revert the following two commits as they're causing flickering am:
44bd57ee25
am:
26509f52d3
Change-Id: Ib2bf3635fad139f4eddbe05a2961e639efa58652
Elliott Hughes [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "recvfrom takes a non-const pointer."
am:
96660b37a1
Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
Rob Carr [Fri, 12 Aug 2016 19:58:50 +0000 (19:58 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev am:
60ce77aa38
am:
4c1a2d5f99
Change-Id: I7fec3fded8e3b15c3026ca0ce1cad41a7d63e559
Robert Carr [Fri, 12 Aug 2016 19:58:44 +0000 (19:58 +0000)]
Account for scaling of surfaceInset area in magnification. am:
298f9278fd
am:
b207428305
Change-Id: I466ec1c5a155640561d1559258421bffacea06ba
Chong Zhang [Fri, 12 Aug 2016 19:49:18 +0000 (19:49 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
am:
b6ee436eee
Change-Id: If0dbc782680fe95d1a460ab8109ed94fd0419e25
Chong Zhang [Fri, 12 Aug 2016 19:49:16 +0000 (19:49 +0000)]
DO NO MERGE -- Revert the following two commits as they're causing flickering
am:
44bd57ee25
Change-Id: Ie4504d027160fd58c3dab7dc372849f2a1e4ae51
Treehugger Robot [Fri, 12 Aug 2016 19:48:38 +0000 (19:48 +0000)]
Merge "recvfrom takes a non-const pointer."
Chong Zhang [Fri, 12 Aug 2016 19:44:11 +0000 (19:44 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
Rob Carr [Fri, 12 Aug 2016 19:42:52 +0000 (19:42 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev
am:
60ce77aa38
Change-Id: I5950a6c5643152d95f0e108250d71b93c96ebf76
Robert Carr [Fri, 12 Aug 2016 19:42:46 +0000 (19:42 +0000)]
Account for scaling of surfaceInset area in magnification.
am:
298f9278fd
Change-Id: I252c1d7810fb877c478f9042a01bc6577bf24179
Chong Zhang [Fri, 12 Aug 2016 18:44:52 +0000 (11:44 -0700)]
DO NO MERGE -- Revert the following two commits as they're causing flickering
When double tapping Recents, need to reinvestigate.
b/
30831873
b/
30790402
Revert "Clear WS.mDestroying on AWT.clearAnimatingFlags"
This reverts commit
c2661e52eae3161ac8c02e831290ad50ad395be2.
Revert "Some fixes for transition animation selection"
This reverts commit
73e9bc3f1557f0320c8af843dfb051f27187361d.
Rob Carr [Fri, 12 Aug 2016 19:37:15 +0000 (19:37 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev
Chih-Hung Hsieh [Fri, 12 Aug 2016 19:35:08 +0000 (19:35 +0000)]
resolve merge conflicts of
17bd236 to stage-aosp-master am:
b3d46b44a3
am:
c76aa69207
Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b
Chih-Hung Hsieh [Fri, 12 Aug 2016 19:30:02 +0000 (19:30 +0000)]
resolve merge conflicts of
17bd236 to stage-aosp-master
am:
b3d46b44a3
Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62
Alexandria Cornwall [Fri, 12 Aug 2016 19:27:31 +0000 (19:27 +0000)]
Merge "AAPT2: Fix resource type id symbol merging"
Adrian Roos [Thu, 11 Aug 2016 22:42:40 +0000 (15:42 -0700)]
Assist: Allow disabling the disclosure animation
Change-Id: I6e7ed00f066fda7cc268119e7aa4133010aa69c1
Fixes:
30809067
Kirill Grouchnikov [Fri, 12 Aug 2016 19:02:54 +0000 (19:02 +0000)]
Merge "Document exception thrown in SoundEffectConstants"