Jean-Baptiste Queru
26a6040e85
am 7951c459: Merge into jb-mr1-dev
...
* commit '7951c459aefeb012638477b762e19b792ecbe009':
AppInfo from Notifications for secondary users
2012-09-25 12:29:39 -07:00
Jean-Baptiste Queru
ef66c6fc99
am a5e1d21f: Merge into jb-mr1-dev
...
* commit 'a5e1d21f566c8df750d766c76f6a99432a703c5e':
Move multi-user OBB under user-specific path.
2012-09-25 12:29:36 -07:00
Jean-Baptiste Queru
51a052087f
am ec199613: Merge into jb-mr1-dev
...
* commit 'ec1996131d2e17408a22fd55fbc3edba5ea80d02':
Fix surface view on secondary display.
Fix drag and drop surfaces on secondary displays.
Allow a window on a secondary display to have focus.
2012-09-25 12:29:32 -07:00
Jean-Baptiste Queru
a3e104c634
am 7a7c6aa0: Merge into jb-mr1-dev
...
* commit '7a7c6aa0c35d80145e163d9e637180d3be127441':
Force activities to run on the second display for testing.
2012-09-25 12:29:29 -07:00
Jean-Baptiste Queru
b0938497c4
am 641c36f9: Merge into jb-mr1-dev
...
* commit '641c36f918aa549c192aff129dcb01aa3e558a6b':
Add test for copy kernels.
2012-09-25 12:29:26 -07:00
Romain Guy
a5bbe35d12
am e83221c5: Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
...
* commit 'e83221c547cf2038752e5378e72e49a62cfd9954':
Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
2012-09-25 12:29:22 -07:00
Martijn Coenen
882aa5a7b9
am f8538594: Fix build.
...
* commit 'f8538594fe6ba6db3310da042597840601d78cda':
Fix build.
2012-09-25 12:29:18 -07:00
Jean-Baptiste Queru
66c04617c8
am 1b242759: Merge into jb-mr1-dev
...
* commit '1b242759763205fa529591738cbe213fcc25150e':
Adding support for new 'uid2445' column in Calendar's Events table.
2012-09-25 12:29:15 -07:00
Jean-Baptiste Queru
068bdbfdb1
am fd5be708: Merge into jb-mr1-dev
...
* commit 'fd5be7087be67adc0abc73ded5a0b72b025e2a80':
pause music playback when switching user.
2012-09-25 12:29:11 -07:00
Jean-Baptiste Queru
61b38718f0
am 0de06b7e: Merge into jb-mr1-dev
...
* commit '0de06b7e19e4c6329cc966198d249d12c2b19d40':
TaskStackBuilder and intents without an explicit target
2012-09-25 12:29:08 -07:00
Jean-Baptiste Queru
ad1712ff08
am c68accd3: Merge into jb-mr1-dev
...
* commit 'c68accd35e9ee0a49172ef144664f0fe9187ccd7':
Add extra error check when eglCreateContext fails Bug #7216919
2012-09-25 12:29:04 -07:00
Jean-Baptiste Queru
9d9859daff
am ca940507: Merge into jb-mr1-dev
...
* commit 'ca94050705ff1886e622a09c2691a76e92c0f9d8':
Allow multiple 'parcelable' declarations in aidl files
2012-09-25 12:29:00 -07:00
Jean-Baptiste Queru
0154e11d2c
am 93fd0f7a: Merge into jb-mr1-dev
...
* commit '93fd0f7a83f61d4d673b73e002bd9ad7d6ce562b':
Camera: Improve enableShutterSound documentation.
2012-09-25 12:28:56 -07:00
Jean-Baptiste Queru
4d35fd9b1c
am 908a4323: Merge into jb-mr1-dev
...
* commit '908a43234aca51af5021249c03030cec6b36417f':
Add a property to disable libhwui's scissor optimization Bug #7158326
2012-09-25 12:28:52 -07:00
Jean-Baptiste Queru
8c9ee36dc8
am 6fb2514c: Merge into jb-mr1-dev
...
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
Fix issue #7215984 : java.lang.RuntimeException: Unable to create...
2012-09-25 12:28:48 -07:00
Martijn Coenen
2b6685b88c
am 8f862ef9: Add NfcBarcode technology API.
...
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
Add NfcBarcode technology API.
2012-09-25 12:28:44 -07:00
Jean-Baptiste Queru
3b772c6b67
Merge into jb-mr1-dev
...
Change-Id: Idc74e8e0f3cea76b995f4262428006949708ce32
2012-09-25 09:46:54 -07:00
Jean-Baptiste Queru
5ef9cb68c3
Merge into jb-mr1-dev
...
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
2012-09-25 09:46:23 -07:00
Jean-Baptiste Queru
b8d4c9ff22
Merge into jb-mr1-dev
...
Change-Id: Iaee05ce2bc5103c46fe9a148ad166f694c246c2f
2012-09-25 09:45:48 -07:00
Jean-Baptiste Queru
7e886bc3f7
Merge into jb-mr1-dev
...
Change-Id: I2e1eee6976ef4682c9f8daffed699ee4c59060c3
2012-09-25 09:45:19 -07:00
Romain Guy
03de511af7
Fix graphics glitch and layouts in recents on 10" display
...
Change-Id: I7fa58a84d4e899ea995aa680ee550b5ddb30b6a6
2012-09-25 09:44:46 -07:00
Romain Guy
ed1b6f4fc0
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
...
Bug #7216919
Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
2012-09-25 09:44:35 -07:00
Jean-Baptiste Queru
a7546e3623
Merge into jb-mr1-dev - do not merge
...
Change-Id: I3582e3a68c6c38569884e9a903b5230bf890e7fa
2012-09-25 09:43:59 -07:00
Romain Guy
c002936e4b
Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
...
Bug #7216919
Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
2012-09-25 09:43:23 -07:00
Jean-Baptiste Queru
bf2e088b00
Merge into jb-mr1-dev
...
Change-Id: Iba23d16643b8754f6e0a7288b2ca242f722f1bdd
2012-09-25 09:42:57 -07:00
Jean-Baptiste Queru
164ff6bb64
Merge into jb-mr1-dev
...
Change-Id: I65f9c552cf0ef2792df64c907f0a56913e6c6f30
2012-09-25 09:42:30 -07:00
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
