Winson Chung
b783133c37
am f5096562: am 5ec5fa49: Fixing issue with Recents showing blank. (Bug 16987565)
...
* commit 'f50965621d5e7794901629f70345425aac42f728':
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-10 00:50:26 +00:00
Winson Chung
ffe0216be4
am 7b867b10: am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
* commit '7b867b10bf4ba61b4b0792168c4cd290c47372e6':
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
2014-09-10 00:50:21 +00:00
Winson Chung
9e9fddeb75
am bb906f5b: am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
* commit 'bb906f5b0be00d282a488ac8ff461fac546b5f57':
Adding task switching animation xmls for further tweaking. (Bug 16656169)
2014-09-10 00:50:16 +00:00
Winson Chung
768730c7b4
am 6c4240b8: am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
* commit '6c4240b8566098ecd6bc56a3085f99efae26eba2':
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
2014-09-10 00:50:11 +00:00
Jeff Sharkey
2dadfeb306
am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
...
* commit '47bf90808bd42a3fcfd5434ec216a8ba8859f8f0':
Missing manifest error should be NO_CERTIFICATES.
2014-09-10 00:50:06 +00:00
Yin-Chia Yeh
0efe661696
am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
...
* commit '5fc81692af2d249b901a0f7ce4ec6bc5327ff8c2':
camera2: make 3A regions null when not available
2014-09-10 00:49:37 +00:00
Eino-Ville Talvala
2f94ed6cee
am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
...
* commit 'f9e648243298760e96053a90674b30fe00ce3f5c':
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
2014-09-10 00:49:31 +00:00
vandwalle
62609a1146
am 2dd81a13: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev
...
* commit '2dd81a13a6a2f872e9b074f2e2dab6fa390a30fa':
make autojoin associated scan period a config opttion
2014-09-10 00:49:22 +00:00
Svetoslav
87c8260341
am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev
...
* commit 'f1b72b86380b25b933be32c46d4f59a41699a546':
Trim unnecessary pages when printing.
2014-09-10 00:49:17 +00:00
Lajos Molnar
884698e380
am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
...
* commit '4662ef1fcf2b9fe0d9087649beefbf82d2c48fc7':
initialize codec list before MediaCodec.getCodecInfo()
2014-09-10 00:49:02 +00:00
Guang Zhu
5d2792c824
am 7f27443e: am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev
...
* commit '7f27443e5cb4a64570be4da792937662711c3a33':
add some assert messages to download manager test
2014-09-10 00:48:57 +00:00
Winson Chung
a1b68ee2ca
am 5ec5fa49: Fixing issue with Recents showing blank. (Bug 16987565)
...
* commit '5ec5fa491c6cba8a6bb451d0aa121318df927ffd':
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-09 22:54:31 +00:00
Winson Chung
d13d7b533d
am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
* commit 'd7a863be76afb458cb59472ad02d49568ada6e04':
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
2014-09-09 22:54:16 +00:00
Winson Chung
508f0fbd61
am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
* commit '7d631483fc22a2d66f2510c93be8387d6c2bbdca':
Adding task switching animation xmls for further tweaking. (Bug 16656169)
2014-09-09 22:54:11 +00:00
Winson Chung
90ba230114
am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
* commit 'b754940a89eea209763b564325e100f45bd1c0c3':
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
2014-09-09 22:54:07 +00:00
Jeff Sharkey
ece96a8131
am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
...
* commit 'c5d4ebd640a0bca62fb52a42830c8646316ee386':
Missing manifest error should be NO_CERTIFICATES.
2014-09-09 22:54:02 +00:00
Winson Chung
8a8d9611e2
Fixing issue with Recents showing blank. (Bug 16987565)
2014-09-09 22:49:24 +00:00
Winson Chung
e5c06a6431
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
...
Change-Id: Id8f96455f6e11a13a8ac12d341464bca4419d7c5
2014-09-09 22:49:04 +00:00
Winson Chung
3aa9c221c0
Adding task switching animation xmls for further tweaking. (Bug 16656169)
...
Change-Id: I472116cb3d86a3f90a935b2a3ac058ffc2ac1b5d
2014-09-09 22:48:19 +00:00
Winson Chung
7937fdb341
Fixing weird highlight on dismiss button ripple. (Bug 17420495)
...
Change-Id: I769c0647417efeda9b39913c01c62be0d6ff7887
2014-09-09 22:47:43 +00:00
Jeff Sharkey
ad5f44a68c
Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
2014-09-09 22:44:52 +00:00
Yin-Chia Yeh
ec261ead49
am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
...
* commit '916d8fafe6b61b7499cc8d41331adfb11d2136fa':
camera2: make 3A regions null when not available
2014-09-09 22:31:57 +00:00
Eino-Ville Talvala
a8b4bb8c90
am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
...
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
2014-09-09 22:31:52 +00:00
Yin-Chia Yeh
8544c7da86
Merge "camera2: make 3A regions null when not available" into lmp-dev
2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
31913c334a
Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
2014-09-09 22:20:58 +00:00
vandwalle
1853fddaf4
am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev
...
* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
make autojoin associated scan period a config opttion
2014-09-09 22:19:48 +00:00
Svetoslav
08dd15e1f4
am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev
...
* commit '3f49b128bc94c1b1e66decf96d46a83bcdb9a62b':
Trim unnecessary pages when printing.
2014-09-09 22:19:44 +00:00
vandwalle
2bc9f4178a
Merge "make autojoin associated scan period a config opttion" into lmp-dev
2014-09-09 22:12:06 +00:00
Svetoslav
15040e0a58
Merge "Trim unnecessary pages when printing." into lmp-dev
2014-09-09 22:11:20 +00:00
John Spurlock
c2163a2d2f
am b65c57e5: am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
...
* commit 'b65c57e58a49c3f0505e4cb4c8cee7c01663a27d':
QS: Fix tile padding on dual tile first lines.
2014-09-09 22:04:12 +00:00
Alan Viverette
f50212afa4
am df2a84a4: am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev
...
* commit 'df2a84a4781dfaf4fa3d03b8198615d0cc981f87':
Update alert dialog styling to match Material spec
2014-09-09 22:04:08 +00:00
Lajos Molnar
287cf721bc
am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
...
* commit 'adbca3e552abc358326b4245a4fc4b8761e79b7e':
initialize codec list before MediaCodec.getCodecInfo()
2014-09-09 22:01:17 +00:00
Guang Zhu
63e47699b9
am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev
...
* commit 'a3cd75926fd65afee93305ebe88f01c05a27be96':
add some assert messages to download manager test
2014-09-09 22:01:07 +00:00
Jeff Sharkey
bc09755e19
Missing manifest error should be NO_CERTIFICATES.
...
When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING. Also remove redundant layer of
debugging details when wrapping exceptions.
Bug: 15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
2014-09-09 14:57:26 -07:00
Philip Milne
83032a0211
am 4a4bf80a: am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes
...
* commit '4a4bf80a3ce90f4d4d4a925b1a4130dbc28130db':
Fix for b/16400888 - API Review: GridLayout attributes
2014-09-09 21:57:10 +00:00
John Spurlock
506b2e3559
am 9d44371d: am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev
...
* commit '9d44371d4ccb8d4c2c511b21a8d736c1d3600383':
On db upgrade, reset ringer mode to normal.
2014-09-09 21:57:06 +00:00
Jean-Michel Trivi
10b9bb6aab
am 99fa36d5: am 013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev
...
* commit '99fa36d5a29f006f5be397380a590ff4c7ff4d27':
Prevent NotificationManagerService from using bad stream type
2014-09-09 21:56:47 +00:00
John Spurlock
975830376a
am cf44d281: am cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
...
* commit 'cf44d2815b243d5064cecd9778135e7d85484003':
Zen: Map transition to ringer-mode silent to "priority".
2014-09-09 21:56:21 +00:00
Amith Yamasani
1f4ea68a07
am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
...
* commit 'd94df395a87836b5dba6bd159010046e1d016661':
User restriction to disallow outgoing NFC beam
2014-09-09 21:56:09 +00:00
Jeff Sharkey
30d40e707b
am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev
...
* commit 'a5746ce305bc331c4cb6a5bd1fa152c17813e0f8':
Use sscanf() for parsing tag values.
2014-09-09 21:56:04 +00:00
John Spurlock
ec034796ab
am 1d182090: am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev
...
* commit '1d1820902aab92865bd8ddebb1ddf55f4998051f':
Doze: Wake up on touch, fade between states.
2014-09-09 21:56:00 +00:00
Chris Craik
e938707a64
am 78558652: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev
...
* commit '785586526d97aab356acbcb4d8b4a79904ff3424':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
2014-09-09 21:55:44 +00:00
Lajos Molnar
bc67eee710
Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
2014-09-09 21:55:43 +00:00
Riley Andrews
4ef0f50c29
am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev
...
* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
Use surfaceflinger for recents thumbnail rotations.
2014-09-09 21:55:38 +00:00
Alan Viverette
d381834c77
am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev
...
* commit 'aafd303e48e95fda8b2b5bd9e3541e87997d6ef4':
Use correct row/column order in list and grid CollectionItems
2014-09-09 21:55:33 +00:00
Guang Zhu
3ab7bf1a3d
Merge "add some assert messages to download manager test" into lmp-dev
2014-09-09 21:51:17 +00:00
John Spurlock
b06cd76a69
am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
...
* commit '7fa275831652f2fcaf6df2d10264f2c9b8ae0346':
QS: Fix tile padding on dual tile first lines.
2014-09-09 21:49:52 +00:00
Alan Viverette
9597427fe9
am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev
...
* commit 'ba2ce6fa080df627646501f58bab5fde76b0f2c2':
Update alert dialog styling to match Material spec
2014-09-09 21:49:47 +00:00
John Spurlock
8143d2fbfd
Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
2014-09-09 21:47:53 +00:00
Guang Zhu
30478148bd
add some assert messages to download manager test
...
Change-Id: If2e1bdd115eddeeb7bdebf0fab29a3756fee4ceb
2014-09-09 14:44:17 -07:00