Commit Graph

246497 Commits

Author SHA1 Message Date
Android Build Merger (Role)
36a1b38e89 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev 2016-05-26 00:24:01 +00:00
Chris Tate
dbda4c2f9a Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8
am: 38a37f336f  -s ours

* commit '38a37f336f96896146efc1a85310504bf4f77116':
  Backport of backup transport whitelist

Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8
2016-05-26 00:22:47 +00:00
TreeHugger Robot
dac0708ea0 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 2016-05-26 00:22:29 +00:00
Phil Weaver
0a16a8d1d6 Merge "Improve accessibility window title behavior" into nyc-dev
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: Iff0d61871f48a66510e1fab72adbfb062c01c203
2016-05-26 00:19:19 +00:00
Christopher Tate
88c9eae886 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade
am: 24ceca96af  -s ours

* commit '24ceca96af925ac19a1fa337afc0e739d9cb11ad':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663
2016-05-26 00:12:37 +00:00
Phil Weaver
7ab1a4d286 Merge "Improve accessibility window title behavior" into nyc-dev 2016-05-26 00:11:25 +00:00
Sid Soundararajan
caa611f88d Make content descriptions of task cards, the title description
Use the title description as content description for the task
card, this should be better for talkback.

BUG: 28594452
Change-Id: Idc97004f1370a35ea5328c4e9e46a72a9349c8f4
2016-05-25 17:08:12 -07:00
Roshan Pius
0f19009fb7 Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
am: 135c4760fd

* commit '135c4760fddc7809ea5f7e9d58bc3f4b3a076875':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: I23e117ccaa78cb7e6a3a0b9df682ec459391fb34
2016-05-25 23:57:56 +00:00
TreeHugger Robot
135c4760fd Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev 2016-05-25 23:51:01 +00:00
Derek Tan
e214ff00ea Merge "Per API review, revert the API renaming CL." into nyc-dev
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
2016-05-25 23:50:12 +00:00
Adam Lesinski
27d301667b Use app's best locale if they override LocaleList
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
2016-05-25 16:45:14 -07:00
Adam Powell
43ec62af45 N is API 24
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb Merge "Per API review, revert the API renaming CL." into nyc-dev 2016-05-25 23:41:21 +00:00
Hemal Patel
ff9f9ee180 Docs: Changed GitHub samples link to point to "Google Samples" page on
GitHub.

Bug: 28223672
Change-Id: Ie168740a3f9c8393379d09bb97c7f6422d8fb9dd
2016-05-25 16:25:32 -07:00
Philip P. Moltmann
5338bead7f Merge "Move add-printer list headers to the right positions." into nyc-dev
am: 00e3c23265

* commit '00e3c232656e648376c94a78b568c3ca1fe8c123':
  Move add-printer list headers to the right positions.

Change-Id: I439ab5769e597994912d8bf5dcb6edcfa2a9b496
2016-05-25 23:21:05 +00:00
Mady Mellor
6baed9e3a2 Parent notifications should always be normal notification color
Notification groups would use the background color of their
children in some cases. This changes it so that parent
notifications always use the normal notification color.

Change-Id: I0638f94e044da2ba65a921f0c4a538941c001ca7
Fixes: 28613919
2016-05-25 16:16:53 -07:00
Christopher Tate
24ceca96af DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101
am: 4c559cdade

* commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142
2016-05-25 23:16:15 +00:00
Christopher Tate
38a37f336f Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
am: c69aa838a8

* commit 'c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
  Backport of backup transport whitelist

Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365
2016-05-25 23:16:02 +00:00
Trevor Johns
05dd9d2c29 docs: Fix broken link in Volley training
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
2016-05-25 16:13:21 -07:00
Dianne Hackborn
47fb83a1e2 Fix issue #28964589: Binding dies when (unrelated) component is disabled in package
We go through the same path for uninstalling and changing an app...
both of which would do a full force stop.  That is only appropriate
for uninstalling; for changing, we should just be killing its processes.

Change-Id: Ia87750d96d3e3eb7ee30841429eb926c20c5ad78
2016-05-25 16:12:02 -07:00
Philip P. Moltmann
00e3c23265 Merge "Move add-printer list headers to the right positions." into nyc-dev 2016-05-25 23:10:26 +00:00
Chris Tate
c69aa838a8 Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22
am: 600d4f61ca

* commit '600d4f61ca15b375c9acef64d52913f0ab823deb':
  Backport of backup transport whitelist

Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa
2016-05-25 23:06:54 +00:00
Christopher Tate
4c559cdade DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours
am: 077534b101

* commit '077534b1015762d445f505fc2f440beaa2ba974a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf
2016-05-25 23:06:02 +00:00
Bill Yi
0a0ceba3c7 Import translations. DO NOT MERGE
Change-Id: I26ba43999026f73db18717776c9c475802d12a9d
Auto-generated-cl: translation import
2016-05-25 16:00:02 -07:00
Chong Zhang
d449dae513 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev
am: e55e4b7f73

* commit 'e55e4b7f73be3b3babd28581a839d0b9700d555d':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I6e0b7bd1775c7968c36b0ec0d470be8bde363c73
2016-05-25 22:57:07 +00:00
Stephan Linzner
ebdc157bc0 Un-deprecated Android mock testing APIs
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.

Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
2016-05-25 22:54:27 +00:00
Bill Yi
3a97b5e245 Import translations. DO NOT MERGE
Change-Id: I1565d077d00cddf65bcda9034194a020a1a61e7d
Auto-generated-cl: translation import
2016-05-25 15:53:43 -07:00
Christopher Tate
600d4f61ca Merge "Backport of backup transport whitelist" into mnc-dev
am: 2cfc6baa22

