drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,975 Commits 1 Branch 0 Tags
Commit Graph

87975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
c2235427f1 am a907a1f4: am 07e35aa8: Merge into jb-mr1-dev 
* commit 'a907a1f4e2012ffdef31cc11eaba5e61320b904a':
 2012-09-25 13:23:33 -07:00
Jean-Baptiste Queru
90bd345244 am 26a6040e: am 7951c459: Merge into jb-mr1-dev 
* commit '26a6040e85f2e596eca2d9cfb728e0209fac2967':
 2012-09-25 13:23:29 -07:00
Jean-Baptiste Queru
e55bdfdfa2 am ef66c6fc: am a5e1d21f: Merge into jb-mr1-dev 
* commit 'ef66c6fc99f1d5ce2437a82e20cabbc51d01df31':
 2012-09-25 13:23:26 -07:00
Jean-Baptiste Queru
d6ae728832 am 51a05208: am ec199613: Merge into jb-mr1-dev 
* commit '51a052087fb6a5abb9874f2538f5bc782c15e94d':
 2012-09-25 13:23:21 -07:00
Jean-Baptiste Queru
c261aaff43 am a3e104c6: am 7a7c6aa0: Merge into jb-mr1-dev 
* commit 'a3e104c634c2df4f9b8d866b6051cb93a8d8787f':
 2012-09-25 13:23:17 -07:00
Jean-Baptiste Queru
c48cf712f1 am b0938497: am 641c36f9: Merge into jb-mr1-dev 
* commit 'b0938497c48f74919261b8adce21371469bf1e87':
 2012-09-25 13:23:12 -07:00
Romain Guy
041ca7a070 am a5bbe35d: am e83221c5: Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476 
* commit 'a5bbe35d125677b016b1724bb22c49cc103ca657':
  Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
 2012-09-25 13:23:07 -07:00
Martijn Coenen
ad948f4621 am 882aa5a7: am f8538594: Fix build. 
* commit '882aa5a7b9204ab7319feecee03be0bf82694019':
  Fix build.
 2012-09-25 13:23:02 -07:00
Jean-Baptiste Queru
4e3e1f12d9 am 66c04617: am 1b242759: Merge into jb-mr1-dev 
* commit '66c04617c8c4abad4c94d1d2d938a21673338158':
 2012-09-25 13:22:58 -07:00
Jean-Baptiste Queru
e5b70b73e3 am 068bdbfd: am fd5be708: Merge into jb-mr1-dev 
* commit '068bdbfdb1ae8c13ebe36eae5e9adb989aaf7eda':
 2012-09-25 13:22:54 -07:00
Jean-Baptiste Queru
335142dc5f am 61b38718: am 0de06b7e: Merge into jb-mr1-dev 
* commit '61b38718f0a42fd3edc0125296345d508b6c7d82':
 2012-09-25 13:22:50 -07:00
Jean-Baptiste Queru
f4cdb448c4 am ad1712ff: am c68accd3: Merge into jb-mr1-dev 
* commit 'ad1712ff08bfb88ef5407fbceb4fb0eec9fbb8ed':
 2012-09-25 13:22:47 -07:00
Jean-Baptiste Queru
aa10bfc29e am 9d9859da: am ca940507: Merge into jb-mr1-dev 
* commit '9d9859daffaf617fba6b940dbc1a675317032c24':
 2012-09-25 13:22:42 -07:00
Jean-Baptiste Queru
cd86a369e8 am 0154e11d: am 93fd0f7a: Merge into jb-mr1-dev 
* commit '0154e11d2c5ce4b74f74907aead5524a08dc3ca8':
 2012-09-25 13:22:38 -07:00
Jean-Baptiste Queru
8e85eb7fa9 am 4d35fd9b: am 908a4323: Merge into jb-mr1-dev 
* commit '4d35fd9b1ccf0499ecb89bc422dd70ec1e549d52':
 2012-09-25 13:22:35 -07:00
Jean-Baptiste Queru
6d5c992436 am 8c9ee36d: am 6fb2514c: Merge into jb-mr1-dev 
* commit '8c9ee36dc822d3c17b095dec196b089472a68f6d':
 2012-09-25 13:22:31 -07:00
Martijn Coenen
d36716da67 am 2b6685b8: (-s ours) am 8f862ef9: Add NfcBarcode technology API. 
* commit '2b6685b88cec2e9750cbc69ff021af6598989cf5':
  Add NfcBarcode technology API.
 2012-09-25 13:22:23 -07:00
Jean-Baptiste Queru
a907a1f4e2 am 07e35aa8: Merge into jb-mr1-dev 
* commit '07e35aa80bff6ca83ba9b62797ab8f27b4fdbfa5':
  Test FS getElementAt
 2012-09-25 12:29:43 -07:00
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
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