OSDN Git Service
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
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
Makoto Onuki [Thu, 28 Jul 2016 23:15:28 +0000 (23:15 +0000)]
Merge \\\"Prevent shortcut access when user is locked\\\" into nyc-mr1-dev am:
831dd7542f am:
edce9999ec
am:
b02813e34f
Change-Id: I7a3e423333dffaacc0d79073edfc9f656a161e3e
Makoto Onuki [Thu, 28 Jul 2016 23:15:19 +0000 (23:15 +0000)]
Merge \"Prevent shortcut access when user is locked am:
9c850012ca am:
cab2462e38\" into nyc-mr1-dev-plus-aosp
am:
75f76ad5c5
Change-Id: I8c8499b0b819fd82e588e52d9395eb19a5b33b45
Makoto Onuki [Thu, 28 Jul 2016 23:15:16 +0000 (23:15 +0000)]
Prevent shortcut access when user is locked am:
9c850012ca am:
cab2462e38
am:
890f85d70f
Change-Id: Ie6653dcc55b37598a45987d938f07ba31e173ef5
Eric Schmidt [Thu, 28 Jul 2016 23:15:08 +0000 (23:15 +0000)]
docs: Migrating icu4j-framework to permanent home am:
10da34380a am:
23ff2e9d0a
am:
1290e002ec
Change-Id: I8573bb8192f855153ac6f13f80ddb0543e9d7f61
Eric Schmidt [Thu, 28 Jul 2016 23:15:02 +0000 (23:15 +0000)]
docs: Migrate notification-update to notifications docs am:
bcce78731d am:
6e444a4b97
am:
69d5fa5cd3
Change-Id: I14900d9d7b61bdcb4f5dea32449720d5427fc15a
Nick Desaulniers [Thu, 28 Jul 2016 23:13:36 +0000 (23:13 +0000)]
Merge \\"framework: SystemUI: add tracing to Keyguard\\" into nyc-mr1-dev am:
7fd0752e0f
am:
94b3099458
Change-Id: I934df29e5dd8e36ff4246be74e5ca711289fbec5
John Reck [Thu, 28 Jul 2016 23:04:59 +0000 (23:04 +0000)]
Merge "Make SystemClock FastJNI"
Nick Desaulniers [Thu, 28 Jul 2016 23:03:12 +0000 (23:03 +0000)]
Merge "resolve merge conflicts of
9db1877 to master"
Stan Iliev [Wed, 27 Jul 2016 21:55:43 +0000 (17:55 -0400)]
Use Canvas::create_recording_canvas instead of RecordingCanvas ctor
Modify HWUI tests to support different recording canvases. Delete
TestCanvas class and use base Canvas class instead. Use
Canvas::create_recording_canvas to create recording canvas instances
instead of RecordingCanvas constructor.
Change-Id: I651fb9bb4add0874d7110bac467a2eb1012357fc
Adam Lesinski [Thu, 28 Jul 2016 22:10:47 +0000 (22:10 +0000)]
Merge "Remove private package from removed.txt"
Diego Perez [Thu, 28 Jul 2016 21:23:29 +0000 (21:23 +0000)]
Merge "Silence errors when probing for AppCompat views"
Chong Zhang [Thu, 28 Jul 2016 21:10:29 +0000 (21:10 +0000)]
Merge "Dump out last real used app transit type"
Jiaquan He [Thu, 28 Jul 2016 20:55:53 +0000 (20:55 +0000)]
Merge changes Ie9d4a4ab,If0cfb35d,Ic9e53db8
* changes:
Add visibility logic for onTopLauncher.
Add return-to logic for onTopLauncher.
Add more onTopLauncher support.
Chong Zhang [Thu, 28 Jul 2016 00:52:45 +0000 (17:52 -0700)]
Dump out last real used app transit type
Easier for debugging or testing bad exit animations.
bug:
30255354
Change-Id: I8097195bfc918baf66ecc99b55f4845aba2eaff4
Adrian Roos [Thu, 28 Jul 2016 19:01:21 +0000 (19:01 +0000)]
Merge "TrustAgents: Improve debug logging"
Diego Perez [Thu, 28 Jul 2016 16:04:05 +0000 (17:04 +0100)]
Silence errors when probing for AppCompat views
Currently, the only way that layoutlib has to detect if the support
library is a dependency of the project is to try to instantiate one of
the classes. In some cases, this might report errors that we do not want
the user to see since we will fall back to loading the non-appcompat
version.
Bug: http://b.android.com/218478
Change-Id: I064209f2c31d00c0cdfc9edb4cddec40e8e8f416
(cherry picked from commit
71dcc03353d4412231c8d8d0398ccdcad6c225d1)
Jiaquan He [Fri, 8 Jul 2016 17:29:38 +0000 (10:29 -0700)]
Add visibility logic for onTopLauncher.
This commit adds visibility logic to:
- force an on-top launcher to show on the top;
- determine visibility of each activity stack;
- determine visibility of each activity.
Bug:
29250513
Change-Id: Ie9d4a4ab5d2c2e0b2e44daa9d9e91c361de5e116
Jiaquan He [Wed, 15 Jun 2016 22:16:13 +0000 (15:16 -0700)]
Add return-to logic for onTopLauncher.
- When an on-top launcher is moved to back, this commit makes sure
that it's moved to the bottom of the home stack, and the home
stack is moved to back.
- This commit also sets the proper return-to type for tasks launched
from an on-top launcher.
Bug:
29393795
Change-Id: If0cfb35d95a5bdab008a6a3809319d3909a56f19
Roozbeh Pournader [Thu, 28 Jul 2016 17:11:48 +0000 (17:11 +0000)]
Merge "Add test for ascent and descent of serif and mono fonts"
Robin Lee [Thu, 28 Jul 2016 16:49:11 +0000 (16:49 +0000)]
Merge "Unbind from KeyChainService before RPCing to keystore"
Stan Iliev [Thu, 28 Jul 2016 13:06:45 +0000 (13:06 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Takayuki Hoshi [Thu, 28 Jul 2016 06:16:21 +0000 (06:16 +0000)]
Merge "Change default stream volume for TV to 1/4 max instead of 3/4"
John Reck [Thu, 28 Jul 2016 01:46:26 +0000 (18:46 -0700)]
Make SystemClock FastJNI
Change-Id: Iaabe8fbab5cb1ffc472d1fdef3f8fcf9f9a69635
Fyodor Kupolov [Thu, 28 Jul 2016 01:07:00 +0000 (01:07 +0000)]
Merge "More tests for UserController"
Andrew Solovay [Thu, 28 Jul 2016 00:42:44 +0000 (00:42 +0000)]
Merge \\"docs: Moving localized versions of N Preview docs\\" into nyc-dev am:
a15c0c2902
am:
c45e32cca2
Change-Id: If19786a0702fdfdadb3849ee165ce89ad4c48b73
Andrew Solovay [Thu, 28 Jul 2016 00:42:42 +0000 (00:42 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9
am:
bf5981d319
Change-Id: I2b8197150536ddb4cc6ab86a9e56a0bfc213ebff
Andrew Solovay [Thu, 28 Jul 2016 00:32:54 +0000 (00:32 +0000)]
Merge \"docs: Moving localized versions of N Preview docs\" into nyc-dev
am:
a15c0c2902
Change-Id: Ia39604f24d4580a10212240e018aa06fb6f3667e
Andrew Solovay [Thu, 28 Jul 2016 00:32:42 +0000 (00:32 +0000)]
docs: Moving localized versions of N Preview docs
am:
32845b1eb9
Change-Id: I44bd161a0a21e6f7d81ece030cb0a272442c3e9f
Andrew Solovay [Thu, 28 Jul 2016 00:24:08 +0000 (00:24 +0000)]
Merge \\"resolve merge conflicts of
07fe016 to nyc-dev\\" into nyc-dev am:
ed49ee64f0
am:
64e4e6e549
Change-Id: Ic074d4d47bc5f3fa15058aa92c6e40693180a61e