Jean-Baptiste Queru
fe3632bcbe
Merge into jb-mr1-dev
...
Change-Id: Ib0523ded92e2fe4be6a32d092baa55b527229c07
2012-09-25 09:42:01 -07:00
Jean-Baptiste Queru
56d8cc1031
Merge into jb-mr1-dev
...
Change-Id: I6504b000be7e3b6e770af99c5a922fd1e9ec73de
2012-09-25 09:41:25 -07:00
Jean-Baptiste Queru
ecfc9ca5f5
Merge into jb-mr1-dev
...
Change-Id: Ia9c5e2295fe61ae0f5275d3ddfd056d9778b66d1
2012-09-25 09:40:41 -07:00
Jean-Baptiste Queru
d336460089
Merge into jb-mr1-dev
...
Change-Id: Idf183be6a41ff37add5141a20e96d5190396d1a4
2012-09-25 09:40:08 -07:00
Amith Yamasani
95293865bd
Fix build
...
Merge error...
Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
2012-09-25 09:39:36 -07:00
Jean-Baptiste Queru
0dfe1cf3cd
Merge into jb-mr1-dev
...
Change-Id: Id8bbccaa542bef3351958fb6749370880a1921f3
2012-09-25 09:37:51 -07:00
Jean-Baptiste Queru
07e35aa80b
Merge into jb-mr1-dev
...
Change-Id: Ic72c475635a0eb57a77d3bd621a219001af8baa5
2012-09-25 09:37:11 -07:00
Jean-Baptiste Queru
7951c459ae
Merge into jb-mr1-dev
...
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
2012-09-25 09:36:32 -07:00
Jean-Baptiste Queru
a5e1d21f56
Merge into jb-mr1-dev
...
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
2012-09-25 09:35:53 -07:00
Jean-Baptiste Queru
ec1996131d
Merge into jb-mr1-dev
...
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
2012-09-25 09:35:19 -07:00
Jean-Baptiste Queru
7a7c6aa0c3
Merge into jb-mr1-dev
...
Change-Id: I821410e9ffcc7148139465c04ef335f0becc18c2
2012-09-25 09:34:45 -07:00
Jean-Baptiste Queru
641c36f918
Merge into jb-mr1-dev
...
Change-Id: Iec56e4962bbc78309b20595352cce986fe62f68e
2012-09-25 09:34:07 -07:00
Romain Guy
e83221c547
Fix alpha channel computation with ColorMatrixColorFilter
...
Bug #7222476
There were two issues:
- Blending was ignored with color filters
- The addition vector of a color filter was treated as integer values
instead of float values
Change-Id: Id94065704a30ee8aaaa5724a9f3a3cff7c50ced7
2012-09-25 09:33:22 -07:00
Martijn Coenen
f8538594fe
Fix build.
...
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
2012-09-25 09:31:50 -07:00
Jean-Baptiste Queru
1b24275976
Merge into jb-mr1-dev
...
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
fd5be7087b
Merge into jb-mr1-dev
...
Change-Id: Ic10d3201218c7045e03e563996ac04239c75b52c
2012-09-25 09:29:56 -07:00
Jean-Baptiste Queru
0de06b7e19
Merge into jb-mr1-dev
...
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
2012-09-25 09:29:18 -07:00
Jean-Baptiste Queru
c68accd35e
Merge into jb-mr1-dev
...
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
2012-09-25 09:28:32 -07:00
Jean-Baptiste Queru
ca94050705
Merge into jb-mr1-dev
...
Change-Id: I5a9970a011de789aaeb1c4c4ed58ae750071b135
2012-09-25 09:27:45 -07:00
Jean-Baptiste Queru
93fd0f7a83
Merge into jb-mr1-dev
...
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
2012-09-25 09:27:02 -07:00
Jean-Baptiste Queru
908a43234a
Merge into jb-mr1-dev
...
Change-Id: I7b777c7a4818d699582419d2eb4fc1f5cc0f4f46
2012-09-25 09:26:09 -07:00
Jean-Baptiste Queru
6fb2514cdf
Merge into jb-mr1-dev
...
Change-Id: I1baab28b12364213673ed7992207ad198491f286
2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7
Add NfcBarcode technology API.
...
Supporting only Kovio barcode technology for now.
Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
2012-09-25 09:22:16 -07:00
Chris Wren
b4bcef2430
am 76ceb290: am 7b8fbe42: Merge "reduce notification pad on large displays." into jb-mr1-dev
...
* commit '76ceb2900f94c41c9dbb69e4dfb9efa2cfd572a2':
reduce notification pad on large displays.
2012-09-25 08:17:58 -07:00
Chris Wren
76ceb2900f
am 7b8fbe42: Merge "reduce notification pad on large displays." into jb-mr1-dev
...
* commit '7b8fbe42aabc6838c964a3a3694cba4cdd49e937':
reduce notification pad on large displays.
2012-09-25 08:15:23 -07:00
Chris Wren
7b8fbe42aa
Merge "reduce notification pad on large displays." into jb-mr1-dev
2012-09-25 08:12:33 -07:00
Kristian Monsen
7f37a5028f
am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev
...
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
Hiding a method for JB-MR1
2012-09-25 07:32:36 -07:00
Kristian Monsen
20d2bcf899
am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev
...
* commit '7ae8a60f354d7cbb56da898db5a00f3b9fa7154c':
Hiding a method for JB-MR1
2012-09-25 07:31:19 -07:00
Kristian Monsen
7ae8a60f35
Merge "Hiding a method for JB-MR1" into jb-mr1-dev
2012-09-25 07:29:13 -07:00
Daniel Sandler
f2efc74866
am 7f8ed064: am c972757d: Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev
...
* commit '7f8ed0647176ab8aa47b0729f8919b3ba59f4783':
No more double-swiping to toggle panels on tablets.
2012-09-25 07:26:24 -07:00
Daniel Sandler
7f8ed06471
am c972757d: Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev
...
* commit 'c972757de0d21c779f304ee06ce6f6ff735bd62a':
No more double-swiping to toggle panels on tablets.
2012-09-25 07:24:00 -07:00
Daniel Sandler
887dcdcc6d
am 2e17743b: am 6b183e92: Merge "Return carrier label to notification panel." into jb-mr1-dev
...
* commit '2e17743b527db355eb5d6d9365a9b981b1daf834':
Return carrier label to notification panel.
2012-09-25 07:23:20 -07:00
Daniel Sandler
2e17743b52
am 6b183e92: Merge "Return carrier label to notification panel." into jb-mr1-dev
...
* commit '6b183e92a480e93a7d25180bd64b1c3e87b8e982':
Return carrier label to notification panel.
2012-09-25 07:20:50 -07:00
Daniel Sandler
c972757de0
Merge "No more double-swiping to toggle panels on tablets." into jb-mr1-dev
2012-09-25 07:20:32 -07:00
Daniel Sandler
5a8aefa6c8
No more double-swiping to toggle panels on tablets.
...
This also fixes up the drag regions so that quick settings
is only assigned the right 1/3 of the display (or 100dp,
whichever is larger). It had been that more than half of the
status bar, when dragged, would pull down QS.
Bug: 7217002
Change-Id: I515b6e19deab305b99784c7287d8f04fa9b22dc7
2012-09-25 10:20:00 -04:00
Daniel Sandler
6b183e92a4
Merge "Return carrier label to notification panel." into jb-mr1-dev
2012-09-25 07:15:20 -07:00
Baligh Uddin
1ae5a48d93
Merge "Import translations. DO NOT MERGE"
2012-09-25 07:12:29 -07:00
Ben Murdoch
06a1c6fe1c
Merge "Expose resources needed by Chromium-WebView."
2012-09-25 02:31:09 -07:00
Daniel Sandler
666d47502b
Return carrier label to notification panel.
...
If it makes you feel any better, it was there all along...
Bug: 7027535
Change-Id: Ib1add55f1bfe1958e15fa6a2960a821ccfb9d949
2012-09-25 01:21:06 -04:00
Romain Guy
c237882a17
am 9a9bc9bf: am 927978a4: Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev
...
* commit '9a9bc9bfd8da8caecee7f0f129a9debfd69a4515':
Fix graphics glitch and layouts in recents on 10" display
2012-09-24 21:58:39 -07:00
Romain Guy
9a9bc9bfd8
am 927978a4: Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev
...
* commit '927978a48f2577efc92bae4ea605eef718162517':
Fix graphics glitch and layouts in recents on 10" display
2012-09-24 21:56:53 -07:00
Romain Guy
927978a48f
Merge "Fix graphics glitch and layouts in recents on 10" display" into jb-mr1-dev
2012-09-24 21:53:58 -07:00
Romain Guy
0c3df4308d
am d38bc618: am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 " into jb-mr1-dev
...
* commit 'd38bc618bc0e55e52f0575f51f145dcfec1c983b':
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
2012-09-24 21:49:42 -07:00
Romain Guy
d38bc618bc
am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 " into jb-mr1-dev
...
* commit 'eea774a1f65c91db1caa12a32e554813f4aef434':
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
2012-09-24 21:47:52 -07:00
Romain Guy
eea774a1f6
Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 " into jb-mr1-dev
2012-09-24 21:45:13 -07:00
Romain Guy
0709b06abc
Fix graphics glitch and layouts in recents on 10" display
...
Change-Id: I7fa58a84d4e899ea995aa680ee550b5ddb30b6a6
2012-09-24 21:45:03 -07:00
Romain Guy
bf3e77d46d
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
...
Bug #7216919
Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
2012-09-24 21:42:18 -07:00
Baligh Uddin
3a070f7e8d
am 61f2c43e: (-s ours) am 7ccd703f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '61f2c43e42bf60360ef4157f5e95aed9b9498ee8':
Import translations. DO NOT MERGE
2012-09-24 21:31:13 -07:00
Baligh Uddin
61f2c43e42
am 7ccd703f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7ccd703f02e2c7bedeac776178427580700e6584':
Import translations. DO NOT MERGE
2012-09-24 21:28:31 -07:00
Baligh Uddin
7ccd703f02
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-24 21:26:10 -07:00
