OSDN Git Service
Siyamed Sinir [Wed, 25 May 2016 22:13:28 +0000 (22:13 +0000)]
Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am:
e747160509
am:
baf8284c62
* commit '
baf8284c62e708a2d7817319c9e5f8948f6e5f5f':
Fix TextView layout reuse when maxLines is set
Change-Id: I0334f59dee1599a77c216a0a18e030247a41e55f
Siyamed Sinir [Wed, 25 May 2016 22:09:31 +0000 (22:09 +0000)]
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
Amanda Kassay [Wed, 25 May 2016 22:05:04 +0000 (22:05 +0000)]
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
am:
35bba73387
* commit '
35bba73387fcab2c6e800a67b3d8dea46d63cdcb':
Change-Id: I957ff5e128a8806f38fe125f3e845b745ac872fd
Eric Schmidt [Wed, 25 May 2016 22:04:59 +0000 (22:04 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am:
5548a7c59c am:
3c2709c6b7 am:
31e070a1b3
am:
0e4415bc72
* commit '
0e4415bc72eff36ef1950f7f4581291c5004b320':
Change-Id: Iecdc035b7de17daa7cca5476c9842b7a0be7c1ed
Siyamed Sinir [Wed, 25 May 2016 22:03:06 +0000 (22:03 +0000)]
Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev
Amanda Kassay [Wed, 25 May 2016 22:02:34 +0000 (22:02 +0000)]
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
am:
151c74146e
* commit '
151c74146e6e8b4570e5de2a8f557fe6cce8098b':
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: I4922db48526cf8b786009ba782ed68f33682baef
Eric Schmidt [Wed, 25 May 2016 22:02:23 +0000 (22:02 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am:
5548a7c59c am:
3c2709c6b7 am:
31e070a1b3
am:
c6ff5315b6
* commit '
c6ff5315b6fb8aefb7dea15d6a51a00b71074729':
docs: Instant Apps broken link, wonky video thumbnail
Change-Id: I97c9efc934e5cb59eb910e1ebd8be9f02186a519
Michael Kwan [Wed, 25 May 2016 21:58:13 +0000 (21:58 +0000)]
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
Amanda Kassay [Wed, 25 May 2016 21:56:35 +0000 (21:56 +0000)]
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
Eric Schmidt [Wed, 25 May 2016 21:56:31 +0000 (21:56 +0000)]
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
Amanda Kassay [Wed, 25 May 2016 21:56:30 +0000 (21:56 +0000)]
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
Eric Schmidt [Wed, 25 May 2016 21:56:26 +0000 (21:56 +0000)]
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
Junda Liu [Wed, 25 May 2016 21:50:29 +0000 (21:50 +0000)]
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
Alan Viverette [Wed, 25 May 2016 21:50:18 +0000 (21:50 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev am:
29c01336db
am:
f2c95b865e
* commit '
f2c95b865edadeca62e55bcbe963e8780acd68d4':
Change-Id: Iebca7dff13fa5602f17116460e08fdb8fbce06f2
Amanda Kassay [Wed, 25 May 2016 21:50:13 +0000 (21:50 +0000)]
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
Eric Schmidt [Wed, 25 May 2016 21:50:00 +0000 (21:50 +0000)]
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
Michael Kwan [Wed, 25 May 2016 21:46:26 +0000 (21:46 +0000)]
Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev
Junda Liu [Wed, 25 May 2016 21:39:10 +0000 (21:39 +0000)]
Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
Amanda Kassay [Wed, 25 May 2016 21:35:54 +0000 (21:35 +0000)]
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
Eric Schmidt [Wed, 25 May 2016 21:35:43 +0000 (21:35 +0000)]
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
Robin Lee [Wed, 25 May 2016 21:33:20 +0000 (21:33 +0000)]
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
Android Build Merger (Role) [Wed, 25 May 2016 21:29:54 +0000 (21:29 +0000)]
Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am:
48b18f4fa9 am:
30c63961dd" into nyc-mr1-dev-plus-aosp
Robin Lee [Wed, 25 May 2016 21:28:27 +0000 (21:28 +0000)]
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
Robin Lee [Wed, 25 May 2016 21:28:21 +0000 (21:28 +0000)]
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
Android Build Merger (Role) [Wed, 25 May 2016 21:28:19 +0000 (21:28 +0000)]
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
Alan Viverette [Wed, 25 May 2016 21:28:07 +0000 (21:28 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
am:
29c01336db
* commit '
29c01336db4b2db5582904597559b14563543054':
Fix DatePicker.setMin/MaxDate()
Change-Id: Ief9107dfd244cb2bad45e0d6f3e183dc2d1fbd11
Alan Viverette [Wed, 25 May 2016 21:28:06 +0000 (21:28 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
am:
29c01336db
* commit '
29c01336db4b2db5582904597559b14563543054':
Fix DatePicker.setMin/MaxDate()
Change-Id: I34440f70e6771a6e97cd46e78548167f02bb5e82
Amanda Kassay [Wed, 25 May 2016 21:28:01 +0000 (21:28 +0000)]
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
Eric Schmidt [Wed, 25 May 2016 21:27:34 +0000 (21:27 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs
Zach Kuznia [Wed, 25 May 2016 21:21:18 +0000 (21:21 +0000)]
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
Robin Lee [Wed, 25 May 2016 21:20:43 +0000 (21:20 +0000)]
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
Robin Lee [Wed, 25 May 2016 21:19:08 +0000 (21:19 +0000)]
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
Alan Viverette [Wed, 25 May 2016 21:17:52 +0000 (21:17 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
Amanda Kassay [Wed, 25 May 2016 20:59:53 +0000 (20:59 +0000)]
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
85b7df26975997826a738a46ae4ab797941175ea.
Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
Android Build Merger (Role) [Wed, 25 May 2016 21:14:01 +0000 (21:14 +0000)]
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
Zach Kuznia [Wed, 25 May 2016 21:13:33 +0000 (21:13 +0000)]
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
Zach Kuznia [Wed, 25 May 2016 21:13:22 +0000 (21:13 +0000)]
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
Danny Epstein [Wed, 25 May 2016 21:09:19 +0000 (21:09 +0000)]
Merge "Left and right margins for watch preferences." into nyc-mr1-dev
Zachary Kuznia [Wed, 25 May 2016 21:06:19 +0000 (21:06 +0000)]
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
Zachary Kuznia [Wed, 25 May 2016 21:06:13 +0000 (21:06 +0000)]
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
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
Jeff Sharkey [Wed, 25 May 2016 21:01:32 +0000 (21:01 +0000)]
Merge "API council feedback: hide and document." into nyc-dev am:
dfe232c763
am:
55a83354bf
* commit '
55a83354bf36c057dfb26bf5aca075f112afea69':
Change-Id: I6ffe0cc7ade34b0b87c37749b387d1810770adce
Zach Kuznia [Wed, 25 May 2016 20:57:24 +0000 (20:57 +0000)]
Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev
Jeff Sharkey [Wed, 25 May 2016 20:54:18 +0000 (20:54 +0000)]
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
Sunny Goyal [Wed, 25 May 2016 20:54:11 +0000 (20:54 +0000)]
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
Jeff Sharkey [Wed, 25 May 2016 20:51:07 +0000 (20:51 +0000)]
Merge "API council feedback: hide and document." into nyc-dev
am:
dfe232c763
* commit '
dfe232c7636d16379191442bdb2bac59d7a60f5c':
API council feedback: hide and document.
Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
Jeff Sharkey [Wed, 25 May 2016 20:51:03 +0000 (20:51 +0000)]
Merge "API council feedback: hide and document." into nyc-dev
am:
dfe232c763
* commit '
dfe232c7636d16379191442bdb2bac59d7a60f5c':
API council feedback: hide and document.
Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
Sunny Goyal [Wed, 25 May 2016 20:45:43 +0000 (20:45 +0000)]
Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev
TreeHugger Robot [Wed, 25 May 2016 20:43:55 +0000 (20:43 +0000)]
Merge "API council feedback: hide and document." into nyc-dev
Android Build Merger (Role) [Wed, 25 May 2016 20:41:02 +0000 (20:41 +0000)]
Merge "Merge "Fix clipping not being activated on children in groups" into nyc-dev am:
b6f640607b am:
680f73bf46" into nyc-mr1-dev-plus-aosp
Mady Mellor [Wed, 25 May 2016 20:40:30 +0000 (20:40 +0000)]
Merge "Fix clipping not being activated on children in groups" into nyc-dev am:
b6f640607b
am:
680f73bf46
* commit '
680f73bf4643f57d3e1cc8791b186944a65ab9d9':
Fix clipping not being activated on children in groups
Change-Id: I65a3ae33c0cb4934ed4a52d6e94194705fdac44c
Mady Mellor [Wed, 25 May 2016 20:40:22 +0000 (20:40 +0000)]
Merge "Fix clipping not being activated on children in groups" into nyc-dev am:
b6f640607b
am:
d20923ba8a
* commit '
d20923ba8a1553a51f9a152cbd6fba9e5e5a2bca':
Fix clipping not being activated on children in groups
Change-Id: Ie7e1640034d4bdb5111e533f7ed2b54139ef1b18
Mady Mellor [Wed, 25 May 2016 20:35:51 +0000 (20:35 +0000)]
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: Icf5c68956bb3c261ce27b195426ebd3aefe8b83b
Mady Mellor [Wed, 25 May 2016 20:35:45 +0000 (20:35 +0000)]
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
Michael Kwan [Wed, 25 May 2016 20:29:38 +0000 (13:29 -0700)]
Update EditText break strategy for Theme.Micro.
Change-Id: I59847023fc06447232377ebd4998175070b31737
Mady Mellor [Wed, 25 May 2016 20:22:41 +0000 (20:22 +0000)]
Merge "Fix clipping not being activated on children in groups" into nyc-dev
Zachary Kuznia [Fri, 13 May 2016 20:11:36 +0000 (13:11 -0700)]
Ensure MotionEvent.split() won't be given an invalid value.
b/
27496784
Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
Android Build Merger (Role) [Wed, 25 May 2016 19:27:27 +0000 (19:27 +0000)]
Merge "Merge "Force pending transactions to flush before screenshot." into nyc-dev am:
39e8022a75 am:
e1b1fb1740" into nyc-mr1-dev-plus-aosp
Robert Carr [Wed, 25 May 2016 19:27:03 +0000 (19:27 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev am:
39e8022a75
am:
e1b1fb1740
* commit '
e1b1fb1740b75174141693744d312bacc2539bbd':
Force pending transactions to flush before screenshot.
Change-Id: I55f20d3c2c900f635f079dd85721c0028f9ae255
Robert Carr [Wed, 25 May 2016 19:26:36 +0000 (19:26 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev am:
39e8022a75
am:
1d4f1cda2d
* commit '
1d4f1cda2de08887ce7036fa8a6f76d5ff0b378f':
Force pending transactions to flush before screenshot.
Change-Id: I618c4c794e0c26ead6995a8aa1ff3d0d42cc45a0
Robert Carr [Wed, 25 May 2016 19:21:34 +0000 (19:21 +0000)]
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
Robert Carr [Wed, 25 May 2016 19:21:16 +0000 (19:21 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev
am:
39e8022a75
* commit '
39e8022a75507be06179c3de7358cebb1bb22e06':
Force pending transactions to flush before screenshot.
Change-Id: I2dc18293c1507a7f427c3ad554d3f70467dac98d
Mady Mellor [Wed, 25 May 2016 19:16:58 +0000 (19:16 +0000)]
Merge "Changes based on API council feedback for performContextClick" into nyc-dev am:
7c17e70f2f
am:
3425c6c62c
* commit '
3425c6c62c85f9ed18c2268627c64eb7f10e15be':
Change-Id: I863672ff3019cd8d93f1f68857b3d146621105d7
Philip P. Moltmann [Wed, 25 May 2016 19:16:53 +0000 (19:16 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev am:
b4a45472bb
am:
6b7635f774
* commit '
6b7635f774bf14574e23adcb7ed4d580a2c06523':
Change-Id: I0c99e44fc1feabcbc5ab302f3d4361c73be0659f
TreeHugger Robot [Wed, 25 May 2016 19:16:12 +0000 (19:16 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev
Philip P. Moltmann [Wed, 25 May 2016 19:14:24 +0000 (19:14 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev am:
b4a45472bb
am:
8bfb5b971d
* commit '
8bfb5b971d46daecf72c7c8e179279fb9206ad00':
Changes based on API council feedback for performContextClick
Change-Id: I8317e028e1bd65ddf2ceb5c36b6db2fdb763f986
Chad Brubaker [Wed, 25 May 2016 19:14:11 +0000 (19:14 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0 am:
d1df52a46b am:
56f2f91793
am:
5e10a2b388
* commit '
5e10a2b388a0ee994228ab9bb328e9ea9c5a061e':
Add Samsung print recommendation plugin.
Change-Id: I572d7e43d327721ce22776e4e550c23a557a6e77
Mady Mellor [Wed, 25 May 2016 19:10:59 +0000 (19:10 +0000)]
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
Philip P. Moltmann [Wed, 25 May 2016 19:10:37 +0000 (19:10 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev
am:
b4a45472bb
* commit '
b4a45472bb2d7d5319fe020c228e3c9169a5e5a3':
Add Samsung print recommendation plugin.
Change-Id: I88c72b3c3ce3a190af297c78373fbfd7e2f61ef7
Android Build Merger (Role) [Wed, 25 May 2016 19:08:46 +0000 (19:08 +0000)]
Merge "Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0 am:
d1df52a46b am:
56f2f91793 am:
5dccdf9174" into nyc-mr1-dev-plus-aosp
Mady Mellor [Wed, 25 May 2016 19:08:17 +0000 (19:08 +0000)]
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: Ibf53f8081db8b847d18eaa8fee983b677b62f9bc
Chad Brubaker [Wed, 25 May 2016 19:08:14 +0000 (19:08 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0 am:
d1df52a46b am:
56f2f91793
am:
5dccdf9174
* commit '
5dccdf917413b1d677368276bac03a9938d472b8':
Fix incorrect cleartext attribute
Change-Id: Ib6e8edad00d9191f7096fe49e067d301abe037c0
Philip P. Moltmann [Wed, 25 May 2016 19:08:12 +0000 (19:08 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev
am:
b4a45472bb
* commit '
b4a45472bb2d7d5319fe020c228e3c9169a5e5a3':
Add Samsung print recommendation plugin.
Change-Id: I158aded0febc7790132e790a00b0603ed246400c
Chad Brubaker [Wed, 25 May 2016 19:08:06 +0000 (19:08 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0 am:
d1df52a46b am:
56f2f91793
am:
85b5a076d4
* commit '
85b5a076d40fe852303f10dd9c809786b8c33d11':
Fix incorrect cleartext attribute
Change-Id: I43cc3d63693996997aa28e04291e103806b95d97
Alex Klyubin [Wed, 25 May 2016 19:01:33 +0000 (19:01 +0000)]
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: I3c12ead21003a47b537b5e3746b6cfe16848fbff
Alex Klyubin [Wed, 25 May 2016 19:01:27 +0000 (19:01 +0000)]
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
Siyamed Sinir [Wed, 25 May 2016 18:16:22 +0000 (11:16 -0700)]
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
Mady Mellor [Wed, 25 May 2016 19:00:07 +0000 (19:00 +0000)]
Merge "Changes based on API council feedback for performContextClick" into nyc-dev
Selim Cinek [Wed, 25 May 2016 18:54:57 +0000 (18:54 +0000)]
Merge "Fixed a bug where the expand button was invisible" into nyc-dev am:
6088cf67e8
am:
f3de85d46f
* commit '
f3de85d46f7f7b4c5c1ef6b8cacdb80ede8b3867':
Change-Id: Ic7612847f0a12a4f96eee4b2b84524fd1ff04f4d
Philip P. Moltmann [Wed, 25 May 2016 18:51:11 +0000 (18:51 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev
Selim Cinek [Wed, 25 May 2016 18:39:51 +0000 (18:39 +0000)]
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: Ie34550e3dc313949cceb66afd40ccfd22cd7ddd8
Selim Cinek [Wed, 25 May 2016 18:39:05 +0000 (18:39 +0000)]
Merge "Fixed a bug where the expand button was invisible" into nyc-dev am:
6088cf67e8
am:
f3018bc581
* commit '
f3018bc58122ee712a0a988e18b71fc66f9093b2':
Fixed a bug where the expand button was invisible
Change-Id: Ic19a3c0d7001cbd52a752c921c46d4e238c58614
Chad Brubaker [Wed, 25 May 2016 18:36:47 +0000 (18:36 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0
am:
d1df52a46b
* commit '
d1df52a46beb5babd0d9f3257b2ade53c9c763cf':
Fix incorrect cleartext attribute
Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
Selim Cinek [Wed, 25 May 2016 18:25:33 +0000 (18:25 +0000)]
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
Alex Klyubin [Wed, 25 May 2016 18:24:31 +0000 (18:24 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0
am:
56f32483b0
* commit '
56f32483b04723bf750e51badcfec3203c352d32':
Fix incorrect cleartext attribute
Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
Android Build Merger (Role) [Wed, 25 May 2016 18:21:13 +0000 (18:21 +0000)]
Merge "Merge "Fix text appearances not working in colored button styles" into nyc-dev am:
163236156f am:
62eec265ee" into nyc-mr1-dev-plus-aosp
Chris Banes [Wed, 25 May 2016 18:20:30 +0000 (18:20 +0000)]
Merge "Fix text appearances not working in colored button styles" into nyc-dev am:
163236156f
am:
62eec265ee
* commit '
62eec265eed52a1fc33d5a7ded383d84a53d4810':
Fix text appearances not working in colored button styles
Change-Id: Ice1a77be3eef649f6b78b25c8310bd8903eb9c76
Chris Banes [Wed, 25 May 2016 18:20:27 +0000 (18:20 +0000)]
Merge "Fix text appearances not working in colored button styles" into nyc-dev am:
163236156f
am:
def151052c
* commit '
def151052c2e48a3f0e8de8dbab65db4e953abeb':
Fix text appearances not working in colored button styles
Change-Id: I3f47630eaf5bc2893b845ad141087d2a2a7011f5
Chad Brubaker [Wed, 25 May 2016 18:16:03 +0000 (18:16 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
am:
f2e0a719d0
* commit '
f2e0a719d00c4a7c6865f6784efc9b3f88421136':
Fix incorrect cleartext attribute
Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
Selim Cinek [Wed, 25 May 2016 18:14:56 +0000 (18:14 +0000)]
Merge "Fixed a bug where the expand button was invisible" into nyc-dev
Chris Banes [Wed, 25 May 2016 18:05:52 +0000 (18:05 +0000)]
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: I229589acdd58746f4a230643ae025fa4639a7991
Chris Banes [Wed, 25 May 2016 18:05:21 +0000 (18:05 +0000)]
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
Alex Klyubin [Wed, 25 May 2016 18:04:53 +0000 (18:04 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
Chris Banes [Wed, 25 May 2016 17:57:11 +0000 (17:57 +0000)]
Merge "Fix text appearances not working in colored button styles" into nyc-dev
Android Build Merger (Role) [Wed, 25 May 2016 17:53:45 +0000 (17:53 +0000)]
Merge "Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am:
15818e1156 am:
b56ea680fc" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 25 May 2016 17:53:20 +0000 (17:53 +0000)]
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am:
15818e1156
am:
b56ea680fc
* commit '
b56ea680fc3fa650370b539c229986f21d4ed512':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I7860d2c6c4862dfbac060c76e74ca371435906e2
Chong Zhang [Wed, 25 May 2016 17:53:14 +0000 (17:53 +0000)]
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am:
15818e1156
am:
51cc0f48d7
* commit '
51cc0f48d7730efacaee77b8479aeec81cff2d17':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I14fad31b6a9a4947e29d6fbe10c15e5122b95f1c
Chong Zhang [Wed, 25 May 2016 17:42:35 +0000 (17:42 +0000)]
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: I96e3ac246e18f1b6cc222ef847275ce15043b441
Chong Zhang [Wed, 25 May 2016 17:42:33 +0000 (17:42 +0000)]
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
Android Build Merger (Role) [Wed, 25 May 2016 17:33:11 +0000 (17:33 +0000)]
Merge "Merge "QS Edit: Fix up accessibility" into nyc-dev am:
c4b6e2a184 am:
36cc784180" into nyc-mr1-dev-plus-aosp
OSDN Git Service
