Commit Graph

248982 Commits

Author SHA1 Message Date
Kevin Hufnagle
eeaa9df16c Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev
am: 4465e8d6e6

* commit '4465e8d6e68e75b0b5c1114447b8cfeea3873b50':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Icde96164ece2cdea09a5444e820c1f11b7a94cc8
2016-05-19 17:20:00 +00:00
Andrii Kulian
67cae3965b Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev
am: 7fae7be595

* commit '7fae7be59514ba6a7fdc10bdb47c9a9fe09d2cef':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: I4a91f9f86e9a8e5fc228b733822561be56ee3a1a
2016-05-19 17:19:50 +00:00
Android Build Merger (Role)
4465e8d6e6 Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 2016-05-19 17:13:39 +00:00
Kevin Hufnagle
eedd9bf4b2 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27
am: 2ebb73e557

* commit '2ebb73e5572eb400d6202c9a0e3d365e1fde9d7e':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I43a8431d48244a6807924239eac4c5211ce380b3
2016-05-19 17:12:51 +00:00
Andrii Kulian
7fae7be595 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 2016-05-19 17:11:35 +00:00
Kevin Hufnagle
2ebb73e557 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec
am: 2c98879a27

* commit '2c98879a2793b8607eb4539925e9d1fb38d78610':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I9f254da6427cea0ad4f4edc2fde8e17d679c4017
2016-05-19 17:05:50 +00:00
Kevin Hufnagle
2c98879a27 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d
am: 4af01c1aec

* commit '4af01c1aecc8db2fd084822294ad193a72a34fa7':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I455575a25350b7a0c66b5f8d698d6d0fc51076a5
2016-05-19 16:57:08 +00:00
Kevin Hufnagle
4af01c1aec Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs
am: 8262d9c00d

* commit '8262d9c00d7332e7f013ef1af6ea818a5d248ec5':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I56f21d12417b7157f749b02e9f3949bdbace5751
2016-05-19 16:48:51 +00:00
Kevin Hufnagle
8262d9c00d Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs 2016-05-19 16:43:31 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
2016-05-19 15:12:30 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Andrii Kulian
6b21f45add Merge "Workaround for ignored resizeableActivity param" into nyc-dev
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: Ia524867cac9118b6dbe5c7c210cd1a1753fe53e1
2016-05-19 08:06:02 +00:00
Andrii Kulian
005f9a73fb Merge "Workaround for ignored resizeableActivity param" into nyc-dev 2016-05-19 07:57:20 +00:00
Andrii Kulian
1b9a930ba4 Merge "Fix build breakage caused by redefining attrs" into nyc-dev
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: Id3502d67601e6a4348326c7eeb83de39dfd368b6
2016-05-19 07:15:03 +00:00
TreeHugger Robot
fa020a8094 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 2016-05-19 07:06:50 +00:00
Andrii Kulian
bd17d8c63b Fix build breakage caused by redefining attrs
minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92
2016-05-18 22:35:19 -07:00
Erik Kline
ae53fb4a43 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
2016-05-19 04:21:17 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Andreas Gampe
3fbf298984 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
2016-05-19 03:51:39 +00:00
TreeHugger Robot
8cb3b2bb5c Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 2016-05-19 03:43:08 +00:00
Andrii Kulian
3a6d6d61d8 Merge "Update docs for minWidth/minHeight attributes" into nyc-dev
am: 13778161ea

* commit '13778161ea58c56be37aa08778551b217ad649e4':
  Update docs for minWidth/minHeight attributes

Change-Id: I035cab93098c1281beb4a179f47070fe845a60e1
2016-05-19 01:48:35 +00:00
Andrii Kulian
81ce16a2e6 Merge "Rename minWidth/Height attributes" into nyc-dev
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
2016-05-19 01:48:19 +00:00
Andrii Kulian
13778161ea Merge "Update docs for minWidth/minHeight attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Joe Fernandez
60521acf12 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737
am: 31676c1a9b

* commit '31676c1a9bbdf2255ba66d2a2bf9899ccf418eb5':
  docs: Add video to Instant Apps landing page

Change-Id: Ic5e4a2735ea54403ed38ff9cec92e2e5865ee1ad
2016-05-19 01:30:10 +00:00
Joe Fernandez
31676c1a9b Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302
am: ac9135e737

* commit 'ac9135e737ff53b6e680d9f81dd32012365041b4':
  docs: Add video to Instant Apps landing page

Change-Id: I3c97783703ce80079636f18d4708796b34b351e9
2016-05-19 01:25:19 +00:00
Joe Fernandez
ac9135e737 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs
am: 99ffb30302

* commit '99ffb30302017f00b349369181cbda72c3276170':
  docs: Add video to Instant Apps landing page

Change-Id: Icd8bc9c7d8bbd432889e880eec512c1213baf9af
2016-05-19 01:20:21 +00:00
Andrew Solovay
e1d034346d doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec
am: 2c5ed120c4

* commit '2c5ed120c4d44c3d22544220aa950353bc9872b8':
  doc: Updates to release notes post-DP3

Change-Id: Idb6f0f64ac7073b186aa1fe7ad330f370264b70a
2016-05-19 01:16:06 +00:00
Joe Fernandez
99ffb30302 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs 2016-05-19 01:13:23 +00:00
Andrew Solovay
2c5ed120c4 doc: Updates to release notes post-DP3 am: fd30a43337
am: 788edcb7ec

