Edward Jee
f067f8fb16
am 84d05ed5: am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
...
* commit '84d05ed5a229186c7859013327887f6af7ef4a29':
Adds APIs for Bluetooth PBAP and MAP access permission.
2014-09-16 09:12:33 +00:00
Igor Murashkin
86c2964cb9
am a9da866c: am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev
...
* commit 'a9da866c38b54d5c63fff0f3daec2f1fe42ec9dd':
camera2-legacy: Fix jpeg thumbnail quality not being set
2014-09-16 09:12:28 +00:00
Eino-Ville Talvala
39dca501a4
am 03597aea: am c142ac27: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev
...
* commit '03597aeab4a8c79d96fdf3c487c73e9034d3ee55':
Camera2: Check for sequence complete sooner.
2014-09-16 09:12:18 +00:00
Alan Viverette
def05dd180
am 408c61a1: am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev
...
* commit '408c61a12efae5c69c27fae058b0fbe83bfebc37':
Always apply ImageView's tint attribute using SRC_ATOP by default
2014-09-16 09:12:13 +00:00
Yohei Yukawa
bb5118edbf
am 382b6e5e: am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev
...
* commit '382b6e5e87a537bf35ae4b7a36ef3e3e92f7300b':
Minimize the number of default enabled IMEs part 3
2014-09-16 09:12:03 +00:00
Ang Li
4797fb0b39
am b2dc8ba3: am 94325a15: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev
...
* commit 'b2dc8ba327a582799c803934c965ea7f903c4e8e':
Fix a typo in comment.
2014-09-16 09:11:58 +00:00
Chet Haase
3ec7a4c8a6
am bb8d6776: am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev
...
* commit 'bb8d67768806662f59bb14b918134c547434ac86':
Avoid invalidating view during some outline invalidations
2014-09-16 09:11:22 +00:00
Edward Jee
cbf76135e0
am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
...
* commit '8a20c56fe0011b8a5ba11e39e734679f89be3f3d':
Adds APIs for Bluetooth PBAP and MAP access permission.
2014-09-16 08:59:40 +00:00
Igor Murashkin
4280c893bf
am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev
...
* commit 'da839237d71b97dcd789e54031497da39361698a':
camera2-legacy: Fix jpeg thumbnail quality not being set
2014-09-16 08:59:34 +00:00
Eino-Ville Talvala
810d34a4a1
am c142ac27: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev
...
* commit 'c142ac272ab02d85edf07ad7da79006c33c3b613':
Camera2: Check for sequence complete sooner.
2014-09-16 08:59:24 +00:00
Alan Viverette
1454fe9553
am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev
...
* commit '56fbc5751bd2da6227c03372f3d90ab4c7333f22':
Always apply ImageView's tint attribute using SRC_ATOP by default
2014-09-16 08:59:18 +00:00
Yohei Yukawa
abe0c395f9
am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev
...
* commit '5a2efd42d8d0b1c52f628b8e727d3c99b068ae96':
Minimize the number of default enabled IMEs part 3
2014-09-16 08:59:08 +00:00
Ang Li
e2291d9763
am 94325a15: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev
...
* commit '94325a15c53e252b10c75e4c197858d028f4a37b':
Fix a typo in comment.
2014-09-16 08:59:03 +00:00
Chet Haase
ab387230be
am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev
...
* commit 'bae5621a7d9a60e16ff1ac7b3a5c4be06dec2305':
Avoid invalidating view during some outline invalidations
2014-09-16 08:58:30 +00:00
Jeff Sharkey
691ac9e7d0
am a6a5bea4: am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev
...
* commit 'a6a5bea41779c3f0764a2c0f18f1251649ddd1ee':
Update API naming to follow style guide.
2014-09-16 08:57:52 +00:00
Chris Craik
9ec684467a
am d0ca31dc: am 103a3379: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev
...
* commit 'd0ca31dc14351662eaf4106b9bbec9a4bf75fafa':
Enable shadow for GhostView
2014-09-16 08:57:37 +00:00
Ihab Awad
02e2375c44
am 64741972: am fd9884ad: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev
...
* commit '647419725bdddb764bfc6ae638ac0288bc8591e5':
Add system feature for ConnectionService API support (1/3)
2014-09-16 08:57:27 +00:00
George Mount
409e9a32c0
am b3a4720f: am aa386270: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
...
* commit 'b3a4720f3411ac14002d6d8b69fc15d4188829fb':
Fixed OOM due to visibility transitions.
2014-09-16 08:40:49 +00:00
George Mount
ded715cd78
am 5846345b: am 9588dada: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
...
* commit '5846345b2a97a1441c37902539f7ceadc80f8fbc':
Fixed enter/exit transitions working against shared elements.
2014-09-16 08:40:44 +00:00
Eino-Ville Talvala
197244c414
am d9d6b219: am 194e9509: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev
...
* commit 'd9d6b219d6bc1fddd4d0871dc765d670d6e8b817':
Camera2: Clean up corner case error handling
2014-09-16 08:40:38 +00:00
Andres Morales
76d2e35f57
am f26f125a: am e887d0a5: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev
...
* commit 'f26f125a5240bea2f3aa7daaea490d53daaefcc8':
Add hidden API for pausing and resuming NFC polling.
2014-09-16 08:40:14 +00:00
Jeff Sharkey
ec20c174db
am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev
...
* commit '07b76d6fed3bf3ba4a61226b9dd1484e69e084ac':
Update API naming to follow style guide.
2014-09-16 08:39:37 +00:00
Chris Craik
23034c9328
am 103a3379: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev
...
* commit '103a33792460a4e16b4f3a2a57a315a19a3a719e':
Enable shadow for GhostView
2014-09-16 08:39:24 +00:00
Ihab Awad
6de325caa0
am fd9884ad: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev
...
* commit 'fd9884adc315137dca6a49777d7767d258fdc862':
Add system feature for ConnectionService API support (1/3)
2014-09-16 08:39:13 +00:00
Edward Jee
1bbfcc2fdc
Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
2014-09-16 01:19:19 +00:00
Igor Murashkin
4e5eddff5e
Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev
2014-09-16 00:58:24 +00:00
Igor Murashkin
89bb63f395
camera2-legacy: Fix jpeg thumbnail quality not being set
...
Bug: 17472049
Change-Id: I6ce9f2bb07def86bc58b4b2495c58ee6762a65e1
2014-09-15 17:54:09 -07:00
Eino-Ville Talvala
d701bfb615
Merge "Camera2: Check for sequence complete sooner." into lmp-dev
2014-09-16 00:47:29 +00:00
Alan Viverette
7413501b9c
Merge "Always apply ImageView's tint attribute using SRC_ATOP by default" into lmp-dev
2014-09-16 00:40:36 +00:00
Yohei Yukawa
84f20ec49d
Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev
2014-09-16 00:19:55 +00:00
Ang Li
85be272268
Merge "Fix a typo in comment." into lmp-dev
2014-09-16 00:00:37 +00:00
Eino-Ville Talvala
848fe733f3
Camera2: Check for sequence complete sooner.
...
It's possible, especially with legacy mode, for a last frame for a
sequence to have already arrived when a repeating sequence is stopped.
In that case, need to check for sequence complete as soon as the
requestId, framenumber pair is added to the pending queue of completions.
Bug: 17428716
Change-Id: Ie5c6ea5a43639c812b8441da326c6303e150fce0
2014-09-15 16:28:02 -07:00
Alan Viverette
38f93bcb21
Always apply ImageView's tint attribute using SRC_ATOP by default
...
Preserves pre-L behavior and avoids requiring developers to manually
set the tintMode to SRC_ATOP when targeting SDK 21+.
BUG: 17507827
Change-Id: I43f86cbcb9662172254f46700441ca85a54428f6
2014-09-15 16:25:09 -07:00
Chet Haase
18c56d0ac4
Merge "Avoid invalidating view during some outline invalidations" into lmp-dev
2014-09-15 22:40:04 +00:00
Chet Haase
27652eff44
Avoid invalidating view during some outline invalidations
...
We were invalidating the view during outline invalidation far
too often. Sometimes, it's appropriate to invalidate the view when
the outline changes, but not when the outline is being invalidated
in the middle of drawing the view, which is done in reaction to a view
invalidation.
Issue #17460940 Volantis: panning in Calendar from month to month is only at 30fps
Change-Id: I7bdee17dc9c7df89d4cd3d781010823cef931222
2014-09-15 15:33:10 -07:00
Ang Li
953b5625d5
Fix a typo in comment.
...
Change-Id: I23224b1adf946ebec0ec7a39686913189c9b8287
2014-09-15 15:09:16 -07:00
George Mount
2716ff8fa7
am aa386270: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
...
* commit 'aa386270cf60bb57dfcad5f0b5cded9d4a87b978':
Fixed OOM due to visibility transitions.
2014-09-15 22:04:49 +00:00
George Mount
6521ebcfdb
am 9588dada: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
...
* commit '9588dada867027b3938ba99b0cacfda7f784c2b7':
Fixed enter/exit transitions working against shared elements.
2014-09-15 22:04:36 +00:00
Eino-Ville Talvala
c27591b8eb
am 194e9509: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev
...
* commit '194e950920fd5ef1188d3b55fbbecf54b2dc26a1':
Camera2: Clean up corner case error handling
2014-09-15 22:04:30 +00:00
Andres Morales
43a4762e88
am e887d0a5: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev
...
* commit 'e887d0a59e3e0e28ffdbb7d584fbca67c9c350b9':
Add hidden API for pausing and resuming NFC polling.
2014-09-15 22:04:05 +00:00
Jeff Sharkey
49c0e7375b
Merge "Update API naming to follow style guide." into lmp-dev
2014-09-15 21:51:18 +00:00
Chris Craik
7436d1997c
Merge "Enable shadow for GhostView" into lmp-dev
2014-09-15 21:32:06 +00:00
Jeff Sharkey
de74231f24
Update API naming to follow style guide.
...
Bug: 17510755
Change-Id: If73d81b416355559592feb895a62132194f4ba62
2014-09-15 14:17:46 -07:00
Paul Miller
3ff073ad0a
Disallow passing a StringBufferInputStream to a WebResourceResponse
...
BUG:17489928
Change-Id: Ie41671ad721c0c4da95d96332c4ec4d4ca2bff7c
2014-09-15 20:18:50 +00:00
Ihab Awad
de4e52aa49
Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev
2014-09-15 20:14:51 +00:00
George Mount
cd8b84fc25
am f006bac7: am e0b9e2f1: am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev
...
* commit 'f006bac76dcbaf91652cbb9e118ddc48bc179766':
Fix exit transitions hiding views permanently.
2014-09-15 19:33:32 +00:00
George Mount
08ff5c14fe
Merge "Fixed OOM due to visibility transitions." into lmp-dev
2014-09-15 18:12:24 +00:00
George Mount
94e7e7ef91
Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
2014-09-15 18:12:13 +00:00
Eino-Ville Talvala
5fa15be4e9
Merge "Camera2: Clean up corner case error handling" into lmp-dev
2014-09-15 18:11:11 +00:00
George Mount
27bc8aa583
Fixed enter/exit transitions working against shared elements.
...
Bug 17499971
The enter and exit transitions were targeting the shared element.
This means you'd get double transitions on the shared element.
Also, the enter transition was not properly initialized to have
an invalid target so it was targeting all views.
Change-Id: I4f3510c70bea90f09be01776bc0ad1ffb42d99d5
2014-09-15 11:08:39 -07:00