Commit Graph

249922 Commits

Author SHA1 Message Date
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
e42702d2f2 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: Ia7440d790dfe6f1c1e9d7c564cd9cc4f9df6342d
2016-05-25 23:59:47 +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
869f32d810 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: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
2016-05-25 23:50:45 +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
Philip P. Moltmann
3f0c4ca281 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: I43e2a7a548bbb21223f1007c03c57a00aa966402
2016-05-25 23:22:24 +00: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
Chong Zhang
5dfed87e37 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: I1d795081651be6535603606de7a7728a98b42bf2
2016-05-25 22:59:03 +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
Miao Wang
21f51e94b8 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." am: f1f13f98b5
am: 349e2f1558

* commit '349e2f15585136b323f68a5479051d9531605eb4':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: Icbc0bdb1f140aa528b1f06465a87db9c6934c592
2016-05-25 22:50:08 +00:00
Miao Wang
1839237340 Merge "Update documentation about copyTo and copyFrom." am: 4cd38c30e6
am: e31342e692

* commit 'e31342e692c3df7bc791a9320a233d2e9cec7c8a':
  Update documentation about copyTo and copyFrom.

Change-Id: Ifbfe89186dfbfa691bae798c5fadcfe6ed75a431
2016-05-25 22:50:03 +00: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
Miao Wang
349e2f1558 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
am: f1f13f98b5

* commit 'f1f13f98b58467b69c0ac9d4ba43d3f083525966':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: Ib2c03454a8fa19a279820a2809686646f54bdfc9
2016-05-25 22:43:13 +00:00
Miao Wang
e31342e692 Merge "Update documentation about copyTo and copyFrom."
am: 4cd38c30e6

* commit '4cd38c30e609c2ddb6ee3f8785750ff6a12c57d6':
  Update documentation about copyTo and copyFrom.

Change-Id: I9125dec95270b265fba34db5ed6e9df6deaed5c3
2016-05-25 22:43:07 +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
Miao Wang
f1f13f98b5 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." 2016-05-25 22:28:35 +00: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
48a27be30f Merge "Alternate method for adding dismiss in talkback" into nyc-dev
am: 436da616c8

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

Change-Id: I8dbad668aa3accbe9d91dc634cbcbd5d1d4e820b
2016-05-25 22:25:40 +00:00
Miao Wang
4cd38c30e6 Merge "Update documentation about copyTo and copyFrom." 2016-05-25 22:25:40 +00:00
Antonio Cansado
c37ba5cbc1 Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f
2016-05-25 22:25:27 +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
Siyamed Sinir
baf8284c62 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: I7f1d3acb519a91388dbf03db28ee039b5d4b7b1c
2016-05-25 22:09:31 +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
151c74146e 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: I1c53f8121ee43691354d66885e6c1c71c777c959
2016-05-25 21:56:35 +00:00
Eric Schmidt
c6ff5315b6 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: If3669044623c465e5797eae64899042f3e5a9d00
2016-05-25 21:56:31 +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
Miao Wang
6aaede8cd7 [RenderScript] Fix ScriptIntrinsicBlur documentation.
Bug: 28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit c242fa6b5d)
2016-05-25 14:44:10 -07:00
Miao Wang
1641dc9e68 Update documentation about copyTo and copyFrom.
Bug: 23159764
Bug: 26862970

  - Add detailed description of AutoPadding
  - Add comments to all the copy related APIs.
  - Fix typos in the comments.

Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
(cherry picked from commit 3231e8e022)
2016-05-25 14:38:43 -07: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
Android Build Merger (Role)
cb3ae33cfe 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 2016-05-25 21:28:20 +00:00
Alan Viverette
72c2aec394 Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
am: 29c01336db

* commit '29c01336db4b2db5582904597559b14563543054':
  Fix DatePicker.setMin/MaxDate()

Change-Id: I34440f70e6771a6e97cd46e78548167f02bb5e82
2016-05-25 21:28:06 +00:00
Amanda Kassay
4be59f0ae3 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

* commit 'c68d8768c84dd045d3db3f685a95963eb315be8c':
  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: I40fa99170770712c4d844eab0d1e3d6fa9373d90
2016-05-25 21:28:01 +00:00