* commit '788edcb7ecf03bdabfc8c82cd9949a130c7d2dcc':
  doc: Updates to release notes post-DP3

Change-Id: I656981ca1a6b16e4a429b84abfdc6efad20216cf
2016-05-19 01:09:38 +00:00
Joe Fernandez
ef0f1fd4d5 docs: Add video to Instant Apps landing page
b/28842359

Change-Id: Idb097501425ca0a50f547a22f54217878075376a
2016-05-18 18:07:17 -07:00
Selim Cinek
942bcffe7b Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev
am: a75bd7d4e0

* commit 'a75bd7d4e01985c8ad8aa57960337cc3507f374a':
  Fixed a bug where autobundling could lead to bugs

Change-Id: Ice2ec07392808c127cac7424f2e193789d712ece
2016-05-19 01:06:36 +00:00
Andrew Solovay
788edcb7ec doc: Updates to release notes post-DP3
am: fd30a43337

* commit 'fd30a43337d31ddcb6925fe275cf0d5cc7a9ed63':
  doc: Updates to release notes post-DP3

Change-Id: If45ef33e3b718649c1c717a9d14613a94f30a839
2016-05-19 01:06:20 +00:00
TreeHugger Robot
a75bd7d4e0 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev 2016-05-19 00:58:25 +00:00
Andrii Kulian
3f8dc15861 Workaround for ignored resizeableActivity param
If <uses-sdk> tag is below <application> in AndroidManifest.xml then,
when activity is parsed, targetSdkVersion param is not yet set correctly.
Because of that we're defaulting to RESIZE_MODE_FORCE_RESIZEABLE and the
param resizeableActivity will be ignored.
This CL checks if resizeableActivity was set explicitly when targetSdkVersion
is less than N (or not set).

Bug: 28020462
Change-Id: I099f6c00dd50547ddea873e47dbb447869d0be6f
2016-05-18 17:49:26 -07:00
Andrew Solovay
fd30a43337 doc: Updates to release notes post-DP3
Fixed a mistake (duplicated known-issue) and changed the AfW section
title.

Also added a new adb-related bug in a new "Developer Tools" section.

See first comment for doc stage location.

bug: 28844418
bug: 28347842

Change-Id: I10138a66d596b8aeb5a35a9366950af9f4c7cc51
2016-05-18 17:36:45 -07:00
Andreas Gampe
54748384ea Merge "Frameworks/base: Add more systrace points" into nyc-dev
am: b40bcfb6ad

* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
  Frameworks/base: Add more systrace points

Change-Id: I1ede493eaab4a86c67a992c2eb4129f81d903d1c
2016-05-19 00:14:14 +00:00
TreeHugger Robot
b40bcfb6ad Merge "Frameworks/base: Add more systrace points" into nyc-dev 2016-05-19 00:09:09 +00:00
Christopher Tate
8d71edc83d Add default lock wallpaper capability and API
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39 Add default lock wallpaper capability and API
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery.  In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset.  This mechanism parallels the existing one for
the default system wallpaper.

By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file.  A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.

Bug 27828056

Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
2016-05-18 23:57:46 +00:00
Chris Tate
b100777562 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 2016-05-18 23:50:14 +00:00
Robin Lee
77ab7fc8d4 Merge "Lock down networking when waiting for always-on" into nyc-dev
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I7be0a85597936421750d1da0fde3d55d7d4fabc5
2016-05-18 23:42:43 +00:00
Robin Lee
d171df660e Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Selim Cinek
5b03ce95c7 Fixed a bug where autobundling could lead to bugs
Notifications could appear twice if a notification with an app
group became bundled and one could not be swiped away anymore.
This is because we were unconditionally copying over the override
key even if the notification just became a group.

This also fixes a nullpointer that could happen with a racecondition
when a notification was cancelled and it tried to be used for autobundling.

This also fixes an issue that the autobundling wasn't working correctly
when a notification didn't have a group set but was set to be a
group summary.

Change-Id: Icd971f16ae0804ce162fd3171fcdd99bd04f3885
Fixes: 28706404
Fixes: 28628237
2016-05-18 16:31:41 -07:00
Robin Lee
17e6183b85 Lock down networking when waiting for always-on
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
smain@google.com
8034ff14ed update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af
am: ec82d3e76e

* commit 'ec82d3e76e36b4e15835e7b48dff6aa7a861153e':
  update sdk/ link to studio/

Change-Id: Ieeeb96027ed86e5ac7270af79fad06d3b0a9d1b2
2016-05-18 23:03:42 +00:00
Bert McMeen
0cd72d746a Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f
am: c4e18f5a38

* commit 'c4e18f5a388a41da5ce3ee55a68d53d9254499c5':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I2b871710e8c527eea6205a09c15df72469d333f3
2016-05-18 23:03:37 +00:00
smain@google.com
ec82d3e76e update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d
am: 9de1d192af

* commit '9de1d192af5761dec4e58837690febc6385874b4':
  update sdk/ link to studio/

Change-Id: I3184c8b697fe96162cb87c17bcf85fc6375127d9
2016-05-18 22:59:45 +00:00
Bert McMeen
c4e18f5a38 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9
am: 3fb62d859f

* commit '3fb62d859f2c3ed0b06dd3d6f7183c838c829c2b':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I3ad08bb522e3c1ab2fefd2cf7884d69d82f5d394
2016-05-18 22:59:36 +00:00