241483 Commits

Author SHA1 Message Date
Android Build Merger (Role)
57add8cae5 Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am: 42a3312 am: faa815d am: 2ca2a2c" into nyc-dev 2016-04-26 21:55:16 +00:00
Android Build Merger (Role)
63791f2131 Merge "docs: Added link to "preparing for multiwindow" blog post am: d93472b am: 5db4e1f am: 04b4190" into nyc-dev 2016-04-26 21:55:06 +00:00
Android Build Merger (Role)
376b149abd 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 2016-04-26 21:54:55 +00:00
Android Build Merger (Role)
be3f2dee5d Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am: abb9f4d am: fe0cc90 am: e8b402e" into nyc-dev 2016-04-26 21:54:45 +00:00
Android Build Merger (Role)
f11c479e69 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 2016-04-26 21:54:34 +00:00
Android Build Merger (Role)
d942882bbf 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 2016-04-26 21:54:25 +00:00
Android Build Merger (Role)
4da53c0e77 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 2016-04-26 21:54:16 +00:00
Android Build Merger (Role)
07773c7e11 Merge "simplification and clarification to the Studio Overview am: e9b3ada am: f1a5076 am: 1f8be54" into nyc-dev 2016-04-26 21:54:05 +00:00
Android Build Merger (Role)
2b0a5c9667 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 2016-04-26 21:53:55 +00:00
Cheryl Potter
dc8f3eb2f3 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
2016-04-26 21:50:44 +00:00
smain@google.com
ed790130de 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
2016-04-26 21:49:15 +00:00
smain@google.com
80704cffc6 change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c
am: 0619ef2

* commit '0619ef243f887119b921d0874b155287ace70edc':
  change Mac JDK requirement to 6

Change-Id: I8a35ad475c64aa7d687398100c0e3df76777d14a
2016-04-26 21:47:09 +00:00
Adarsh Fernando
38b412c09d 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
2016-04-26 21:44:35 +00:00
Adarsh Fernando
57034255d5 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
2016-04-26 21:42:02 +00:00
Sergei Vasilinetc
c015719954 Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev 2016-04-26 21:39:43 +00:00
Adarsh Fernando
dd0d888973 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
2016-04-26 21:39:34 +00:00
Sergei Vasilinetc
b7d1657016 Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev 2016-04-26 21:39:09 +00:00
Dirk Dougherty
5c712ddb3d 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
2016-04-26 21:37:24 +00:00
Kevin Hufnagle
b1f15178f1 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
2016-04-26 21:34:40 +00:00
Robert Carr
b259485087 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
2016-04-26 14:33:21 -07:00
sreevanis
18b34c273b 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
2016-04-26 21:31:56 +00:00
Chad Brubaker
40af9916f1 Merge "Add missing </pin-set>" into mnc-mr-docs am: 5f415c2 am: 0ed59f9
am: f1ac8fa

* commit 'f1ac8fac41c69114f815f7226c5b695509f8c2ca':

Change-Id: I6cbe92afc06391abd5285471f03629767b598752
2016-04-26 21:29:57 +00:00
Chad Brubaker
13feed00ca Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800
am: fc688ec

* commit 'fc688ec32eaf5815ce3f1ccba6023d5290b8d336':

Change-Id: I35f3641ad371da743a2159eaf14e704b7ff229c2
2016-04-26 21:27:05 +00:00
Joe Fernandez
5d0c1b50f8 Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am: 4ec3749 am: 83113d6
am: 824429f

* commit '824429f93ad0ab15b4776acda40f91f972b5e173':

Change-Id: I01b8d416c6c350c1707676d3682800d61fc6442a
2016-04-26 21:23:59 +00:00
Andrew Solovay
618dbd9c88 Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0
am: bb64fe3

* commit 'bb64fe34ae6ecf0fafa74ddc4d416a21062dc516':

Change-Id: I36475216bbb46c474d1b693250d9392021a6903c
2016-04-26 21:21:48 +00:00
Dirk Dougherty
97d6042490 Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2
am: ab3721a

* commit 'ab3721ae74d5808ccffb713e256ac48abe895dba':

Change-Id: I37a1841fa7f51bd8ba58b866a8ee255a3aa15954
2016-04-26 21:19:18 +00:00
Daniel Yu
06ee4bad98 Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am: cac018b am: 9e16ddc
am: 461e731

* commit '461e731583aad91ca952cba2bab13898e37bb33e':

Change-Id: If3f5053f4d7e12fc0ccf2d5dc94b7141ffaef57b
2016-04-26 21:16:23 +00:00
Kevin Hufnagle
fb1a24a2ab Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am: 2f5a204 am: ddbf8d2c
am: f63a1c4

* commit 'f63a1c4cfddc0c4ac065c8a5ce09e38fe71c3137':

Change-Id: I09a99fd61f157e171c1a873d91c311cac8bfc0c2
2016-04-26 21:13:31 +00:00
Kevin Hufnagle
80f3f6b05d Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am: f380435 am: 0da507d
am: 7f0d4d0

* commit '7f0d4d0799622a803316c201ed7cc1e5135de89e':

Change-Id: I7febd987b8e397f38d34cf0a79b7de399a31fce3
2016-04-26 21:10:50 +00:00
Kevin Hufnagle
f80fb67910 Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am: c9afecd am: 1c076e8
am: 8d336e6

* commit '8d336e6c51380986ac78c348234bd0e0cf4a7380':

