Commit Graph

256895 Commits

Author SHA1 Message Date
Michael Kwan
76501fed59 Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev
am: e7f634f416

* commit 'e7f634f4164733ebf6872b31de8dcfe02885e3d4':
  Update EditText break strategy for Theme.Micro.

Change-Id: I8d6b567bad7c59ece17c8663bc496f3047da7ac1
2016-05-25 21:58:13 +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
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
Junda Liu
ec319efbd5 Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
am: ea97857a78

* commit 'ea97857a7868467a5cbe986807d04854cc4c3442':
  Add restricted card state to telephony manager.

Change-Id: I800619a54e75424d6dbb723216ae250ec6276e41
2016-05-25 21:50:29 +00:00
Alan Viverette
247fa7c875 Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev am: 29c01336db
am: f2c95b865e

* commit 'f2c95b865edadeca62e55bcbe963e8780acd68d4':

Change-Id: Iebca7dff13fa5602f17116460e08fdb8fbce06f2
2016-05-25 21:50:18 +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
Michael Kwan
e7f634f416 Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev 2016-05-25 21:46:27 +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
Junda Liu
ea97857a78 Merge "Add restricted card state to telephony manager." into nyc-mr1-dev 2016-05-25 21:39:12 +00: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
Robin Lee
c9c95aa244 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9
am: 72c2aec394

* commit '72c2aec394f6cb06e0c61d0da15a93bfcacbdc51':
  Fix DatePicker.setMin/MaxDate()

Change-Id: Iab6ef414116d6bec4cf418d784de4c0797e5dbd4
2016-05-25 21:33:20 +00:00
Android Build Merger (Role)
71363f6c78 Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 30c63961dd" into nyc-mr1-dev-plus-aosp 2016-05-25 21:29:56 +00:00
Robin Lee
62f3b9286d Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9
am: ef7e644fc5

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

Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
2016-05-25 21:28:27 +00:00
Robin Lee
aa2b8360a3 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9
am: 30c63961dd

* commit '30c63961dd12fb5b8e3565bebc86c0c7a5faaa54':
  Return legacy VPN info regardless of lockdown mode

Change-Id: Icc8867a0ea3024c189aff10e2b903fac0dab2092
2016-05-25 21:28:21 +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
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
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
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
Zach Kuznia
c9eb2c47b1 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1
am: c8a35d64c6

* commit 'c8a35d64c68386a3be9ecd49f8a7cb6463a80182':
  Left and right margins for watch preferences.

Change-Id: Ib7888054d18139e7bbb1903242c16a69f25daf88
2016-05-25 21:21:18 +00:00
Robin Lee
30c63961dd 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: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
2016-05-25 21:20:43 +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
Android Build Merger (Role)
94dd543957 Merge "Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 am: d865a2ba6a" into nyc-mr1-dev-plus-aosp 2016-05-25 21:14:02 +00:00
Zach Kuznia
5716bc77c7 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1
am: d865a2ba6a

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

Change-Id: If51510d977e080291c4815a1924e615f8fdf25c9
2016-05-25 21:13:33 +00:00
Zach Kuznia
f4285e92d7 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1
am: 48d08caa30

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

Change-Id: Id83890a9d8bbcf7f6cde4e44fad493f863c5b0ea
2016-05-25 21:13:22 +00: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
Zachary Kuznia
48d08caa30 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: I1264c964316d385cf155ca3db702734ef69d1f1f
2016-05-25 21:06:13 +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
Jeff Sharkey
3a5a6e239a Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763
am: 55a83354bf

* commit '55a83354bf36c057dfb26bf5aca075f112afea69':

Change-Id: I6ffe0cc7ade34b0b87c37749b387d1810770adce
2016-05-25 21:01:32 +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
e2c9ed48ba Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763
am: 19e2f49181

* commit '19e2f49181b209d790f551b374d6d24002de7c9b':
  API council feedback: hide and document.

Change-Id: I3715fc6e824f2a55517788299afe36145db597d7
2016-05-25 20:54:18 +00:00
Sunny Goyal
2034a76a6e Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev
am: 6f84a27a75

* commit '6f84a27a7597a3bc34316baf2af2bda30a2d75de':
  Maintaining diff for all widget operations instead of just the Views update

Change-Id: Iae3f2a6fc040d4484788ba203e0e0b6a66ed5c48
2016-05-25 20:54:11 +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
Jeff Sharkey
55a83354bf Merge "API council feedback: hide and document." into nyc-dev
am: dfe232c763

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

Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
2016-05-25 20:51:03 +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
Android Build Merger (Role)
021650bd8a Merge "Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b am: 680f73bf46" into nyc-mr1-dev-plus-aosp 2016-05-25 20:41:03 +00:00