* commit '2cfc6baa2286a256585a7fb6295f9b66ff641726':
  Backport of backup transport whitelist

Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3
2016-05-25 22:45:49 +00:00
Christopher Tate
077534b101 DO NOT MERGE : backport of backup transport whitelist
am: 647cb6a6d8  -s ours

* commit '647cb6a6d82e3bb22eca0e5a27810e99084e2d5b':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I08b62dc7639ecc874d4c61d737b2b4cca27da241
2016-05-25 22:45:22 +00:00
Chong Zhang
e55e4b7f73 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev 2016-05-25 22:42:56 +00:00
Hemal Patel
ab0bd7d1ec Docs: Fixed the end-of-comment tag
Bug: 28025365
Change-Id: I2d3963c8c0a909f7e0a4925636bc73a56816e0af
2016-05-25 15:36:42 -07:00
Chris Tate
2cfc6baa22 Merge "Backport of backup transport whitelist" into mnc-dev 2016-05-25 22:30:58 +00:00
Sharvil Nanavati
6570340f71 Clean up Bluetooth test code.
Change-Id: I502b03df842c628c7b504e2a32a17bce6d25b4f8
2016-05-25 15:27:41 -07:00
Chong Zhang
73d4b44ce3 Update dock stack create mode after rotation if dock side changed
On some devices (such as tablets) dock stack could be created on top,
but put to right after rotation. Dock create mode needs to be updated
in this case, otherwise when a new stack is attached to the display
(for example launch into now-cropped fullscreen stack),
attachDisplayContent() will use wrong dock mode to derive the bounds.

bug: 28942558
Change-Id: I83e66aeac94bd3f96c4b6a0a740acf76234bbe82
2016-05-25 15:26:58 -07:00
Sid Soundararajan
1c503aa1bd Merge "Alternate method for adding dismiss in talkback" into nyc-dev
am: 436da616c8

* commit '436da616c89cc860e71a858be8792fc068646d1e':
  Alternate method for adding dismiss in talkback

Change-Id: I1a12d842e2d95b5d3915231c495b8ae1d3ddeed5
2016-05-25 22:25:18 +00:00
Antonio Cansado
f49cbec84c Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
2016-05-25 22:25:11 +00:00
Sid Soundararajan
436da616c8 Merge "Alternate method for adding dismiss in talkback" into nyc-dev 2016-05-25 22:23:05 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Doris Ling
5b2c0ad312 Added new action for gesture settings.
Added new event for Settings -> Gestures

Bug: 28565958
Change-Id: I126ab29cf312b09cad1bd86cf614019616642536
2016-05-25 15:08:29 -07:00
Siyamed Sinir
1a6f583c20 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev
am: e747160509

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: Iaf30b66b1a328f34d31efe723e394d817f74d65f
2016-05-25 22:08:22 +00:00
Siyamed Sinir
e747160509 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 2016-05-25 22:03:06 +00:00
Amanda Kassay
35bba73387 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c
am: 29b04437b1

* commit '29b04437b18402abefb40e696adf6434db0bf914':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I519500567900c72b1a91315f73e9ec5bb6600350
2016-05-25 21:56:30 +00:00
Eric Schmidt
0e4415bc72 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7
am: 31e070a1b3

* commit '31e070a1b35bf3658f8a803eeabe094ec1b2d826':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Iab4d84ece149983884f3292f40312104cb81b85c
2016-05-25 21:56:26 +00:00
Fyodor Kupolov
ac06a4907b Remove ActivityManager calls with PM.mInstallLock held
UserController now pushes user state to UMS.

PM now checks user running/unlocking/unlocked state by calling
UserManagerInternal.

Bug: 28090199
Change-Id: I20e62b37f78238f28dd81f49f876732bbd3c6b34
2016-05-25 14:55:09 -07:00
Amanda Kassay
29b04437b1 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe
am: a475ff360c

* commit 'a475ff360c9457ecbef6af97ca7228dc9cd5c139':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: Ibe99c1f7e47acacf7b60f8ad66a7a3d658776413
2016-05-25 21:50:13 +00:00
Eric Schmidt
31e070a1b3 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c
am: 3c2709c6b7

* commit '3c2709c6b7b40f0a31674a775f891ca4e198cfa5':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Ib072e701b8793baba0c9da9a24748dc89b1dae55
2016-05-25 21:50:00 +00:00
Michael Kwan
e7f634f416 Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev 2016-05-25 21:46:27 +00:00
Junda Liu
ea97857a78 Merge "Add restricted card state to telephony manager." into nyc-mr1-dev 2016-05-25 21:39:12 +00:00
Amanda Kassay
a475ff360c Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs
am: cb3ae33cfe

* commit 'cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
2016-05-25 21:35:54 +00:00
Eric Schmidt
3c2709c6b7 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs
am: 5548a7c59c

* commit '5548a7c59cf6a41095c72189fee7e522b5cab8f1':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I08d7e4c62072bffd01db4f1192cadbc1d033306b
2016-05-25 21:35:43 +00:00