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
Phil Weaver
7ab1a4d286
Merge "Improve accessibility window title behavior" into nyc-dev
2016-05-26 00:11:25 +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
03d3f4a6cb
Merge "Per API review, revert the API renaming CL." into nyc-dev
2016-05-25 23:41:21 +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
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
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
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
Chris Tate
2cfc6baa22
Merge "Backport of backup transport whitelist" into mnc-dev
2016-05-25 22:30:58 +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
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
e747160509
Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev
2016-05-25 22:03:06 +00: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
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
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
Eric Schmidt
5548a7c59c
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs
2016-05-25 21:27:35 +00:00
Alan Viverette
29c01336db
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
2016-05-25 21:17:53 +00:00
Amanda Kassay
c68d8768c8
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."
...
This reverts commit 85b7df2697 .
Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
2016-05-25 17:14:08 -04:00
Robin Lee
48b18f4fa9
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
2016-05-25 21:05:55 +00:00
Zach Kuznia
a5e6601ad1
Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev
2016-05-25 20:57:25 +00:00
TreeHugger Robot
dfe232c763
Merge "API council feedback: hide and document." into nyc-dev
2016-05-25 20:43:56 +00:00
Mady Mellor
b6f640607b
Merge "Fix clipping not being activated on children in groups" into nyc-dev
2016-05-25 20:22:42 +00:00
Phil Weaver
2a7e4442bf
Improve accessibility window title behavior
...
Suppress the default, unlocalized strings from being read as title.
Bug: 28744278
Change-Id: Iea0f7d8fed3d6428ada725cf3ffa077ba974b74a
2016-05-25 12:48:13 -07:00
Zachary Kuznia
ec1783828e
Ensure MotionEvent.split() won't be given an invalid value.
...
b/27496784
Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
2016-05-25 12:38:58 -07:00
TreeHugger Robot
39e8022a75
Merge "Force pending transactions to flush before screenshot." into nyc-dev
2016-05-25 19:16:13 +00:00
Siyamed Sinir
f75775ea7f
Fix TextView layout reuse when maxLines is set
...
When maxLines is set on StaticLayout and the text is wrapped, during
onMeasure TextView couldn’t recognize the wrap in the layout and tried
to reuse the layout which in turn caused width calculation problems.
This CL checks if maxLines is set, and if there is a text cut-off in
order to reuse existing layout.
Bug: 28468120
Change-Id: Ide43df8512a09112715067cbadf29cc64fd53247
2016-05-25 12:01:23 -07:00
Mady Mellor
7c17e70f2f
Merge "Changes based on API council feedback for performContextClick" into nyc-dev
2016-05-25 19:00:08 +00:00
Philip P. Moltmann
b4a45472bb
Merge "Add Samsung print recommendation plugin." into nyc-dev
2016-05-25 18:51:12 +00:00
Derek Tan
818822ad5d
Per API review, revert the API renaming CL.
...
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."
This reverts commit 3bf26b5605 .
Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
2016-05-25 18:37:05 +00:00
Chad Brubaker
56f2f91793
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0
...
am: d1df52a46b
* commit 'd1df52a46beb5babd0d9f3257b2ade53c9c763cf':
Fix incorrect cleartext attribute
Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
2016-05-25 18:36:47 +00:00
Alex Klyubin
d1df52a46b
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0
...
am: 56f32483b0
* commit '56f32483b04723bf750e51badcfec3203c352d32':
Fix incorrect cleartext attribute
Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
2016-05-25 18:24:31 +00:00
Sid Soundararajan
17d29b6d70
Alternate method for adding dismiss in talkback
...
This is an alternate solution. Not sure if this is better than
the current solution.
BUG: 28594452
Change-Id: I08b4ca8741ceb3491950ba779510b08775bd0ee7
2016-05-25 11:18:22 -07:00
Chad Brubaker
56f32483b0
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
...
am: f2e0a719d0
* commit 'f2e0a719d00c4a7c6865f6784efc9b3f88421136':
Fix incorrect cleartext attribute
Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
2016-05-25 18:16:03 +00:00
Selim Cinek
6088cf67e8
Merge "Fixed a bug where the expand button was invisible" into nyc-dev
2016-05-25 18:14:57 +00:00
Antonio Cansado
904237f839
Cleaning up NetworkStatsManager.
...
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs
Bug:27530098,27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
2016-05-25 11:07:41 -07:00
Alex Klyubin
f2e0a719d0
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
2016-05-25 18:04:54 +00:00
Chris Banes
163236156f
Merge "Fix text appearances not working in colored button styles" into nyc-dev
2016-05-25 17:57:12 +00:00
Christopher Tate
2be3de1723
Backport of backup transport whitelist
...
Sysconfig define a whitelist of permitted backup transports
Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.
Bug 28406080
Backport of 494df79172 from N
Change-Id: I9f90e324169a68720d608f74754d284a7e59cf87
2016-05-25 10:51:38 -07:00
Chong Zhang
15818e1156
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
2016-05-25 17:32:21 +00:00
Jason Monk
c4b6e2a184
Merge "QS Edit: Fix up accessibility" into nyc-dev
2016-05-25 17:11:31 +00:00
Jason Monk
630436c9ed
Merge "QS Edit: Hide black bar in landscape" into nyc-dev
2016-05-25 17:11:23 +00:00
Jason Monk
7e10e630b4
Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev
2016-05-25 17:11:15 +00:00
Jason Monk
8fd8a4fde8
Merge "QS: Fix QS touch breaking" into nyc-dev
2016-05-25 17:11:08 +00:00
Julia Reynolds
d3827be162
Merge changes from topic 'cps' into nyc-dev
...
* changes:
Api updates.
Note timezone changes.
2016-05-25 17:09:26 +00:00
Julia Reynolds
ad41a6f0de
Api updates.
...
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
2016-05-25 13:02:50 -04:00