Commit Graph

246497 Commits

Author SHA1 Message Date
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
f2c95b865e Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
am: 29c01336db

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

Change-Id: Ief9107dfd244cb2bad45e0d6f3e183dc2d1fbd11
2016-05-25 21:28:07 +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
Andrii Kulian
0be2cfec46 Fix exception when trying to update config of detached stack
There is an NullPointerException which can be reproduced with following steps
on angler:
1. In split-screen open activities from the same app.
   Make sure to launch them from launcher.
2. Rotate device to landscape.
3. Force-stop the app using adb command.

After killing the app it will try to open launcher, which is fixed in
portrait mode on that device. This will update the configuration for all the
stacks, including already detached.

Bug: 28786255
Change-Id: Ia326c09cff9f1a3fb43cca5b48db29718553346a
2016-05-25 14:27:39 -07: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
Robin Lee
ef7e644fc5 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
am: 48b18f4fa9

* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I202f19946246aa52d37c3c6bb7665cc58ddf8572
2016-05-25 21:19:08 +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
Alan Viverette
0d203354b9 Fix borderless colored button text color
Bug: 28962396
Change-Id: I8cd8d24c778e2174d268da7ad40e43a4cfc142eb
2016-05-25 17:10:33 -04:00
Danny Epstein
c8a35d64c6 Merge "Left and right margins for watch preferences." into nyc-mr1-dev 2016-05-25 21:09:21 +00:00
Chris Wren
698b1706be add metrics for notification and group expansion
Bug: 28146482
Change-Id: Id7f71873ba33f85c1a1f2c48b47f78d40df46c0d
2016-05-25 17:08:17 -04:00
Zachary Kuznia
d865a2ba6a Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev
am: a5e6601ad1

* commit 'a5e6601ad1db77563038946ed1316134f7e55ee6':
  Ensure MotionEvent.split() won't be given an invalid value.

Change-Id: Ide2f549e62750f39cecee18a71e0f35d4724d1f3
2016-05-25 21:06:19 +00: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
Jeff Sharkey
19e2f49181 Merge "API council feedback: hide and document." into nyc-dev
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
2016-05-25 20:51:07 +00:00
Chris Wren
7e431621c4 boost starred people to at least high importance
Bug: 28949659
Change-Id: If604062a282db5db463642315a8fa5f7cd6e597c
2016-05-25 16:45:54 -04:00
Sunny Goyal
6f84a27a75 Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev 2016-05-25 20:45:44 +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
680f73bf46 Merge "Fix clipping not being activated on children in groups" into nyc-dev
am: b6f640607b

* commit 'b6f640607b5b8124b1a1c216ea4264511b145774':
  Fix clipping not being activated on children in groups

Change-Id: I9bb55c13928be62641884d1381baf984c43acac6
2016-05-25 20:35:45 +00:00
Michael Kwan
6b0351251e Update EditText break strategy for Theme.Micro.
Change-Id: I59847023fc06447232377ebd4998175070b31737
2016-05-25 13:29:38 -07: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
Robert Carr
1d4f1cda2d Merge "Force pending transactions to flush before screenshot." into nyc-dev
am: 39e8022a75

* commit '39e8022a75507be06179c3de7358cebb1bb22e06':
  Force pending transactions to flush before screenshot.

Change-Id: Ib8dd84af143226e2b62cdfa51066e68ba7802d28
2016-05-25 19:21:34 +00:00
TreeHugger Robot
39e8022a75 Merge "Force pending transactions to flush before screenshot." into nyc-dev 2016-05-25 19:16:13 +00:00
Mady Mellor
3425c6c62c Merge "Changes based on API council feedback for performContextClick" into nyc-dev
am: 7c17e70f2f

* commit '7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
  Changes based on API council feedback for performContextClick

Change-Id: Ief8c3036b93c28b27ba2f117ec656d38a1562fcf
2016-05-25 19:10:59 +00:00
Philip P. Moltmann
6b7635f774 Merge "Add Samsung print recommendation plugin." into nyc-dev
am: b4a45472bb

* commit 'b4a45472bb2d7d5319fe020c228e3c9169a5e5a3':
  Add Samsung print recommendation plugin.

Change-Id: I88c72b3c3ce3a190af297c78373fbfd7e2f61ef7
2016-05-25 19:10:37 +00:00
Alex Klyubin
85b5a076d4 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b
am: 56f2f91793

* commit '56f2f91793e8eb296ba8826deaaacd77b2081d64':
  Fix incorrect cleartext attribute

Change-Id: I07954d6b54c4b736ebcd97f0ee442133f685e129
2016-05-25 19:01:27 +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
Selim Cinek
f3018bc581 Merge "Fixed a bug where the expand button was invisible" into nyc-dev
am: 6088cf67e8

* commit '6088cf67e8895b5ae09e8d99d57f9ae9279a2470':
  Fixed a bug where the expand button was invisible

Change-Id: Ia7bfba0e245781f80bb1d7a9a068f765661177a7
2016-05-25 18:25:33 +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
Chris Banes
62eec265ee Merge "Fix text appearances not working in colored button styles" into nyc-dev
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: Ib26212b58dde81eeb222721d39df7ce66502265b
2016-05-25 18:05:21 +00: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
3eddecc3bc Build JobStatus objects outside the lock
Constructing a JobStatus can be a surprisingly heavy operation, potentially
involving IPC; so do so outside the primary lock when possible in order to
reduce lock contention.

Bug 28946245

Change-Id: I51fffa6d29d566647edb583ae6e46ed6038d36e3
2016-05-25 10:54:18 -07: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
b56ea680fc Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
am: 15818e1156

* commit '15818e1156101f1d3a01009e7bc223d8ae88546d':
  Destroy saved surfaces if one of the last visible windows gets removed

Change-Id: I143743940263578e7111ae41eb7b88c005be18a6
2016-05-25 17:42:33 +00: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
36cc784180 Merge "QS Edit: Fix up accessibility" into nyc-dev
am: c4b6e2a184

* commit 'c4b6e2a1849690a7f8dfa3be75ee84f1453f8224':
  QS Edit: Fix up accessibility

Change-Id: I78ebafd7f118fc1220e1c76b0823d229a69ebd0f
2016-05-25 17:21:51 +00:00
Jason Monk
be195ae45f Merge "QS Edit: Hide black bar in landscape" into nyc-dev
am: 630436c9ed

* commit '630436c9ed893b38059e4c9a6e03a753a2e84d3a':
  QS Edit: Hide black bar in landscape

Change-Id: I1691d9911b646f93c1fecab0cdb03506b4c357cb
2016-05-25 17:21:44 +00:00
Jason Monk
08305d711d Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev
am: 7e10e630b4

* commit '7e10e630b4df10b9ce92953e98dec9d2cda1bfa2':
  QS API: Handle return value from bindServiceAsUser

Change-Id: I40048d7a00969f63cbd8bc969417506a8afaa6f6
2016-05-25 17:21:32 +00:00
Jason Monk
45ddf4891f Merge "QS: Fix QS touch breaking" into nyc-dev
am: 8fd8a4fde8

* commit '8fd8a4fde8356bf2d3eb2dda4b6d91e61e80c0c6':
  QS: Fix QS touch breaking

Change-Id: I741f1b1a2eedc734ce3e182b50f6cf17536ab0d8
2016-05-25 17:21:17 +00:00