OSDN Git Service
Dan Yu [Fri, 29 Jul 2016 01:56:08 +0000 (01:56 +0000)]
Merge \\\\"docs: Moving L10N versions of Direct Boot docs\\\\" into nyc-dev am:
3744b05b0e am:
fa70537cd6 am:
1ae6dfc6ad
am:
4b679a6015
Change-Id: Ie6be994c6fcd09bfa5a1a569aaaf63d9de721805
Daniel Yu [Fri, 29 Jul 2016 01:56:05 +0000 (01:56 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da am:
6ee0a29bc8 am:
61db5264db
am:
0759bf9bbc
Change-Id: Ic1c9dcf106d9bcd3c0889caa117213dc035d68ac
Dan Yu [Fri, 29 Jul 2016 01:56:02 +0000 (01:56 +0000)]
Merge \\\\"docs: Moving L10N versions of PIP docs\\\\" into nyc-dev am:
1f33503861 am:
67da26112f am:
dc218c8fcb
am:
2991330ce0
Change-Id: I908ffef880efea527a0119dc954b8a45adc13fb7
Daniel Yu [Fri, 29 Jul 2016 01:55:59 +0000 (01:55 +0000)]
docs: Moving L10N versions of PIP docs am:
089055f18c am:
b3d4a4003a am:
82f3ec0d6e
am:
85cb2e2082
Change-Id: I5044805409edeb435efff10049f37cb9d3d0e5d4
Andrew Solovay [Fri, 29 Jul 2016 01:55:56 +0000 (01:55 +0000)]
Merge changes I17119726,Ia1ae819a into nyc-mr1-dev am:
56fc279b7d am:
7dcbf967fa
am:
b952d67008
Change-Id: Icb8ed057290348e4d5de608b1e10ed88003398d2
Andrew Solovay [Fri, 29 Jul 2016 01:53:23 +0000 (01:53 +0000)]
Merge \\\\"docs: Moving internationalized versions of multi-window doc\\\\" into nyc-dev am:
76f3cc7fc0 am:
1108b99e7c am:
0c97adde47
am:
05fcbf0ce6
Change-Id: Ib13fcffe63cc2fc588af8c841574a4a22690dcdc
Andrew Solovay [Fri, 29 Jul 2016 01:53:20 +0000 (01:53 +0000)]
docs: Moving internationalized versions of multi-window doc am:
82a38458e6 am:
8497d93f32 am:
101b9284cc
am:
89db368c79
Change-Id: Ice4e3b743c7001cd1971b20d7fd3adaff93cd8e0
Andrew Solovay [Fri, 29 Jul 2016 01:53:17 +0000 (01:53 +0000)]
Merge \\\"docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab\\\" into nyc-mr1-dev am:
f846766375 am:
4694c23f80
am:
f837d367c0
Change-Id: I16ce74403c8fcfb4888b909fa5eff7b95bc55d0c
Andrew Solovay [Fri, 29 Jul 2016 01:53:14 +0000 (01:53 +0000)]
docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab am:
3bd12d8e8b am:
5a33e2172c
am:
066b450a33
Change-Id: I61fe6a757d70ff69e4af194e16c9e30fb384997c
Andrew Solovay [Fri, 29 Jul 2016 01:53:11 +0000 (01:53 +0000)]
Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev am:
bc819e604f am:
c10534685a
am:
e745b5018a
Change-Id: Ic5406ea1ec43f7443efa5c0055c682a65f4f7fca
Andrew Solovay [Fri, 29 Jul 2016 01:50:24 +0000 (01:50 +0000)]
Merge \\\\"docs: Removing internationalized versions of AfW preview doc\\\\" into nyc-dev am:
40782b2415 am:
948bb428ae am:
e81a547e81
am:
41d134fe68
Change-Id: I00e053b447dda1acc03d5f1249126ac69aa4fe23
Andrew Solovay [Fri, 29 Jul 2016 01:50:22 +0000 (01:50 +0000)]
docs: Removing internationalized versions of AfW preview doc am:
d6d4de697e am:
74c7ef917f am:
b5804ff8fa
am:
6370ad8098
Change-Id: I1dba56187640fb2eba92adce9be8eccbcb0a80f6
Andrew Solovay [Fri, 29 Jul 2016 01:50:18 +0000 (01:50 +0000)]
Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev am:
762dc30ad5 am:
30cb846c33
am:
d6e64b364a
Change-Id: Ie615397927ce2f13e98bdb952ada90407c073299
Andrew Solovay [Fri, 29 Jul 2016 01:50:13 +0000 (01:50 +0000)]
Merge \\\\"docs: Removing N Preview AfW doc, and setting up redirect\\\\" into nyc-dev am:
15e72ce64b am:
a3072a31c8 am:
48569cb18a
am:
2a5c2e2f5c
Change-Id: I7c0a9adc78c4d50758477ccb4af66fe670df41c2
Andrew Solovay [Fri, 29 Jul 2016 01:50:08 +0000 (01:50 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect am:
09f5a77754 am:
a8f987a63d am:
dc63ac21d9
am:
11a584c8c0
Change-Id: I1d5cf529730f471c302e343e0498821586f45710
Android Build Merger (Role) [Fri, 29 Jul 2016 01:40:11 +0000 (01:40 +0000)]
Merge "Merge \\\\"docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table\\\\" into nyc-dev am:
ffe63a4ad8 am:
89d4427097 am:
ba293d3488 am:
4e770e66d4"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:40:00 +0000 (01:40 +0000)]
Merge "docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table am:
563c4f1adb am:
bcfcb6d81c am:
8c1796e935 am:
1e445e60ba"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:39:38 +0000 (01:39 +0000)]
Merge "Merge \\\"Turn off simplePath optimization then Path object is used as out param\\\" into nyc-mr1-dev am:
9b17ebca8f am:
a00a5326d4 am:
b901543315"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:39:28 +0000 (01:39 +0000)]
Merge "Turn off simplePath optimization then Path object is used as out param am:
a6a8557d6e am:
2ef3bdbd7a am:
eeeacd77ee"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:39:16 +0000 (01:39 +0000)]
Merge "Merge \\\"Keyguard: Reapply insets when fitsSystemWindow changes\\\" into nyc-mr1-dev am:
5e0a42848e am:
7c323ce7d7 am:
51fe9421ae"
Andrew Solovay [Fri, 29 Jul 2016 01:38:37 +0000 (01:38 +0000)]
Merge \\\\"docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table\\\\" into nyc-dev am:
ffe63a4ad8 am:
89d4427097 am:
ba293d3488
am:
4e770e66d4
Change-Id: I592c362bec3cec38b9c4a04fc5eeb1c2d66b2b79
Andrew Solovay [Fri, 29 Jul 2016 01:38:30 +0000 (01:38 +0000)]
docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table am:
563c4f1adb am:
bcfcb6d81c am:
8c1796e935
am:
1e445e60ba
Change-Id: I0a1dd5e39d96fb8b0b07e0c8b4638f4b7c94d8eb
sergeyv [Fri, 29 Jul 2016 01:38:25 +0000 (01:38 +0000)]
Merge \\\"Turn off simplePath optimization then Path object is used as out param\\\" into nyc-mr1-dev am:
9b17ebca8f am:
a00a5326d4
am:
b901543315
Change-Id: I978b3056cf5aa81a930a3ae36720e0c51fdc5df4
sergeyv [Fri, 29 Jul 2016 01:38:20 +0000 (01:38 +0000)]
Turn off simplePath optimization then Path object is used as out param am:
a6a8557d6e am:
2ef3bdbd7a
am:
eeeacd77ee
Change-Id: I3b6ce06f5ce241664b322512060581954201c1f7
Adrian Roos [Fri, 29 Jul 2016 01:38:15 +0000 (01:38 +0000)]
Merge \\\"Keyguard: Reapply insets when fitsSystemWindow changes\\\" into nyc-mr1-dev am:
5e0a42848e am:
7c323ce7d7
am:
51fe9421ae
Change-Id: Ia96e1c2c59e83d8d8472a8795fd5998d9f7fe3a2
Mitchell Wills [Fri, 29 Jul 2016 01:37:01 +0000 (01:37 +0000)]
Merge "Don't pull in external/junit through mockito"
Adrian Roos [Fri, 29 Jul 2016 01:29:42 +0000 (01:29 +0000)]
Merge \\\"Keyguard: Reapply insets when fitsSystemWindow changes\\\" into nyc-mr1-dev am:
5e0a42848e am:
7c323ce7d7
am:
01d9cf7e8b
Change-Id: Ib8fe57677de6edd5968509f445d5765141f459e0
Adrian Roos [Fri, 29 Jul 2016 01:29:36 +0000 (01:29 +0000)]
Keyguard: Reapply insets when fitsSystemWindow changes am:
a5d6cd0981 am:
cc0c27f9a9
am:
99ef6706ad
Change-Id: I61be6ae881a0d22a704baf6400c0ffd62cba3c7c
Andrew Solovay [Fri, 29 Jul 2016 01:29:32 +0000 (01:29 +0000)]
Merge \\\"docs: Moving localized versions of N Preview docs\\\" into nyc-dev am:
a15c0c2902 am:
c45e32cca2
am:
8ce49f1212
Change-Id: I8ac482e0e740767b20c05f89214ba3cdc8bf2f74
Andrew Solovay [Fri, 29 Jul 2016 01:29:29 +0000 (01:29 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9 am:
bf5981d319
am:
840f20c961
Change-Id: I9b7f37e8ca614c398708afe9b55f3ea86f9a46c2
Andrew Solovay [Fri, 29 Jul 2016 01:29:26 +0000 (01:29 +0000)]
Merge \\\"resolve merge conflicts of
07fe016 to nyc-dev\\\" into nyc-dev am:
ed49ee64f0 am:
64e4e6e549
am:
abf291b0c8
Change-Id: I3052fe4901363cc3a7a72ba316b352783eb3414f
Andrew Solovay [Fri, 29 Jul 2016 01:26:42 +0000 (01:26 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev am:
0f9a790e0f am:
238ea71c51
am:
e209f0ea56
Change-Id: I63db2da80029fe14ae81660e7ba80c28104bf242
Daniel Yu [Fri, 29 Jul 2016 01:26:37 +0000 (01:26 +0000)]
Merge \\\"docs: Moving L10N versions of Scoped Dir Access docs\\\" into nyc-dev am:
2c77170adb am:
3c733da11e
am:
6dcdd1de64
Change-Id: Ic17d84c38c3b294c7bd1fb6cfc9380608dec5fb7
Daniel Yu [Fri, 29 Jul 2016 01:26:33 +0000 (01:26 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am:
a4fc4209c8 am:
9079210b36
am:
83e66f218a
Change-Id: If18e1e8f8d29b30725db6ed51044d8ee511e9d8f
Daniel Yu [Fri, 29 Jul 2016 01:26:30 +0000 (01:26 +0000)]
Merge \\\"docs: Moving L10N versions of TV recording API docs\\\" into nyc-dev am:
ee7fa57ea6 am:
6569cc9b93
am:
6a93bfcebd
Change-Id: I49822803de27dfc90d1d5a5f4927150e47c6ac51
Daniel Yu [Fri, 29 Jul 2016 01:26:26 +0000 (01:26 +0000)]
docs: Moving L10N versions of TV recording API docs am:
a93eeaa38b am:
63470f763a
am:
a36b3e62dd
Change-Id: I962a0c9f8b477fad207fc981d57df82788839ac2
Daniel Yu [Fri, 29 Jul 2016 01:23:40 +0000 (01:23 +0000)]
Merge \\\"docs: Moving L10N versions of Direct Boot docs\\\" into nyc-dev am:
3744b05b0e am:
c14527f2cd
am:
faa71400bc
Change-Id: Icc0da15c7b7a9bbb35b54d1782501d51ca3b0660
Daniel Yu [Fri, 29 Jul 2016 01:23:37 +0000 (01:23 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da am:
48e4ccc396
am:
30f11d7757
Change-Id: Ia3c083902b7cffa3c2fac29789ee6e20c856f35f
Jeff Sharkey [Fri, 29 Jul 2016 01:23:34 +0000 (01:23 +0000)]
Merge \"Merge \\\"Polish around locked user communication.\\\" into nyc-mr1-dev am:
9882960460 am:
f624e7aefb\" into nyc-mr1-dev-plus-aosp
am:
7fef265268
Change-Id: I3a3246bbc2dde958a8e8ddbcc713612236aeedb0
Jeff Sharkey [Fri, 29 Jul 2016 01:23:31 +0000 (01:23 +0000)]
Merge \\\"Polish around locked user communication.\\\" into nyc-mr1-dev am:
9882960460 am:
f624e7aefb
am:
09065bf62a
Change-Id: I5cf045c8b3e9c11c4e5e98c2ca777f4e7e275f25
Jeff Sharkey [Fri, 29 Jul 2016 01:23:25 +0000 (01:23 +0000)]
Merge \"Polish around locked user communication. am:
b6edaa952e am:
9a0e0021a4\" into nyc-mr1-dev-plus-aosp
am:
1c8b59c80a
Change-Id: Ica48af9081bb817685dae0f8a7b111f5e28d4552
Jeff Sharkey [Fri, 29 Jul 2016 01:23:22 +0000 (01:23 +0000)]
Polish around locked user communication. am:
b6edaa952e am:
9a0e0021a4
am:
7c261c4a79
Change-Id: If7bd5d7902b48212ecbb9d3899b9872a3dc1fa2d
Adrian Roos [Fri, 29 Jul 2016 01:23:15 +0000 (01:23 +0000)]
Merge \"Merge \\\"Allow restarting foreground services once\\\" into nyc-mr1-dev am:
6a1dcb635f am:
378c455ec2\" into nyc-mr1-dev-plus-aosp
am:
6bffe2e7be
Change-Id: I43154e47d02fff5e08ee188ed082d19ed3e8edb8
Adrian Roos [Fri, 29 Jul 2016 01:23:12 +0000 (01:23 +0000)]
Merge \\\"Allow restarting foreground services once\\\" into nyc-mr1-dev am:
6a1dcb635f am:
378c455ec2
am:
8a2b419290
Change-Id: Icbe514ce745abe11f02f3f6c52a9c574d04fb07e
Adrian Roos [Fri, 29 Jul 2016 01:19:16 +0000 (01:19 +0000)]
Merge \"Allow restarting foreground services once am:
805ea307e7 am:
d64259954f\" into nyc-mr1-dev-plus-aosp
am:
fbea3500cc
Change-Id: Ie5fedcd367c71e101f8e32d1613ad5952d892845
Adrian Roos [Fri, 29 Jul 2016 01:19:13 +0000 (01:19 +0000)]
Allow restarting foreground services once am:
805ea307e7 am:
d64259954f
am:
1c40a9dc7e
Change-Id: I81eab50ce000c890c56e3aeb24031098b7e12c9b
Dan Yu [Fri, 29 Jul 2016 01:19:06 +0000 (01:19 +0000)]
Merge \"Merge \\\"docs: Moving L10N versions of PIP docs\\\" into nyc-dev am:
1f33503861 am:
f7c9eec3fd\" into nyc-mr1-dev-plus-aosp
am:
f71fdd2845
Change-Id: I57ce84c83e00b72da0cd5f2091ee585e2a570ce3
Daniel Yu [Fri, 29 Jul 2016 01:19:03 +0000 (01:19 +0000)]
Merge \\\"docs: Moving L10N versions of PIP docs\\\" into nyc-dev am:
1f33503861 am:
f7c9eec3fd
am:
ddd43e20c0
Change-Id: I42dab824a8b6f3feeb5cd9638bb3bbc8550ac60c
Adarsh Fernando [Fri, 29 Jul 2016 01:18:55 +0000 (01:18 +0000)]
Merge \"Merge \\\"Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245\\\" into nyc-mr1-dev am:
b034410564 am:
f90bbe7586\" into nyc-mr1-dev-plus-aosp
am:
391cb506d2
Change-Id: I879e5114d364613379319b23ee7df324e86334d1
Adarsh Fernando [Fri, 29 Jul 2016 01:18:52 +0000 (01:18 +0000)]
Merge \\\"Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245\\\" into nyc-mr1-dev am:
b034410564 am:
f90bbe7586
am:
e924dfc77b
Change-Id: I938172d8a7e3c6b49611669a9264b9b92f143a5c
Daniel Yu [Fri, 29 Jul 2016 01:18:45 +0000 (01:18 +0000)]
Merge \"docs: Moving L10N versions of PIP docs am:
089055f18c am:
e6772cc642\" into nyc-mr1-dev-plus-aosp
am:
7c4205ec6e
Change-Id: I19105bbe10122024c6e41b6630d3f22205ac2f78
Daniel Yu [Fri, 29 Jul 2016 01:18:42 +0000 (01:18 +0000)]
docs: Moving L10N versions of PIP docs am:
089055f18c am:
e6772cc642
am:
97fb9d490f
Change-Id: Ica8fc0d33dbc6b668b0073d11551609332de5d8d
Adarsh Fernando [Fri, 29 Jul 2016 01:18:33 +0000 (01:18 +0000)]
Merge \"Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245 am:
5ffeb645fe am:
71b6e0012b\" into nyc-mr1-dev-plus-aosp
am:
fe4b8b8bea
Change-Id: Ifaa429501c9c0c12b5949d29637c5ecdb9da64f9
Adarsh Fernando [Fri, 29 Jul 2016 01:18:30 +0000 (01:18 +0000)]
Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245 am:
5ffeb645fe am:
71b6e0012b
am:
cf020ba029
Change-Id: I97296e893585cc6455c8a093894bdac85e4e6758
Andrew Solovay [Fri, 29 Jul 2016 01:15:14 +0000 (01:15 +0000)]
Merge \"Merge \\\"docs: Moving internationalized versions of multi-window doc\\\" into nyc-dev am:
76f3cc7fc0 am:
6ecad9689b\" into nyc-mr1-dev-plus-aosp
am:
a0dbc185ba
Change-Id: Iaf959d4a5138f786bbb433527b91ae6a60c0d1a1
Andrew Solovay [Fri, 29 Jul 2016 01:15:10 +0000 (01:15 +0000)]
Merge \\\"docs: Moving internationalized versions of multi-window doc\\\" into nyc-dev am:
76f3cc7fc0 am:
6ecad9689b
am:
01dcaddddc
Change-Id: Ieda66b65bc0f05880f43a993e5edc8f2cf20fb28
Andrew Solovay [Fri, 29 Jul 2016 01:14:58 +0000 (01:14 +0000)]
Merge \"docs: Moving internationalized versions of multi-window doc am:
82a38458e6 am:
d736ab23dd\" into nyc-mr1-dev-plus-aosp
am:
399b159b07
Change-Id: I9f6ca007a7684fc7b15fe0327cd69a6e6cc052f2
Andrew Solovay [Fri, 29 Jul 2016 01:14:53 +0000 (01:14 +0000)]
docs: Moving internationalized versions of multi-window doc am:
82a38458e6 am:
d736ab23dd
am:
3113b53d1f
Change-Id: I526e1b3906b81cd7856ee55732dcb6fa5ade64c1
Andrew Solovay [Fri, 29 Jul 2016 01:14:35 +0000 (01:14 +0000)]
Merge \"docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab am:
37b4ca58e7\" into nyc-mr1-dev-plus-aosp
am:
10381e3e9f
Change-Id: I0a3ad454f2076dd56b14a413f0150104650249b4
Andrew Solovay [Fri, 29 Jul 2016 01:14:27 +0000 (01:14 +0000)]
docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab am:
37b4ca58e7
am:
064c6982a4
Change-Id: I1770a343d3bfcdc630cbb97ece688e32de21c63e
Adam Lesinski [Fri, 29 Jul 2016 01:14:10 +0000 (01:14 +0000)]
Merge \\\"Register isolated UIDs before reporting process state\\\" into nyc-mr1-dev am:
5b9d782a2d am:
8c36268076
am:
bd5135272e
Change-Id: I10e6ad3c8225b8b8862f8c485d668cd1125a70f1
Adam Lesinski [Fri, 29 Jul 2016 01:14:04 +0000 (01:14 +0000)]
Register isolated UIDs before reporting process state am:
e2b78ac686 am:
c526e02c2f
am:
b3d36b7692
Change-Id: I5ae741b85f7b85cc512e0f36f1204b52d1998737
Eric Schmidt [Fri, 29 Jul 2016 01:11:38 +0000 (01:11 +0000)]
docs: Migrating multilingual-support to permanent home. am:
32e428e78e am:
88d57db0ad am:
545ac50759
am:
522a61be58
Change-Id: If8f83b5762c188926e39db0bd8c4bae875734967
Tim Murray [Fri, 29 Jul 2016 01:11:30 +0000 (01:11 +0000)]
Merge \\\"Increase UI and RenderThread priority when not using FIFO.\\\" into nyc-mr1-dev am:
a232c5bed7 am:
79a42c8b32
am:
6caa6ceb46
Change-Id: I21f60bc4ca980de87a4712d55fd6582e8a213408
Tim Murray [Fri, 29 Jul 2016 01:11:23 +0000 (01:11 +0000)]
Increase UI and RenderThread priority when not using FIFO. am:
a636b0b4b6 am:
c8ee2116d7
am:
40e06f9a18
Change-Id: I95c5f8e6e55d52e09be65078e3f67be93ed0f45e
Andrew Solovay [Fri, 29 Jul 2016 01:11:17 +0000 (01:11 +0000)]
Merge \\\"docs: Removing internationalized versions of AfW preview doc\\\" into nyc-dev am:
40782b2415 am:
bb2ecd6a1d
am:
202ca3f7a1
Change-Id: I63901051e7be9bbbf558d15b150527a1d6857513
Andrew Solovay [Fri, 29 Jul 2016 01:11:14 +0000 (01:11 +0000)]
docs: Removing internationalized versions of AfW preview doc am:
d6d4de697e am:
3e93a6be1f
am:
7c0f9fe435
Change-Id: Ife05f574524e4f96e016bd420eefcbf58dbde2ce
Andrew Solovay [Fri, 29 Jul 2016 00:54:52 +0000 (00:54 +0000)]
Merge \\\"docs: Removing N Preview AfW doc, and setting up redirect\\\" into nyc-dev am:
15e72ce64b am:
752dc2ef68
am:
57497e20ea
Change-Id: I066b2288293c381ae0f4cce886b6cf08d70b17ce
Andrew Solovay [Fri, 29 Jul 2016 00:54:49 +0000 (00:54 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect am:
09f5a77754 am:
6d07089d51
am:
aa8327d60c
Change-Id: I2970c5449e004e93784cd26356677cf64788bcd7
Andrew Solovay [Fri, 29 Jul 2016 00:54:46 +0000 (00:54 +0000)]
Merge \\\"docs: Added Android N (API level 24) to the \\\"API levels\\\" table\\\" into nyc-dev am:
ffe63a4ad8 am:
521f56a7df
am:
b699d14ae0
Change-Id: I4cad718c7d700b78be3983a2ca860bfd3b723f11
Andrew Solovay [Fri, 29 Jul 2016 00:54:43 +0000 (00:54 +0000)]
docs: Added Android N (API level 24) to the \\\"API levels\\\" table am:
563c4f1adb am:
436aaefed2
am:
73b842d8cc
Change-Id: Ib0fd720b63ab0104a51584e97494e83be9235b23
Adarsh Fernando [Fri, 29 Jul 2016 00:54:40 +0000 (00:54 +0000)]
Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245 am:
dc356fc113
am:
aec242f563
Change-Id: I35a11a171eb35620006b3e6b8b3c2cf763ff95fd
Eric Schmidt [Fri, 29 Jul 2016 00:37:24 +0000 (00:37 +0000)]
docs: Migrating icu4j-framework to permanent home am:
10da34380a am:
0c8b898e16 am:
8679f95ac0
am:
c3a1068b40
Change-Id: I5a007af596e504e395de969fbcf0a4b404a21283
Eric Schmidt [Fri, 29 Jul 2016 00:37:18 +0000 (00:37 +0000)]
docs: Migrate notification-update to notifications docs am:
bcce78731d am:
0376d329b8 am:
b5f6c9f571
am:
b7e596e799
Change-Id: Iaecaf4ac0b7052db7478f51e172792f0c2f1a4a7
Aga Madurska [Fri, 29 Jul 2016 00:37:13 +0000 (00:37 +0000)]
Merge \\\"Ignore padding for drawing round scrollbars.\\\" into nyc-mr1-dev am:
9801935b95 am:
efc22bd0ce
am:
a689314e65
Change-Id: Ia511e41d636694465d223556449c4609419a70ac
Aga Madurska [Fri, 29 Jul 2016 00:37:09 +0000 (00:37 +0000)]
Ignore padding for drawing round scrollbars. am:
c283507246 am:
9bafa17869
am:
b852e13868
Change-Id: Ib4aaa12ede761b7c1e49735ff9e2f8878fcb9b7a
Andrii Kulian [Fri, 29 Jul 2016 00:37:04 +0000 (00:37 +0000)]
Merge \\\"Correctly finish activity in non-focused stack\\\" into nyc-mr1-dev am:
d3786148f3 am:
4cad633101
am:
498ad9a370
Change-Id: I4f081328330d121fa70a0e202d1f163dda157ebf
Andrii Kulian [Fri, 29 Jul 2016 00:34:16 +0000 (00:34 +0000)]
Correctly finish activity in non-focused stack am:
7318d63ba6 am:
764045c0cc
am:
ffb8c93890
Change-Id: Iac91aa05f08cd8cf0c21097e663f5dd2462123b8
Andrii Kulian [Fri, 29 Jul 2016 00:34:09 +0000 (00:34 +0000)]
Merge \\\"Don\\\'t delay child pressed state in freeform mode\\\" into nyc-mr1-dev am:
671bc2052a am:
0adcd5fa0f
am:
f718b536c2
Change-Id: Ic56f46bae57f49f205397e828095a8d71ea31fef
Andrii Kulian [Fri, 29 Jul 2016 00:34:00 +0000 (00:34 +0000)]
Don\\\'t delay child pressed state in freeform mode am:
a6aea9876e am:
5b637aed1c
am:
5e63277def
Change-Id: I78b84ce650fb3c0430f4f19f228a3f12fee6524a
Chong Zhang [Fri, 29 Jul 2016 00:33:50 +0000 (00:33 +0000)]
Merge \\\"Cleanup mAnimatingExit flag before maybeUpdateTransitToWallpaper()\\\" into nyc-mr1-dev am:
f84d9f91ce am:
68a518c49a
am:
5d0649a35e
Change-Id: I2ce986ce8e998c9a63bb1ac743ed9bcdfe754c4e
Chong Zhang [Fri, 29 Jul 2016 00:33:35 +0000 (00:33 +0000)]
Cleanup mAnimatingExit flag before maybeUpdateTransitToWallpaper() am:
e05bcb15d5 am:
8368eb30a8
am:
be3028824b
Change-Id: Ibd793423dcb9e710f45c7e82d24e301dbe93a47a
Chong Zhang [Fri, 29 Jul 2016 00:27:38 +0000 (00:27 +0000)]
Merge "resolve merge conflicts of
70327bd to master"
Chong Zhang [Fri, 29 Jul 2016 00:22:22 +0000 (17:22 -0700)]
resolve merge conflicts of
70327bd to master
Change-Id: I9f5859fca0ed16406157dbb342a85a4f779f9218
Mitchell Wills [Fri, 29 Jul 2016 00:04:38 +0000 (17:04 -0700)]
Don't pull in external/junit through mockito
android-support-test provides a different version of junit
FIXED=
30481239
Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26
TreeHugger Robot [Thu, 28 Jul 2016 23:49:35 +0000 (23:49 +0000)]
Merge "Use Canvas::create_recording_canvas instead of RecordingCanvas ctor"
Alan Viverette [Thu, 28 Jul 2016 23:22:47 +0000 (23:22 +0000)]
Merge \\\"Avoid potential re-entry as a result of child mutation\\\" into nyc-mr1-dev am:
11fbe5ec75 am:
2a93d1e92c
am:
0bada6d2ae
Change-Id: I0b2e42da5b68d303897a5f05395d51edf135b5a1
Alan Viverette [Thu, 28 Jul 2016 23:22:41 +0000 (23:22 +0000)]
Avoid potential re-entry as a result of child mutation am:
b46ba3b2b0 am:
0d98515cab
am:
762c828704
Change-Id: I41e826722759de148e3f87d31981d008ff911cfe
Adrian Roos [Thu, 28 Jul 2016 23:22:36 +0000 (23:22 +0000)]
Merge \\\"HIC: Base on elapsed time instead of RTC\\\" into nyc-mr1-dev am:
628ef54d06 am:
52724b497f
am:
f770023beb
Change-Id: I30e6b3badd43e2ba19975741a7017e9eb9f53421
Adrian Roos [Thu, 28 Jul 2016 23:22:30 +0000 (23:22 +0000)]
HIC: Base on elapsed time instead of RTC am:
bbb6919945 am:
28edf32edb
am:
0ceb0ac74f
Change-Id: I50c66eb8dc10d65d2c3b90de6c16a2124593b8b5
Doris Liu [Thu, 28 Jul 2016 23:22:25 +0000 (23:22 +0000)]
Merge \\\"Run animation *after* property sync\\\" into nyc-mr1-dev am:
aa54b4e0da am:
8d896f92f0
am:
7e12ff43e9
Change-Id: I0d1a5b755bfbb06509b46f5bc38218bc80ad7286
Doris Liu [Thu, 28 Jul 2016 23:19:37 +0000 (23:19 +0000)]
Run animation *after* property sync am:
7c7052dd9b am:
0053b066e5
am:
c82ef8a51f
Change-Id: I06962e8d068b3d005b4cd4ce38a4028abab3333b
Fan Zhang [Thu, 28 Jul 2016 23:19:31 +0000 (23:19 +0000)]
Merge \\\"Allow system home app to show when filtering app list.\\\" into nyc-mr1-dev am:
4f0d7aad58 am:
21fb5e40be
am:
be6ecd2648
Change-Id: Iac6d40c4734f83ca2f1d1bef98d9b5cd3778a063
Fan Zhang [Thu, 28 Jul 2016 23:19:26 +0000 (23:19 +0000)]
Merge \"Allow system home app to show when filtering app list. am:
8089d48968 am:
57b144eb62\" into nyc-mr1-dev-plus-aosp
am:
b1e2da9b7f
Change-Id: I1b8339e0ff0f229909d28d65800ab97b369df28f
Fan Zhang [Thu, 28 Jul 2016 23:19:18 +0000 (23:19 +0000)]
Allow system home app to show when filtering app list. am:
8089d48968 am:
57b144eb62
am:
d9befc42a8
Change-Id: I533cb40e7426f1d8b9664161b6db09d423a30698
Rob Carr [Thu, 28 Jul 2016 23:18:58 +0000 (23:18 +0000)]
Merge \"Merge \\\"Only restore saved surfaces in the last visible rotation.\\\" into nyc-mr1-dev am:
4898bf964d am:
a43662b2de\" into nyc-mr1-dev-plus-aosp
am:
23cabcb570
Change-Id: Id4a184a15e21d3bd5826e05737029bf580e9d259
Robert Carr [Thu, 28 Jul 2016 23:18:46 +0000 (23:18 +0000)]
Merge \\\"Only restore saved surfaces in the last visible rotation.\\\" into nyc-mr1-dev am:
4898bf964d am:
a43662b2de
am:
c8505cc257
Change-Id: Ib8dfab70086c42476c5034aa96921a0d94a2dd28
Robert Carr [Thu, 28 Jul 2016 23:18:30 +0000 (23:18 +0000)]
Merge \"Only restore saved surfaces in the last visible rotation. am:
237028ae3b am:
5db2a3bb4c\" into nyc-mr1-dev-plus-aosp
am:
270ad5cbe1
Change-Id: I0614d308d910a9ff9944da6533e2b91d36a1e23b
Robert Carr [Thu, 28 Jul 2016 23:18:25 +0000 (23:18 +0000)]
Only restore saved surfaces in the last visible rotation. am:
237028ae3b am:
5db2a3bb4c
am:
7784ce236f
Change-Id: I1d0a70bc143448bac4be26a7cf640c0c1a515da4
Makoto Onuki [Thu, 28 Jul 2016 23:15:33 +0000 (23:15 +0000)]
Merge \"Merge \\\"Prevent shortcut access when user is locked\\\" into nyc-mr1-dev am:
831dd7542f am:
edce9999ec\" into nyc-mr1-dev-plus-aosp
am:
8f5f0f745a
Change-Id: I418c471934a2e01fb31e0047876a7ec2a5974185
OSDN Git Service