Change-Id: Ifa45c62212e81fb9cfaebe98703775715cd14cd0
2016-04-26 21:08:48 +00:00
Kevin Hufnagle
39164fc71d Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am: 9deafe5 am: fcf68ef
am: c56d885

* commit 'c56d8853ff8a15aa5a5b5ec40c242745fed6a3b6':

Change-Id: I7db5e0257eb921cc391306f69e21b95c9a296863
2016-04-26 21:05:57 +00:00
Kevin Hufnagle
ab38a66142 Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am: 88e19d1 am: 2d9cc0f
am: a732be1

* commit 'a732be179d7bc06580b66669d6b6c7ebe05b9e01':

Change-Id: I1a2d3eba374fe931b28e0358740d545348ebceba
2016-04-26 21:03:09 +00:00
Kevin Hufnagle
049902fae8 Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am: 8ea3fd8 am: f1cb86cc
am: 690cba0

* commit '690cba02682e89299f94d58a5ea9f212006c11c4':

Change-Id: I958d262d9022e91a85f75af7f3e8cb9af1e1f355
2016-04-26 21:00:06 +00:00
Joe Fernandez
d8e20a310d Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am: 42a3312 am: faa815d
am: 2ca2a2c

* commit '2ca2a2c86571d0ad05b95ea0bda7d33414e4cb89':

Change-Id: Ica6e6425d795da330da197536a0e516fb53c8b7d
2016-04-26 20:57:54 +00:00
Andrew Solovay
22df4ed94c docs: Added link to "preparing for multiwindow" blog post am: d93472b am: 5db4e1f
am: 04b4190

* commit '04b41903f9c4ceebc0f5d2e03f8f921f5dc95e69':

Change-Id: I789b9b1066978a665b1262e46a8331c07cd7e9c3
2016-04-26 20:55:21 +00:00
Andrew Solovay
197cfcde13 Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am: a23e28f am: fbb8b65
am: 3832614

* commit '3832614650f39719dbbb52ee092c0826291d6516':

Change-Id: Ic5aab52976bceb23ad6c584b87ee86fcff634c76
2016-04-26 20:52:24 +00:00
Elliot Waite
369a536e54 Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am: abb9f4d am: fe0cc90
am: e8b402e

* commit 'e8b402e20533d5ce7387a4666683c971b22ba381':

Change-Id: Ie43452782ce7ab1e1bdbce67c007b2d3705c7910
2016-04-26 20:49:26 +00:00
Miao Wang
77f655c2a2 Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am: f2988f5 am: 2291d03
am: 25570d5

* commit '25570d531904594d0e73cbc5c7a5105006aa8cdd':

Change-Id: I91af0cd7f8a87e3bf00261cece1bf19c9fb88790
2016-04-26 20:46:23 +00:00
sreevanis
65600189ae Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am: f70f0f4 am: 9f57db1
am: cedb262

* commit 'cedb262cfaffed00f091d2a0abe22f92f9809d3e':

Change-Id: I216382c84e33766b5d6d3bdc6c831ffd9afa6560
2016-04-26 20:43:10 +00:00
sreevanis
88121700dd Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am: 71b1f0b -s ours am: a6d7166 am: 0446ed4
am: f786db7

* commit 'f786db7b9bcc6ebfa79b4bc60a837877e5a8a380':

Change-Id: I0c8528b9a6a0313f8983cd4d75adc244ec68f92d
2016-04-26 20:40:13 +00:00
smain@google.com
0459843629 simplification and clarification to the Studio Overview am: e9b3ada am: f1a5076
am: 1f8be54

* commit '1f8be548ae1c21be6651ddc2621018b2028c58d0':

Change-Id: I2e08479aadd3d223b11e10d873239e14ed1a6976
2016-04-26 20:36:57 +00:00
smain@google.com
e4a095ab6a 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

* commit '07bfe296d0e7337ba42fcf260d1029746308a262':

Change-Id: Iedc8b307eba45aa106b52fac980fe1c0fe8cdae3
2016-04-26 20:34:41 +00:00
Chris Craik
987609f5a7 Merge "Improve SurfaceView postion snapping" into nyc-dev 2016-04-26 20:20:39 +00:00
Mady Mellor
6e3a90d9b7 Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev 2016-04-26 19:38:44 +00:00
Chong Zhang
55c9d73918 Do not set waitForDebugger if the process to be debugged already started
For non-persistent debug settings, mDebugApp and mWaitForDebugger flags
will only be restored when we get attachApplication. If the process is
already running, we can't wait for debugger and there will be no
attachApplication calls coming.

We should leave the settings unmodified, otherwise after two such calls,
both mDebugApp and mOrigDebugApp will point to the same app, and the
debug settings can never be restored.

bug: 27931552
Change-Id: Id53e21bbe154f45bf2ca12bb5d7fd56279bae653
2016-04-26 12:29:14 -07:00
Chris Banes
94121762ff Merge "Fix onPrepareActionMode() not being called" into nyc-dev 2016-04-26 19:20:16 +00:00
Winson
3e5f0af085 Mark header bar buttons as clickable only when they are made visible.
- We were incorrectly setting the OnClickListener to null to try to do 
  this, which still causes the touch event to be consumed by the button
  view, so instead we should just set the clickable state directly.

Bug: 27859552
Change-Id: Ida3b4a467c6f325ce8fe5a90b0b77c2bdda5a936
2016-04-26 11:39:28 -07:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
TreeHugger Robot
83ca62bdbe Merge "Remove -night qualified resources" into nyc-dev 2016-04-26 18:33:05 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00