OSDN Git Service
John Reck [Fri, 12 Aug 2016 15:24:33 +0000 (08:24 -0700)]
resolve merge conflicts of
cdbdd46 to master
Change-Id: I18a60477799865973fc9d6c876d95e3cee6e5031
John Reck [Fri, 12 Aug 2016 14:39:36 +0000 (14:39 +0000)]
Fix NPE in TextureView am:
7e237189c2
am:
ed1f1399d4
Change-Id: I1166edf4590e2846e6c115cbe9c9455ee46b64b5
John Reck [Fri, 12 Aug 2016 14:31:49 +0000 (14:31 +0000)]
Fix NPE in TextureView
am:
7e237189c2
Change-Id: I16d37e5c8ab6b81b57f510be5cdea09047cdbd79
Bill Yi [Fri, 12 Aug 2016 11:06:09 +0000 (11:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ccd9ff6157 -s ours am:
d4d3503d57 -s ours
am:
71bc495524 -s ours
Change-Id: I47da45416ea954063d16d1e481865c8368410ebf
Bill Yi [Fri, 12 Aug 2016 11:06:05 +0000 (11:06 +0000)]
Import translations. DO NOT MERGE am:
7e33c8c4d2 -s ours am:
4415f7ceca -s ours
am:
00a748e8bf -s ours
Change-Id: Ic3550a31e6bd1f14830d0674464ba451398f117e
Bill Yi [Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ccd9ff6157 -s ours
am:
d4d3503d57 -s ours
Change-Id: I328576af4b4f006176a98fe8279e44803bb80432
Bill Yi [Fri, 12 Aug 2016 10:58:09 +0000 (10:58 +0000)]
Import translations. DO NOT MERGE am:
7e33c8c4d2 -s ours
am:
4415f7ceca -s ours
Change-Id: Ied502c98f68e9ff417fc2babbf26f8bb952f454a
Bill Yi [Fri, 12 Aug 2016 10:51:37 +0000 (10:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ccd9ff6157 -s ours
Change-Id: I2191e7d4670a9852c72bf18cef1513cd7236ee80
Bill Yi [Fri, 12 Aug 2016 10:51:35 +0000 (10:51 +0000)]
Import translations. DO NOT MERGE
am:
7e33c8c4d2 -s ours
Change-Id: Iafc428588907eee40e8d1f8a3f306179c0cf83ff
TreeHugger Robot [Fri, 12 Aug 2016 10:44:40 +0000 (10:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 09:47:17 +0000 (09:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d97f049315 -s ours am:
a4fc5f2b76 -s ours
am:
5798a13b5e -s ours
Change-Id: I8f53e8edfc54644ca7f79e2c2851d4092a027f86
Bill Yi [Fri, 12 Aug 2016 09:47:10 +0000 (09:47 +0000)]
Import translations. DO NOT MERGE am:
ab3feb2c95 -s ours am:
505a717a4b -s ours
am:
a4314f27bc -s ours
Change-Id: I3aeeae85e5b1cb19af713501b5e59cea1e4fd466
Bill Yi [Fri, 12 Aug 2016 09:47:03 +0000 (09:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
438c3cbffe -s ours am:
545c97d0b8 -s ours
am:
fa25ce0fe4 -s ours
Change-Id: Ie7104c1a647ecaf309093fbee6ebf4c3519d3f52
Bill Yi [Fri, 12 Aug 2016 09:46:56 +0000 (09:46 +0000)]
Import translations. DO NOT MERGE am:
cf9a807e7e -s ours am:
d943567007 -s ours
am:
b0998a8837 -s ours
Change-Id: I2b41f120c6331c40ed9d78f32e073d8fdaa4dd8a
Bill Yi [Fri, 12 Aug 2016 09:39:56 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d4640c213d -s ours
am:
5de7e1667e -s ours
Change-Id: I2b8e966a25261ee261c030cac6766636845c758a
Bill Yi [Fri, 12 Aug 2016 09:39:51 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
62a3424ebb -s ours
am:
09e331e97b -s ours
Change-Id: If8e1072453fae77f2326a20cc07d7c56a987fbe1
Bill Yi [Fri, 12 Aug 2016 09:39:46 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d97f049315 -s ours
am:
a4fc5f2b76 -s ours
Change-Id: I32213fc43c9f653b35ee856d72284158a5ae8d1a
Bill Yi [Fri, 12 Aug 2016 09:39:42 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
ab3feb2c95 -s ours
am:
505a717a4b -s ours
Change-Id: I5d36313dfee93f7bbd4e0c0d2624e6ead1bc8b44
Bill Yi [Fri, 12 Aug 2016 09:39:38 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
438c3cbffe -s ours
am:
545c97d0b8 -s ours
Change-Id: I4502b45acbe9c6e23f13bb8f2279bb31e8550cd5
Bill Yi [Fri, 12 Aug 2016 09:39:34 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
cf9a807e7e -s ours
am:
d943567007 -s ours
Change-Id: I123efbf60e6b08e6eab6234ab5eeb8a5fc49e593
Bill Yi [Fri, 12 Aug 2016 09:34:32 +0000 (09:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d4640c213d -s ours
Change-Id: I5ee0e42879aaf09a93813de1d5cdb9e8c52734f2
Bill Yi [Fri, 12 Aug 2016 09:34:26 +0000 (09:34 +0000)]
Import translations. DO NOT MERGE
am:
62a3424ebb -s ours
Change-Id: Id431b60d75f6cd548b2b7595cc1d8b1032594571
Bill Yi [Fri, 12 Aug 2016 09:32:00 +0000 (09:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d97f049315 -s ours
Change-Id: I33e2836cf2560848cbb35d25df34757672960ac1
Bill Yi [Fri, 12 Aug 2016 09:31:58 +0000 (09:31 +0000)]
Import translations. DO NOT MERGE
am:
ab3feb2c95 -s ours
Change-Id: Ic1d0955c598c90d8d86a99d6dc19f7a12d476541
Bill Yi [Fri, 12 Aug 2016 09:31:55 +0000 (09:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
438c3cbffe -s ours
Change-Id: I1678c90c02ce16239aabcbf66aa3573d33ea1fca
Bill Yi [Fri, 12 Aug 2016 09:31:54 +0000 (09:31 +0000)]
Import translations. DO NOT MERGE
am:
cf9a807e7e -s ours
Change-Id: Ib6dd7fb5af9678f7e8bfc8ce55d4f34e9b7a7b59
TreeHugger Robot [Fri, 12 Aug 2016 09:26:05 +0000 (09:26 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 12 Aug 2016 09:25:27 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 12 Aug 2016 09:24:55 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 12 Aug 2016 09:24:37 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 09:24:19 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 07:26:31 +0000 (00:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib152ecb48817f123084dd0c776f3aa6393fc3f83
Auto-generated-cl: translation import
Bill Yi [Fri, 12 Aug 2016 07:13:54 +0000 (00:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27949ecc8590b8c00ddac9c45000e34c11205a29
Auto-generated-cl: translation import
Bill Yi [Fri, 12 Aug 2016 07:06:34 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I617474f76296482b1eade0ad6ed909b4c4fd25c7
Auto-generated-cl: translation import
Bill Yi [Fri, 12 Aug 2016 06:53:14 +0000 (23:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c1c33067f7aa4bc2396222140eeb0094305965c
Auto-generated-cl: translation import
Sanket Padawe [Fri, 12 Aug 2016 03:05:58 +0000 (03:05 +0000)]
Make data warning notification heads up. am:
c015e1c63c am:
73bcc6e0f3
am:
260705d617
Change-Id: Ib47c478c2e8a059e3f3b5c63c1597322fae15f2a
Chong Zhang [Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am:
305d610fd8 am:
74670684d4
am:
541d028da4
Change-Id: I095b6af71821585064f51f3a992293b21fabc742
Andrii Kulian [Fri, 12 Aug 2016 03:05:49 +0000 (03:05 +0000)]
Allow to keep screen on only if window can be seen am:
b20addbdfb am:
19353b45e5
am:
c3e2694eb5
Change-Id: I5372d8ed619ddfd1bd141e3189396dc5c42e5f98
Chih-Hung Hsieh [Fri, 12 Aug 2016 03:05:45 +0000 (03:05 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master am:
ed935c32f4 am:
ef57a0d629
am:
61bc404c0c
Change-Id: I4b57bb0e5c418a8d3305c0b337afd290a778c9b4
TreeHugger Robot [Fri, 12 Aug 2016 03:03:54 +0000 (03:03 +0000)]
Merge "resolve merge conflicts of
56996ff to master"
TreeHugger Robot [Fri, 12 Aug 2016 02:51:06 +0000 (02:51 +0000)]
Merge "Fixed NetworkPolicyManagerServiceTest."
Bill Yi [Fri, 12 Aug 2016 02:18:50 +0000 (19:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2adf619d5a27506386d4f59beda29537734437c1
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 12 Aug 2016 02:16:56 +0000 (02:16 +0000)]
Merge "HWUI unit test for AVD on HwLayer"
Chih-hung Hsieh [Fri, 12 Aug 2016 02:14:32 +0000 (02:14 +0000)]
Merge "Fix clang-tidy warnings in aapt and aapt2."
Sanket Padawe [Fri, 12 Aug 2016 01:58:54 +0000 (01:58 +0000)]
Merge "Make data warning notification heads up." into nyc-mr1-dev am:
36879a9d82
am:
d475ebeed6
Change-Id: If058c53812ccda35b642876bb55eab2baad69c34
Sanket Padawe [Fri, 12 Aug 2016 01:58:50 +0000 (01:58 +0000)]
Make data warning notification heads up. am:
c015e1c63c
am:
73bcc6e0f3
Change-Id: I4331b1ee94d1f8e871aaebec874959c650d2d10c
Sanket Padawe [Fri, 12 Aug 2016 01:49:23 +0000 (01:49 +0000)]
Merge "Make data warning notification heads up." into nyc-mr1-dev
am:
36879a9d82
Change-Id: I8c5e00081e54134c61a5ca5fc9504e897f22f125
Sanket Padawe [Fri, 12 Aug 2016 01:49:21 +0000 (01:49 +0000)]
Make data warning notification heads up.
am:
c015e1c63c
Change-Id: I826fadc6fdda8707ec280b11379201f72b861362
Jin Seok Park [Fri, 12 Aug 2016 01:44:26 +0000 (01:44 +0000)]
Merge "ExifInterface: Refactor IFD type variables"
Sanket Padawe [Fri, 12 Aug 2016 01:38:44 +0000 (01:38 +0000)]
Merge "Make data warning notification heads up." into nyc-mr1-dev
Chih-Hung Hsieh [Fri, 12 Aug 2016 01:13:57 +0000 (18:13 -0700)]
resolve merge conflicts of
56996ff to master
Change-Id: Ia5a645a3fa97408601aedc4eea19eaacb13cd947
Chong Zhang [Fri, 12 Aug 2016 00:57:02 +0000 (00:57 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am:
305d610fd8
am:
74670684d4
Change-Id: I5480cd6b338a25e97712d94464bf6b03237cfff9
Andrii Kulian [Fri, 12 Aug 2016 00:56:58 +0000 (00:56 +0000)]
Allow to keep screen on only if window can be seen am:
b20addbdfb
am:
19353b45e5
Change-Id: Id0d729e59d156ec93a59031efa670642c1b70502
Chong Zhang [Fri, 12 Aug 2016 00:52:17 +0000 (00:52 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
am:
305d610fd8
Change-Id: Ib3d0beeed54a52b1185456b0c859859c61548d50
Andrii Kulian [Fri, 12 Aug 2016 00:52:14 +0000 (00:52 +0000)]
Allow to keep screen on only if window can be seen
am:
b20addbdfb
Change-Id: I09e12733e8073814f8d16c3d4025db8f042c2f25
Bill Yi [Fri, 12 Aug 2016 00:46:52 +0000 (17:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ica26eda1affce4d1c7d72e0d17d4ee667901eefc
Auto-generated-cl: translation import
Chong Zhang [Fri, 12 Aug 2016 00:42:56 +0000 (00:42 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:40:25 +0000 (00:40 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master am:
ed935c32f4
am:
ef57a0d629
Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084
Doris Liu [Wed, 3 Aug 2016 00:28:30 +0000 (17:28 -0700)]
HWUI unit test for AVD on HwLayer
This test puts AVD on a HWLayer and check that after prepareTree
the correct damage rect for the layer is enqueued.
This verifies the fix for bug
30166063
Change-Id: Ia37847357bb00d54f08ee253013db83d46783fbd
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:31:29 +0000 (00:31 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
am:
ed935c32f4
Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
TreeHugger Robot [Fri, 12 Aug 2016 00:26:35 +0000 (00:26 +0000)]
Merge "Bring back old constructor for layoutlib."
Ruben Brunk [Fri, 12 Aug 2016 00:25:10 +0000 (00:25 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev am:
f36d81038a am:
fbde186842
am:
494855abe8
Change-Id: Iaa1fd9893bc1c793d2357f717dfcdb79d4134cd5
Ruben Brunk [Fri, 12 Aug 2016 00:25:04 +0000 (00:25 +0000)]
Include tids in android.util.Process exceptions. am:
4c0c4df7cf am:
f23fabf54e
am:
e6446636f9
Change-Id: I09270fb77bd064a60786853b7cdd0ffd99b083e4
Ruben Brunk [Fri, 12 Aug 2016 00:16:40 +0000 (00:16 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev am:
f36d81038a
am:
fbde186842
Change-Id: Ia38c0e464c11fb71bec8793eed15017d6a33356d
Ruben Brunk [Fri, 12 Aug 2016 00:16:32 +0000 (00:16 +0000)]
Include tids in android.util.Process exceptions. am:
4c0c4df7cf
am:
f23fabf54e
Change-Id: I677f5eece0b8ea7c86541766eb6aa8c9f2b7ff94
Ruben Brunk [Fri, 12 Aug 2016 00:07:26 +0000 (00:07 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev
am:
f36d81038a
Change-Id: Ia3a3ab547f93158dbec22fa89939ec8939a3f6aa
Ruben Brunk [Fri, 12 Aug 2016 00:07:24 +0000 (00:07 +0000)]
Include tids in android.util.Process exceptions.
am:
4c0c4df7cf
Change-Id: Ic0950e41aaa767e00610a77a57145c4a1bac2c85
Ruben Brunk [Fri, 12 Aug 2016 00:00:35 +0000 (00:00 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:46 +0000 (16:48 -0700)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
Lei Yu [Thu, 11 Aug 2016 23:44:47 +0000 (23:44 +0000)]
Merge "Change the function "setPolicyLimitBytes" and "setPolicyWarningBytes"."
Chong Zhang [Thu, 11 Aug 2016 23:36:04 +0000 (23:36 +0000)]
Merge "Fix build break due to
44089019"
Sanket Padawe [Thu, 11 Aug 2016 23:34:10 +0000 (16:34 -0700)]
Make data warning notification heads up.
Bug:
30760683
Change-Id: Id3fed0a62936dddabcb169536a4a917d750259d7
Chong Zhang [Thu, 11 Aug 2016 23:27:43 +0000 (16:27 -0700)]
Fix build break due to
44089019
Change-Id: I8be137ab667f024b3ae5cbd17344e0bb4bc322ee
Treehugger Robot [Thu, 11 Aug 2016 23:20:47 +0000 (23:20 +0000)]
Merge "Fix clang-tidy warnings in libs/hwui."
Jakub Pawlowski [Thu, 11 Aug 2016 23:17:53 +0000 (23:17 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master am:
5aa4ba3776 am:
84b61fb4b0
am:
ecd10beefd
Change-Id: I4d72144cfd66a51fe8e2aaaf93ed4c4981830d3b
Jakub Pawlowski [Thu, 11 Aug 2016 23:11:19 +0000 (23:11 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master am:
5aa4ba3776
am:
84b61fb4b0
Change-Id: Id1dc84ba248e6d91bcab28f94b9c2b29dc16787d
Jakub Pawlowski [Thu, 11 Aug 2016 23:05:49 +0000 (23:05 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master
am:
5aa4ba3776
Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
Jeff Sharkey [Thu, 11 Aug 2016 22:54:13 +0000 (16:54 -0600)]
Bring back old constructor for layoutlib.
Bug:
28634953
Change-Id: I72edcdc498b4d85d68e85768dcf839ecb1ab5db7
Jakub Pawlowski [Thu, 11 Aug 2016 22:53:06 +0000 (15:53 -0700)]
resolve merge conflicts of
5671277 to stage-aosp-master
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
Jakub Pawlowski [Thu, 11 Aug 2016 22:32:22 +0000 (22:32 +0000)]
Merge "Add LE Secure Connection data parsing (1/4)"
Jakub Pawlowski [Thu, 28 Jul 2016 12:21:36 +0000 (05:21 -0700)]
Add LE Secure Connection data parsing (1/4)
Bug:
30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
Chih-Hung Hsieh [Wed, 10 Aug 2016 21:15:30 +0000 (14:15 -0700)]
Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters.
Bug:
30407689
* Use const reference type to avoid unnecessary copy.
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Amith Yamasani [Thu, 11 Aug 2016 22:02:57 +0000 (22:02 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am:
792aaab77a am:
c76f8c1b55
am:
1727db3961
Change-Id: I5240e943a397f59f4095ede9b3b618836c3ad4ba
Amith Yamasani [Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)]
Clean up when recycling a pid with a pending launch am:
d86e14e45c am:
92de60bd7f
am:
1fa3fd30bd
Change-Id: Ib4e36dc0be9c6a73907bbdf7f146a20e0d2eeb3f
Wale Ogunwale [Thu, 11 Aug 2016 22:02:14 +0000 (22:02 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am:
efa21a9924 am:
70d32b3d22
am:
57d2fbce83
Change-Id: I3d002df3a23b26c18e3b3507fbcec69d58a69140
Wale Ogunwale [Thu, 11 Aug 2016 22:01:41 +0000 (22:01 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags am:
3c0d44e633 am:
5d132bf021
am:
440890193f
Change-Id: I033ce2d6cc9ead32c9158457dca218d3e8b10857
Chong Zhang [Thu, 11 Aug 2016 21:56:20 +0000 (21:56 +0000)]
Some fixes for transition animation selection am:
808621ca54 am:
3d2acc1ab6
am:
867d9569df -s ours
Change-Id: Ib224b9103f8cb32f12fa75f4474f38dab8443038
Jeff Sharkey [Thu, 11 Aug 2016 21:21:53 +0000 (21:21 +0000)]
Merge "Take the "tf" out of "wtf"."
Jeff Sharkey [Thu, 11 Aug 2016 21:20:23 +0000 (15:20 -0600)]
Take the "tf" out of "wtf".
You can't DropBox until you have DropBox, otherwise bad things will
happen.
Bug:
28634953
Change-Id: I43c590ac329c7a544215df3023ad07a0b32b5691
Amith Yamasani [Thu, 11 Aug 2016 21:19:53 +0000 (21:19 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am:
792aaab77a
am:
c76f8c1b55
Change-Id: If18b8d2947a1bcddeda6f3cc7c74b8ce7ea536f5
Amith Yamasani [Thu, 11 Aug 2016 21:19:49 +0000 (21:19 +0000)]
Clean up when recycling a pid with a pending launch am:
d86e14e45c
am:
92de60bd7f
Change-Id: Iedb5153b37f8e240b545c97b99248a18e9f8613e
Wale Ogunwale [Thu, 11 Aug 2016 21:19:45 +0000 (21:19 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am:
efa21a9924
am:
70d32b3d22
Change-Id: I7b235a555e585900e7949f79757d7555e277270d
Wale Ogunwale [Thu, 11 Aug 2016 21:19:10 +0000 (21:19 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags am:
3c0d44e633
am:
5d132bf021
Change-Id: I637742001089d128a22762411b35b5973dd604ae
Chong Zhang [Thu, 11 Aug 2016 21:18:37 +0000 (21:18 +0000)]
Some fixes for transition animation selection am:
808621ca54
am:
3d2acc1ab6
Change-Id: I0158f63b4ad154aabe0a53a8b8030ab914f76c29
Phil Weaver [Thu, 11 Aug 2016 21:12:00 +0000 (21:12 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev am:
364580d20a am:
f933858b07
am:
807eb48292
Change-Id: I5dffed06abf7f88ee556f78407adc036d192fee4
Phil Weaver [Thu, 11 Aug 2016 21:11:57 +0000 (21:11 +0000)]
Limit capabilities of a11y gesture dispatch. am:
a8918f23c7 am:
0e97bb6c1a
am:
3d40beacfd
Change-Id: I006b848679d7e605740e1e1e9eecddad7878873b
Phil Weaver [Thu, 11 Aug 2016 21:11:53 +0000 (21:11 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am:
aefa892035 am:
4e1d6f439a
am:
cdcb846081
Change-Id: I356b0ab5ed7827738a22e25421e640c2e7921b0d
Phil Weaver [Thu, 11 Aug 2016 21:11:49 +0000 (21:11 +0000)]
Don't preserve a11y focus in hierarchy state. am:
f40ee509c6 am:
711d7260ba
am:
99633b3700
Change-Id: I681bd187bc1bc8621a82d177e11033e2845bb437
Amith Yamasani [Thu, 11 Aug 2016 21:06:23 +0000 (21:06 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
am:
792aaab77a
Change-Id: I908d6adb238d47b42f4c756e07ec1d0ac137f8d5
Amith Yamasani [Thu, 11 Aug 2016 21:05:51 +0000 (21:05 +0000)]
Clean up when recycling a pid with a pending launch
am:
d86e14e45c
Change-Id: If77af8cc8a0b9620c2fc5e4704c178667fc0703e
OSDN Git Service
