OSDN Git Service
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"
Jiaquan He [Wed, 15 Jun 2016 22:15:12 +0000 (15:15 -0700)]
Add more onTopLauncher support.
- Add onTopLauncher checking for TaskRecord.
- Add onTopLauncher to the window manager.
Bug:
28425537
Change-Id: Ic9e53db891dc42463a1a77b106ba93438a052181
Andrew Solovay [Wed, 27 Jul 2016 23:53:27 +0000 (23:53 +0000)]
Merge \\"docs: Removing internationalized versions of AfW preview doc\\" into nyc-dev am:
40782b2415
am:
bb2ecd6a1d
Change-Id: I6840d732d101be27ad32f306a780fe0d0bd0fa2f
Andrew Solovay [Wed, 27 Jul 2016 23:53:25 +0000 (23:53 +0000)]
docs: Removing internationalized versions of AfW preview doc am:
d6d4de697e
am:
3e93a6be1f
Change-Id: Ifcd3eb04cba1e05f300368b83801002f7827974f
Andrew Solovay [Wed, 27 Jul 2016 23:53:21 +0000 (23:53 +0000)]
Merge \\"docs: Removing N Preview AfW doc, and setting up redirect\\" into nyc-dev am:
15e72ce64b
am:
752dc2ef68
Change-Id: I1beb49545712eb33fbd3c6296f61a910cd80e94b
Roozbeh Pournader [Wed, 27 Jul 2016 23:35:12 +0000 (16:35 -0700)]
Add test for ascent and descent of serif and mono fonts
fontchain_lint now has tests making sure that their ascent and
descent matches that of Roboto.
Also, this moves a test class that contains a similar test and and
other related tests from graphictests to coretests.
Bug:
19791102
Change-Id: I8b473dd2a5f97ae2e3d322a2cabc16f3d32489f6
Andrew Solovay [Wed, 27 Jul 2016 23:28:31 +0000 (23:28 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect am:
09f5a77754
am:
6d07089d51
Change-Id: Id213eb574cd9d56b10b84f1a2128ec6b02d451fc
Andrew Solovay [Wed, 27 Jul 2016 23:28:25 +0000 (23:28 +0000)]
Merge \\"docs: Added Android N (API level 24) to the \\"API levels\\" table\\" into nyc-dev am:
ffe63a4ad8
am:
521f56a7df
Change-Id: Ic35e07fc3ae44180c64e53ae85af29d47aae4d39
Andrew Solovay [Wed, 27 Jul 2016 23:28:17 +0000 (23:28 +0000)]
docs: Added Android N (API level 24) to the \\"API levels\\" table am:
563c4f1adb
am:
436aaefed2
Change-Id: I843de42c8fa053b8f130780bacc41b32dd8d62c0
Adarsh Fernando [Wed, 27 Jul 2016 23:28:10 +0000 (23:28 +0000)]
Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245
am:
dc356fc113
Change-Id: Ia1b801d8899b906856c34e40b20fed08f86f9951
Eric Schmidt [Wed, 27 Jul 2016 23:28:03 +0000 (23:28 +0000)]
docs: Migrating multilingual-support to permanent home. am:
32e428e78e
am:
1e366dd06f
Change-Id: I7aa48a4001077b870c183a9e8f6084d8c4525f3e
James Carr [Wed, 27 Jul 2016 23:24:54 +0000 (23:24 +0000)]
Merge "Calculate and account for memory power use"
Roozbeh Pournader [Wed, 27 Jul 2016 23:22:41 +0000 (23:22 +0000)]
Merge "Test Roboto's vertical font metrics"
Andrew Solovay [Wed, 27 Jul 2016 23:15:18 +0000 (23:15 +0000)]
Merge \"docs: Removing internationalized versions of AfW preview doc\" into nyc-dev
am:
40782b2415
Change-Id: Ib37fe73f48cd434d39dfe5c533f21f036a122acd
Andrew Solovay [Wed, 27 Jul 2016 23:15:15 +0000 (23:15 +0000)]
docs: Removing internationalized versions of AfW preview doc
am:
d6d4de697e
Change-Id: I384ca0803f11115aa59392b253953b3821f96c5c
Andrew Solovay [Wed, 27 Jul 2016 23:15:09 +0000 (23:15 +0000)]
Merge \"docs: Removing N Preview AfW doc, and setting up redirect\" into nyc-dev
am:
15e72ce64b
Change-Id: Ib276d1bfb8327677ebbcc17235e818fc09c1ed3d
Andrew Solovay [Wed, 27 Jul 2016 23:15:06 +0000 (23:15 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect
am:
09f5a77754
Change-Id: I29af45a15d436be7ea040b61bcdfe613ba065f93
Andrew Solovay [Wed, 27 Jul 2016 23:14:57 +0000 (23:14 +0000)]
Merge \"docs: Added Android N (API level 24) to the \"API levels\" table\" into nyc-dev
am:
ffe63a4ad8
Change-Id: Ifddf403aa37e872fb368bad3070c9b7c694751f7
Andrew Solovay [Wed, 27 Jul 2016 23:14:53 +0000 (23:14 +0000)]
docs: Added Android N (API level 24) to the \"API levels\" table
am:
563c4f1adb
Change-Id: I9d17bda57e40d97e6bc83512d119ab460e0e418e
Adarsh Fernando [Wed, 27 Jul 2016 23:14:48 +0000 (23:14 +0000)]
Docs: Migrating platform docs to /guide/platform/ with new landing page
am:
cf150dd245
Change-Id: If72fe564637c6a9e9afc576fcc6a5987db5bcc3d
Eric Schmidt [Wed, 27 Jul 2016 23:14:42 +0000 (23:14 +0000)]
docs: Migrating multilingual-support to permanent home.
am:
32e428e78e
Change-Id: I9ca319c51756ea853479e4019520a670e46f9ffe
Eric Schmidt [Wed, 27 Jul 2016 23:12:15 +0000 (23:12 +0000)]
docs: Migrating icu4j-framework to permanent home am:
10da34380a am:
0c8b898e16
am:
8679f95ac0
Change-Id: I5acbde29da1b4693441f1f5fbbbb526d89c958d9
Eric Schmidt [Wed, 27 Jul 2016 23:12:10 +0000 (23:12 +0000)]
docs: Migrate notification-update to notifications docs am:
bcce78731d am:
0376d329b8
am:
b5f6c9f571
Change-Id: If08290de449450c30fcf6258adb9abcbaee6bda3
Agnieszka Madurska [Wed, 27 Jul 2016 22:55:15 +0000 (22:55 +0000)]
Merge \\"Ignore padding for drawing round scrollbars.\\" into nyc-mr1-dev am:
9801935b95
am:
efc22bd0ce
Change-Id: I9b26a0eda395f852050639cd72cefb16c5d67574
Aga Madurska [Wed, 27 Jul 2016 22:55:11 +0000 (22:55 +0000)]
Ignore padding for drawing round scrollbars. am:
c283507246
am:
9bafa17869
Change-Id: Icd0e134b0b596dae3300829a121caa903d828523
Andrii Kulian [Wed, 27 Jul 2016 22:55:06 +0000 (22:55 +0000)]
Merge \\"Correctly finish activity in non-focused stack\\" into nyc-mr1-dev am:
d3786148f3
am:
4cad633101
Change-Id: I3d9aaeb04593083b85859127269e289aca85f57c
Andrii Kulian [Wed, 27 Jul 2016 22:55:02 +0000 (22:55 +0000)]
Correctly finish activity in non-focused stack am:
7318d63ba6
am:
764045c0cc
Change-Id: Ia20347a7ea671b099ca908baea6daf6d5021dd96
Andrii Kulian [Wed, 27 Jul 2016 22:54:58 +0000 (22:54 +0000)]
Merge \\"Don\\'t delay child pressed state in freeform mode\\" into nyc-mr1-dev am:
671bc2052a
am:
0adcd5fa0f
Change-Id: I6a5dd5f5b40789ddc2e50ac6186a778a76fa5910
Hui Shu [Wed, 27 Jul 2016 22:54:44 +0000 (22:54 +0000)]
Merge "Fix document format"
Andrii Kulian [Wed, 27 Jul 2016 22:52:24 +0000 (22:52 +0000)]
Don\\'t delay child pressed state in freeform mode am:
a6aea9876e
am:
5b637aed1c
Change-Id: If94ef4d5fbf5142044797722bc0ffa86d0aa0dc4
Chong Zhang [Wed, 27 Jul 2016 22:52:19 +0000 (22:52 +0000)]
Merge \\"Cleanup mAnimatingExit flag before maybeUpdateTransitToWallpaper()\\" into nyc-mr1-dev am:
f84d9f91ce
am:
68a518c49a
Change-Id: I17033a113ae0655b3e0e408abc86e049a0e80d65
Chong Zhang [Wed, 27 Jul 2016 22:52:15 +0000 (22:52 +0000)]
Cleanup mAnimatingExit flag before maybeUpdateTransitToWallpaper() am:
e05bcb15d5
am:
8368eb30a8
Change-Id: I03ec1ab0848c1c3608f751c9c6efe29d609d18c1
Alan Viverette [Wed, 27 Jul 2016 22:52:11 +0000 (22:52 +0000)]
Merge \\"Avoid potential re-entry as a result of child mutation\\" into nyc-mr1-dev am:
11fbe5ec75
am:
2a93d1e92c
Change-Id: I6d6d290ce7be0b6dd1d980eb2290c288ca63fad6
Alan Viverette [Wed, 27 Jul 2016 22:52:07 +0000 (22:52 +0000)]
Avoid potential re-entry as a result of child mutation am:
b46ba3b2b0
am:
0d98515cab
Change-Id: I521833b5d599d735be786b6fb6a1b9fa7f2f2533
Andrew Solovay [Wed, 27 Jul 2016 22:51:59 +0000 (22:51 +0000)]
Merge "docs: Removing internationalized versions of AfW preview doc" into nyc-dev
Andrew Solovay [Wed, 27 Jul 2016 22:50:35 +0000 (22:50 +0000)]
Merge "docs: Removing N Preview AfW doc, and setting up redirect" into nyc-dev
Adrian Roos [Wed, 27 Jul 2016 22:48:28 +0000 (22:48 +0000)]
Merge \\"HIC: Base on elapsed time instead of RTC\\" into nyc-mr1-dev am:
628ef54d06
am:
52724b497f
Change-Id: I7df898e1d804f9a61b1a58e20e8f90b735616fdb
Adrian Roos [Wed, 27 Jul 2016 22:48:20 +0000 (22:48 +0000)]
HIC: Base on elapsed time instead of RTC am:
bbb6919945
am:
28edf32edb
Change-Id: I02c7ed926e55f4b03125bdc0fa3addaad56ef18d
Doris Liu [Wed, 27 Jul 2016 22:48:10 +0000 (22:48 +0000)]
Merge \\"Run animation *after* property sync\\" into nyc-mr1-dev am:
aa54b4e0da
am:
8d896f92f0
Change-Id: I837f76b1f1d4a1530e4400fe37c4bc9a16380839
Doris Liu [Wed, 27 Jul 2016 22:48:04 +0000 (22:48 +0000)]
Run animation *after* property sync am:
7c7052dd9b
am:
0053b066e5
Change-Id: Id9764477eec3ee13044b60c1b02b8b0b459b7761
Andrew Solovay [Wed, 27 Jul 2016 22:47:58 +0000 (22:47 +0000)]
Merge "docs: Added Android N (API level 24) to the "API levels" table" into nyc-dev
Fan Zhang [Wed, 27 Jul 2016 22:47:58 +0000 (22:47 +0000)]
Merge \\"Allow system home app to show when filtering app list.\\" into nyc-mr1-dev am:
4f0d7aad58
am:
21fb5e40be
Change-Id: Idace486a9eaa0b564def55aade9c5ab256c63f15
Eric Schmidt [Wed, 27 Jul 2016 22:46:34 +0000 (22:46 +0000)]
docs: Migrating icu4j-framework to permanent home am:
10da34380a
am:
0c8b898e16
Change-Id: Id90ad33629b8d1fa613dc5fbd1d1831d574c04a5
OSDN Git Service
