OSDN Git Service
Daniel Yu [Wed, 27 Apr 2016 02:30:53 +0000 (02:30 +0000)]
Merge "docs: Updating PIP N preview docs for DP2" into mnc-mr-docs am:
f5b6b18 am:
e7a6e43
am:
da62a9e
* commit '
da62a9e12bac8bfa62bc09fcca50da22adc51254':
docs: Updating PIP N preview docs for DP2
Change-Id: Id255066d9e7969c69d77e5f3d7b694994d314316
Daniel Yu [Wed, 27 Apr 2016 02:28:47 +0000 (02:28 +0000)]
Merge "docs: Updating Scoped Directory Access preview docs for DP2" into mnc-mr-docs am:
bc90f38 am:
d77a4db
am:
4f4d8cc
* commit '
4f4d8cc8535ac2f5ba3cd56773641f257ccb359f':
docs: Updating Scoped Directory Access preview docs for DP2
Change-Id: Ic1198bd31c8978b0220a97b28f399ff0a08abd32
Daniel Yu [Wed, 27 Apr 2016 02:27:30 +0000 (02:27 +0000)]
Merge "docs: Updating Direct Boot N preview docs for DP2" into mnc-mr-docs am:
69f6e5b am:
3aa606f
am:
02dc9a8
* commit '
02dc9a8617a19ee2fe1207b76f6172494ad12cb9':
docs: Updating Direct Boot N preview docs for DP2
Change-Id: I44e03eefae179fd5b1fdcca48439e99c14ca496d
Kevin Hufnagle [Wed, 27 Apr 2016 02:25:57 +0000 (02:25 +0000)]
Merge "docs: Added section describing Launcher Shortcuts." into mnc-mr-docs am:
9d4afa9 am:
ecb8164
am:
2bf8de2
* commit '
2bf8de2d3d1a63ca218971998b8e168d31901056':
docs: Added section describing Launcher Shortcuts.
Change-Id: Idd4f3b5eda0a2ff634f8d31a852cc63d012aada2
Cheryl Potter [Wed, 27 Apr 2016 02:24:08 +0000 (02:24 +0000)]
Merge "docs: Document test artifact preference setting b/
24810371" into mnc-mr-docs am:
a6d7a32 am:
dd4cc3b
am:
18ec09c
* commit '
18ec09cfc46eae278b1dbc7e18e8f77f9a2e8c2b':
docs: Document test artifact preference setting b/
24810371
Change-Id: I85979f09f9c2525877ff7dbce72f5c8fbd8d423b
smain@google.com [Wed, 27 Apr 2016 02:23:02 +0000 (02:23 +0000)]
add 64-bit requirement for linux bug:
26288626 am:
584d18b am:
40ed41b
am:
affdf51
* commit '
affdf51b2d3d28f328a494a677b522f0f1d716bc':
add 64-bit requirement for linux bug:
26288626
Change-Id: I7494f05aabebbfbbea58de09db2b504287c93627
Mary Yanchar [Wed, 27 Apr 2016 02:20:41 +0000 (02:20 +0000)]
Merge "Removed mention of JRE8 in sdk setup" into mnc-mr-docs am:
2f24634 am:
cabbf5c3
am:
5855008
* commit '
5855008fd5ad8314d9f686acd04f29a0fa4fbce7':
Removed mention of JRE8 in sdk setup
Change-Id: Ief2c39ee6edb59a8af8ff3a7e99591e319872861
smain@google.com [Wed, 27 Apr 2016 02:19:31 +0000 (02:19 +0000)]
Merge "update system reqs for accelerated emulator bug:
27817059" into mnc-mr-docs am:
69c05a7 am:
6a9dcc7
am:
e76837d
* commit '
e76837db35ec801d732009e6146953d9c50985c5':
update system reqs for accelerated emulator bug:
27817059
Change-Id: I01428b1cebdd229f01f8480f028792587b0c7ac8
Dan Albert [Wed, 27 Apr 2016 02:17:07 +0000 (02:17 +0000)]
There is no GCC 4.6. am:
7ca1829 am:
4fa2558
am:
f6a93e5
* commit '
f6a93e587c3e8b932a63a10810edfc6d60169f9e':
There is no GCC 4.6.
Change-Id: I22011935a86ee69852d7f90b45da44876642a88a
Dan Albert [Wed, 27 Apr 2016 02:15:55 +0000 (02:15 +0000)]
Remove obsolete note about libatomic. am:
59daf35 am:
7fd9ff6
am:
72ef5fc
* commit '
72ef5fcee63c6a396760947ebc4d1ba6a42ff045':
Remove obsolete note about libatomic.
Change-Id: I31d4aab0437e14547ca101a8a63725e2ac251912
Dan Albert [Wed, 27 Apr 2016 02:14:14 +0000 (02:14 +0000)]
Remove an obsolete paragraph. am:
e2ff842 am:
e57e4b3
am:
e81002b
* commit '
e81002bb424eb3b51b9db90e5849a8f56055160d':
Remove an obsolete paragraph.
Change-Id: I489f93c5e902900bdcaa25f971bf9c49973800fc
Dan Albert [Wed, 27 Apr 2016 02:12:14 +0000 (02:12 +0000)]
Remove an out of date detail. am:
931a0a4 am:
ff0d46f
am:
1a6768d
* commit '
1a6768d192ac5f211d4a8d79d5a12dbb694c17b6':
Remove an out of date detail.
Change-Id: I11e9d2d0686c42c6a83c273cf331349fa86d8acf
Dan Albert [Wed, 27 Apr 2016 02:10:21 +0000 (02:10 +0000)]
Fix case of libc++. am:
3e94f7e am:
cbd6ce1
am:
b67649e
* commit '
b67649e56fbf347f12d93f2b0e8fa69dabe00e17':
Fix case of libc++.
Change-Id: I0f56561c8714daff7894017572dd3b8f1ee96d43
Dan Albert [Wed, 27 Apr 2016 02:08:26 +0000 (02:08 +0000)]
Merge "Fix typo." into mnc-mr-docs am:
ad5d64b am:
dbfb0c6
am:
4b0dce4
* commit '
4b0dce46af8bf1890d180fa2282ee36d25c4e03a':
Fix typo.
Change-Id: I0e04ff1cadf5ffd2f548609fa96fd8b0d2e8d336
Cheryl Potter [Wed, 27 Apr 2016 02:06:02 +0000 (02:06 +0000)]
Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/
28075206" into mnc-docs am:
b93a913 am:
33f241d am:
d67e559
am:
3e59527
* commit '
3e59527525368dd4906a698becc6221dcd5c4005':
docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/
28075206
Change-Id: I04c386d2033c0acdc200c9c812f092689422663d
Adarsh Fernando [Wed, 27 Apr 2016 02:04:34 +0000 (02:04 +0000)]
Merge "Docs: minor AS 2.0 related fixes" into mnc-mr-docs am:
a598807 am:
9d9cea5
am:
583d485
* commit '
583d485dd23e8ed3edf5ac88a95b28059f9bcf28':
Docs: minor AS 2.0 related fixes
Change-Id: Ie4623b65b070c5a0cc62f75bb329cf05642cdc0c
Cheryl Potter [Wed, 27 Apr 2016 02:02:10 +0000 (02:02 +0000)]
Merge "docs: Document test artifact preference setting b/
24810371" into mnc-docs am:
53ae576 -s ours am:
0c615f4 am:
bb93651
am:
2269a11
* commit '
2269a11cc07e040afc6aed3d8c3f8f79c5dd835c':
docs: Document test artifact preference setting b/
24810371
Change-Id: I2f17096102a7acfee696367043b36f118f31ac89
Adarsh Fernando [Wed, 27 Apr 2016 02:00:49 +0000 (02:00 +0000)]
Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs am:
6bd5c3d am:
a572a3a
am:
d7f4b76
* commit '
d7f4b7662eb9c032c861585741da68d7defbadb2':
Docs: Minor fixes to Background Optimizations and Doze docs
Change-Id: Ib95e44982e3a8a7f7f86ccdeecb174038e9c1ed3
smain@google.com [Wed, 27 Apr 2016 01:58:14 +0000 (01:58 +0000)]
URLs are hard, Mr. Eason. am:
9938f2b am:
6c5079b
am:
d4a4f43
* commit '
d4a4f43c72e4a48d25ecd9e4e464964711fe2548':
URLs are hard, Mr. Eason.
Change-Id: I1c081b62d766e6a7cd2b7a82150d87e038a1adfe
smain@google.com [Wed, 27 Apr 2016 01:56:46 +0000 (01:56 +0000)]
add studio 2.0 blog post to the "latest" feed for studio landing page am:
2e4bcfd am:
78fab38
am:
03a2876
* commit '
03a2876c45f736832aef1ff08e682847d79c655e':
add studio 2.0 blog post to the "latest" feed for studio landing page
Change-Id: I48751b3864b47e3c0b3b14c93c46c7b0f9eeb607
smain@google.com [Wed, 27 Apr 2016 01:54:16 +0000 (01:54 +0000)]
delete irrelevant manifest documentation am:
3c8d502 am:
1800bef
am:
19319de
* commit '
19319de2a4cb99df98a9183ae573fa60f012ea54':
delete irrelevant manifest documentation
Change-Id: I6effa389d9c1d5ac655700d86945bf1d79128ea0
smain@google.com [Wed, 27 Apr 2016 01:52:53 +0000 (01:52 +0000)]
Merge "make hero header and image link to download studio" into mnc-mr-docs am:
2890c65 am:
f6783df
am:
07868c9
* commit '
07868c9853207c89b4ce5ab1ac5abc93a48f3b2d':
make hero header and image link to download studio
Change-Id: Iff3a06d702e8c20cf39365e3a8cb476c3d717ed3
Adarsh Fernando [Wed, 27 Apr 2016 01:50:21 +0000 (01:50 +0000)]
Merge "Docs: Added image for CTL config" into mnc-mr-docs am:
78bad64 am:
df51dd1
am:
d20b4cb
* commit '
d20b4cb528d9485cbbfdb6316fc045b89b1d7cfc':
Docs: Added image for CTL config
Change-Id: I47a7767afcf41e76d14d7a990d8fbe0e9acb0e02
smain@google.com [Wed, 27 Apr 2016 01:48:59 +0000 (01:48 +0000)]
add notice about compatiblity with N Preview (bug:
27830549) improve linux 32-bit library information (bug:
27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs. am:
d69b727 am:
1b30208
am:
663ad9c
* commit '
663ad9cbf4d362a8dd6b7324f6769edf4c1c6126':
add notice about compatiblity with N Preview (bug:
27830549) improve linux 32-bit library information (bug:
27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs.
Change-Id: Ib171b19828b3c9b985c5299668a1a22d8bb5f395
Adarsh Fernando [Wed, 27 Apr 2016 01:46:20 +0000 (01:46 +0000)]
Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs am:
ffb094d am:
16c507d
am:
c4870e5
* commit '
c4870e5bb53a6b5099f1b7b28da54d44c3594703':
Docs: Added release notes for SDK Tools 25.0.0
Change-Id: I9db7f0235750bc0ed54ee7ecf9b5a6e746876c34
smain@google.com [Wed, 27 Apr 2016 01:43:58 +0000 (01:43 +0000)]
Merge "Add 2.0 download file names, sizes, sums" into mnc-mr-docs am:
8a7a91d am:
3443287
am:
572c804
* commit '
572c804f02d5957f6cbcbea982996907f1e908dd':
Add 2.0 download file names, sizes, sums
Change-Id: Iaac6e29199848a46c29d64a0a37571344b530dd9
Andrew Solovay [Wed, 27 Apr 2016 01:42:13 +0000 (01:42 +0000)]
Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs am:
3db9afa am:
a37dd29
am:
4aff1c1
* commit '
4aff1c1dbffd15580841d1e64be9877c5da8b624':
docs: Updated support library release notes for 23.3.0
Change-Id: Id225c98b4877fa721328f7a1eceb9ebf011f6116
smain@google.com [Wed, 27 Apr 2016 01:39:42 +0000 (01:39 +0000)]
Merge "add instructions to change Android SDK location when using N Preview bug:
28017690" into mnc-mr-docs am:
e5cbba2 am:
414150f
am:
4b63685
* commit '
4b636857fbd1cdc2f817b32dcf5eb7345918d8b9':
add instructions to change Android SDK location when using N Preview bug:
28017690
Change-Id: Ib52d4ecc8947f238074bfb1e991218aeee193767
Adarsh Fernando [Wed, 27 Apr 2016 01:38:21 +0000 (01:38 +0000)]
Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am:
a49d235 am:
ecb082f
am:
453e69c
* commit '
453e69c1dd1914f026e8d55bf28582d4167cf560':
Docs: Added AS 2.0 Release Notes
Change-Id: If044b4cd47ff2072e067fe43b2319ec92dbe37cd
Cheryl Potter [Wed, 27 Apr 2016 01:35:45 +0000 (01:35 +0000)]
Merge "docs: Data Binding 2.0 updates b/
26892478" into mnc-docs am:
2ebdbd2 am:
a9b10e3 am:
e10717c
am:
e493677
* commit '
e493677b21d78b273767e422c701a95e82a214ac':
docs: Data Binding 2.0 updates b/
26892478
Change-Id: I9c4db095849d39e86f01f6640fcc68f2e9cfcef4
TreeHugger Robot [Wed, 27 Apr 2016 01:18:42 +0000 (01:18 +0000)]
Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev
Scott Main [Wed, 27 Apr 2016 01:11:18 +0000 (01:11 +0000)]
Merge "resolve merge conflicts of
886bbdb to nyc-dev" into nyc-dev
Tomasz Mikolajewski [Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Exclude virtual files from ACTION_SEND." into nyc-dev
smain@google.com [Wed, 27 Apr 2016 01:09:06 +0000 (18:09 -0700)]
resolve merge conflicts of
886bbdb to nyc-dev
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
Chong Zhang [Wed, 27 Apr 2016 01:08:15 +0000 (01:08 +0000)]
Merge "Finish immediately if the resumed activity is already visible" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 00:53:17 +0000 (00:53 +0000)]
Merge "Don't override pre-release target sdk" into nyc-dev
Rob Carr [Wed, 27 Apr 2016 00:47:57 +0000 (00:47 +0000)]
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 00:43:23 +0000 (00:43 +0000)]
Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83 am:
86eb9f3" into nyc-dev
Adarsh Fernando [Wed, 27 Apr 2016 00:40:09 +0000 (00:40 +0000)]
Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83
am:
86eb9f3
* commit '
86eb9f3770faf3fbae439d583db31a5055a06625':
Docs: Minor edit to IR docs to mention longer intial/clean builds
Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
TreeHugger Robot [Wed, 27 Apr 2016 00:39:40 +0000 (00:39 +0000)]
Merge "Fix two multi-user bugs in package upgrade." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 00:32:39 +0000 (00:32 +0000)]
Merge "Set installed flag of all users if system app is installed later" into nyc-dev
Tomasz Mikolajewski [Wed, 27 Apr 2016 00:30:45 +0000 (00:30 +0000)]
Merge "Fix index computation for quick viewing." into nyc-dev
Rob Carr [Wed, 27 Apr 2016 00:29:58 +0000 (00:29 +0000)]
Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev
smain@google.com [Wed, 27 Apr 2016 00:25:09 +0000 (17:25 -0700)]
resolve merge conflicts of
946609b to nyc-dev
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
Jeff Sharkey [Wed, 27 Apr 2016 00:04:00 +0000 (00:04 +0000)]
Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 23:29:38 +0000 (23:29 +0000)]
Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 23:28:04 +0000 (23:28 +0000)]
Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev
Erik Kline [Tue, 26 Apr 2016 23:27:46 +0000 (23:27 +0000)]
Merge "Move IPv4 address setting to IpManager" into nyc-dev
Todd Kennedy [Tue, 26 Apr 2016 22:41:20 +0000 (15:41 -0700)]
Don't override pre-release target sdk
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.
Bug:
28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
Chong Zhang [Tue, 26 Apr 2016 23:21:07 +0000 (16:21 -0700)]
Finish immediately if the resumed activity is already visible
When in FINISH_AFTER_VISIBLE mode, we need to check visibility of
both the current activity, and the activity to be resumed. If the
resumed activity is already visible, we should finish immediately.
We can't put it into stopping state and wait because there won't be
a window visible callback from the next activity.
bug:
28378359
Change-Id: Ib1fb44acfec33616da76f48102cc00b453e41914
Jeff Sharkey [Tue, 26 Apr 2016 23:01:40 +0000 (17:01 -0600)]
Fix two multi-user bugs in package upgrade.
When upgrading a package, we need to fill in the "origUsers" field
so that we can clone the installed state correctly. This was done
for child package, but never set for the parent package.
Also fix a bug where a secondary user requested a package to be
moved. Because that move was pushed onto a Handler, the calling
userId appeared to be the device owner instead of the user that
actually requested the move. (Later in the upgrade flow there is
code that force-installs the package for the requesting user.)
Bug:
26729822
Change-Id: I2d2a007c73558f29a3f8c1408ec373fce6e87761
Oren Blasberg [Tue, 26 Apr 2016 22:43:38 +0000 (22:43 +0000)]
Merge "Show cascading popup menus if screen is big enough." into nyc-dev
Chen Xu [Tue, 26 Apr 2016 22:42:16 +0000 (22:42 +0000)]
Merge "Add CarrierConfig for metered roaming" into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:41:00 +0000 (22:41 +0000)]
Merge "Accommodate NaN in new context menu methods." into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)]
Merge "Don't show icons for top level menus unless forced." into nyc-dev
Shreyas Basarge [Tue, 26 Apr 2016 22:36:45 +0000 (22:36 +0000)]
Merge "Account info on job wakelocks" into nyc-dev
Ruben Brunk [Tue, 26 Apr 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add manifest attribute for VR activities." into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:51 +0000 (21:58 +0000)]
Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d am:
13308fc2 am:
39579d7" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:41 +0000 (21:58 +0000)]
Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6 am:
c4ec690 am:
73b5cc9" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:31 +0000 (21:58 +0000)]
Merge "change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c am:
0619ef2" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:20 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040 am:
f654443" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:10 +0000 (21:58 +0000)]
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc am:
fe47b6d" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:01 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91 am:
8776f89" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:51 +0000 (21:57 +0000)]
Merge "Update studio landing page and add all-new install flow docs. bug:
27850063 (update system reqs for 2.0) bug:
27725026 (update download page for 2.0) bug:
23908299 (clean up download and get started) am:
9577d31 am:
fc35cf2 am:
478463a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:39 +0000 (21:57 +0000)]
Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb am:
5f6a355" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:30 +0000 (21:57 +0000)]
Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am:
63f15a9 am:
e7b8c79 am:
29c6f81 am:
26ed50a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9 am:
f1ac8fa" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:11 +0000 (21:57 +0000)]
Merge "Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800 am:
fc688ec" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:02 +0000 (21:57 +0000)]
Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6 am:
824429f" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:53 +0000 (21:56 +0000)]
Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0 am:
bb64fe3" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:44 +0000 (21:56 +0000)]
Merge "Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2 am:
ab3721a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:24 +0000 (21:56 +0000)]
Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am:
cac018b am:
9e16ddc am:
461e731" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:12 +0000 (21:56 +0000)]
Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am:
2f5a204 am:
ddbf8d2c am:
f63a1c4" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:02 +0000 (21:56 +0000)]
Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d am:
7f0d4d0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8 am:
8d336e6" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:43 +0000 (21:55 +0000)]
Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef am:
c56d885" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:35 +0000 (21:55 +0000)]
Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f am:
a732be1" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:25 +0000 (21:55 +0000)]
Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc am:
690cba0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:14 +0000 (21:55 +0000)]
Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d am:
2ca2a2c" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:05 +0000 (21:55 +0000)]
Merge "docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f am:
04b4190" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:53 +0000 (21:54 +0000)]
Merge "Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am:
a23e28f am:
fbb8b65 am:
3832614" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:43 +0000 (21:54 +0000)]
Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90 am:
e8b402e" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:33 +0000 (21:54 +0000)]
Merge "Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am:
f2988f5 am:
2291d03 am:
25570d5" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:24 +0000 (21:54 +0000)]
Merge "Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am:
f70f0f4 am:
9f57db1 am:
cedb262" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:15 +0000 (21:54 +0000)]
Merge "Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am:
71b1f0b -s ours am:
a6d7166 am:
0446ed4 am:
f786db7" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:03 +0000 (21:54 +0000)]
Merge "simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076 am:
1f8be54" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:53:53 +0000 (21:53 +0000)]
Merge "Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am:
49b17d3 am:
30c61f9 am:
07bfe29" into nyc-dev
Cheryl Potter [Tue, 26 Apr 2016 21:50:44 +0000 (21:50 +0000)]
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d am:
13308fc2
am:
39579d7
* commit '
39579d70b3d729a228c76ae06beeff06c5e94150':
docs: URL and App Indexing API updates for AS 2.0 support b/
26642964
Change-Id: Id71f67c7af800535071103c16924daaf6efa72d8
smain@google.com [Tue, 26 Apr 2016 21:49:15 +0000 (21:49 +0000)]
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6 am:
c4ec690
am:
73b5cc9
* commit '
73b5cc9cf34b1705a7bb9e30d8d58fb94a01c7b8':
update Develop tab landing page with Studio 2.0 announcement.
Change-Id: I84027bc7f474b7a614bc80de5a83210cba73ef32
smain@google.com [Tue, 26 Apr 2016 21:47:09 +0000 (21:47 +0000)]
change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c
am:
0619ef2
* commit '
0619ef243f887119b921d0874b155287ace70edc':
change Mac JDK requirement to 6
Change-Id: I8a35ad475c64aa7d687398100c0e3df76777d14a
Adarsh Fernando [Tue, 26 Apr 2016 21:44:35 +0000 (21:44 +0000)]
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040
am:
f654443
* commit '
f6544435b561a4ca50a070dc4dd665dda94becff':
Docs: Added Instant Run feature overview section
Change-Id: Id14287bc04647fc19e477e9ce9469ff9874e322a
Adarsh Fernando [Tue, 26 Apr 2016 21:42:02 +0000 (21:42 +0000)]
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc
am:
fe47b6d
* commit '
fe47b6d6455dc9e13e7a80e50107fc007ad3daf1':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I4b00bcf7936dc1c5db1d3f54417a4aa1381853c0
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:42 +0000 (21:39 +0000)]
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
Adarsh Fernando [Tue, 26 Apr 2016 21:39:34 +0000 (21:39 +0000)]
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91
am:
8776f89
* commit '
8776f8940a7a73a5763550ab8e902f4ad6210808':
Docs: Added instructions to launch instrumented tests in AS using CTL
Change-Id: If1512e3bc20cfdaed5c08317bdf5889857909b00
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:07 +0000 (21:39 +0000)]
Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev
Dirk Dougherty [Tue, 26 Apr 2016 21:37:24 +0000 (21:37 +0000)]
Update studio landing page and add all-new install flow docs. bug:
27850063 (update system reqs for 2.0) bug:
27725026 (update download page for 2.0) bug:
23908299 (clean up download and get started) am:
9577d31 am:
fc35cf2
am:
478463a
* commit '
478463ac42fecf7811d0299005ebe1d800b3483b':
Change-Id: I1788b6e613ecd7ae3850dd5fc838787efab7387a
Kevin Hufnagle [Tue, 26 Apr 2016 21:34:40 +0000 (21:34 +0000)]
Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb
am:
5f6a355
* commit '
5f6a355d610474411a826ad9a896d18f7827d7d0':
Change-Id: Ide8d78800c35e5735e18efea2e90b82a0ed65636
Robert Carr [Mon, 25 Apr 2016 23:21:13 +0000 (16:21 -0700)]
Fix bugs with takeSurface and preserveWindows.
When reusing a ViewRoot and DecorView as we do with preserveWindows
there are two issues with SurfaceHolders. First, we update the
SurfaceHolder callbacks when we call ViewRootImpl.setView. In the
case of preserved window relaunch, the DecorView is reused and there is
no call to setView. We need the ActivityThread to notify the ViewRoot
that something has changed. Secondly, we were assuming the only time
a new surface would be created for the purposes of SurfaceHolder
notification was when we previously did not have a valid surface.
Instead we need to check if the native Surface object has changed each time we
get a result from relayout.
Bug:
28331264
Change-Id: If1b4aab9b2ba579fa040e2a3ab4471842476d82f
sreevanis [Tue, 26 Apr 2016 21:31:56 +0000 (21:31 +0000)]
Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am:
63f15a9 am:
e7b8c79 am:
29c6f81
am:
26ed50a
* commit '
26ed50a8cae1ce78a83704e5f104038e53b784b5':
Change-Id: Id2776bdb87590b3dea5acb302573942c5c605abb
Chad Brubaker [Tue, 26 Apr 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9
am:
f1ac8fa
* commit '
f1ac8fac41c69114f815f7226c5b695509f8c2ca':
Change-Id: I6cbe92afc06391abd5285471f03629767b598752