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

85622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
ad8f410e69 am 0dfe1cf3: Merge into jb-mr1-dev 
* commit '0dfe1cf3cda5accef0a3c361593ccc716e725539':
  Fix dialogs on secondary displays.
 2012-09-25 12:48:04 -07:00
Jean-Baptiste Queru
c7f62587af am 07e35aa8: Merge into jb-mr1-dev 
* commit '07e35aa80bff6ca83ba9b62797ab8f27b4fdbfa5':
  Test FS getElementAt
 2012-09-25 12:48:00 -07:00
Jean-Baptiste Queru
74b11cbff0 am 7951c459: Merge into jb-mr1-dev 
* commit '7951c459aefeb012638477b762e19b792ecbe009':
  AppInfo from Notifications for secondary users
 2012-09-25 12:47:49 -07:00
Jean-Baptiste Queru
b7e4bbbed6 am a5e1d21f: Merge into jb-mr1-dev 
* commit 'a5e1d21f566c8df750d766c76f6a99432a703c5e':
  Move multi-user OBB under user-specific path.
 2012-09-25 12:47:37 -07:00
Jean-Baptiste Queru
507cb6e231 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:47:27 -07:00
Jean-Baptiste Queru
185c3a700d am 7a7c6aa0: Merge into jb-mr1-dev 
* commit '7a7c6aa0c35d80145e163d9e637180d3be127441':
  Force activities to run on the second display for testing.
 2012-09-25 12:47:17 -07:00
Jean-Baptiste Queru
b2a4bb5fbf am 641c36f9: Merge into jb-mr1-dev 
* commit '641c36f918aa549c192aff129dcb01aa3e558a6b':
  Add test for copy kernels.
 2012-09-25 12:47:11 -07:00
Romain Guy
2fde19b86c am e83221c5: Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476 
* commit 'e83221c547cf2038752e5378e72e49a62cfd9954':
  Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
 2012-09-25 12:47:05 -07:00
Martijn Coenen
87f22278c3 am f8538594: Fix build. 
* commit 'f8538594fe6ba6db3310da042597840601d78cda':
  Fix build.
 2012-09-25 12:47:00 -07:00
Jean-Baptiste Queru
3d9e6909fd am 1b242759: Merge into jb-mr1-dev 
* commit '1b242759763205fa529591738cbe213fcc25150e':
  Adding support for new 'uid2445' column in Calendar's Events table.
 2012-09-25 12:46:53 -07:00
Jean-Baptiste Queru
d2e85aa09f am fd5be708: Merge into jb-mr1-dev 
* commit 'fd5be7087be67adc0abc73ded5a0b72b025e2a80':
  pause music playback when switching user.
 2012-09-25 12:46:50 -07:00
Jean-Baptiste Queru
5170ae12c3 am 0de06b7e: Merge into jb-mr1-dev 
* commit '0de06b7e19e4c6329cc966198d249d12c2b19d40':
  TaskStackBuilder and intents without an explicit target
 2012-09-25 12:46:46 -07:00
Jean-Baptiste Queru
908fae38fe am c68accd3: Merge into jb-mr1-dev 
* commit 'c68accd35e9ee0a49172ef144664f0fe9187ccd7':
  Add extra error check when eglCreateContext fails Bug #7216919
 2012-09-25 12:46:43 -07:00
Jean-Baptiste Queru
49a58bce7b am ca940507: Merge into jb-mr1-dev 
* commit 'ca94050705ff1886e622a09c2691a76e92c0f9d8':
  Allow multiple 'parcelable' declarations in aidl files
 2012-09-25 12:46:39 -07:00
Jean-Baptiste Queru
89ee9b26ab am 93fd0f7a: Merge into jb-mr1-dev 
* commit '93fd0f7a83f61d4d673b73e002bd9ad7d6ce562b':
  Camera: Improve enableShutterSound documentation.
 2012-09-25 12:46:35 -07:00
Jean-Baptiste Queru
3142c96e89 am 908a4323: Merge into jb-mr1-dev 
* commit '908a43234aca51af5021249c03030cec6b36417f':
  Add a property to disable libhwui's scissor optimization Bug #7158326
 2012-09-25 12:46:32 -07:00
Jean-Baptiste Queru
df3131e466 am 6fb2514c: Merge into jb-mr1-dev 
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-25 12:46:26 -07:00
Martijn Coenen
8aad9d7923 am 8f862ef9: Add NfcBarcode technology API. 
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
  Add NfcBarcode technology API.
 2012-09-25 12:46:22 -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
Jason Sams
ae760511d8 Test FS getElementAt 
bug 7190126

Change-Id: I1fbaa77af051cf44134f8bfe56339ce5d3b7edbb
 2012-09-24 17:42:14 -07:00
Jeff Brown
3671410b9e Fix dialogs on secondary displays. 
Bug: 7183618
Change-Id: I65b650a0c423f3081c412a7341b7427b6ac85e24
 2012-09-24 17:36:06 -07:00
Jason Sams
85d4955a13 Add test for copy kernels. 
bug 7224526

Change-Id: I76e1e63b6bd53d84df9c60a61e6588b21f33c2e3
 2012-09-24 17:27:59 -07:00
Amith Yamasani
ea7e91514e AppInfo from Notifications for secondary users 
Required wiring up startActivitiesAsUser()

Bug: 7224950

Also fix a bug in navigateUp in secondary user

Change-Id: I114ae2de0457362d62e899fdb94b12239a3eb778
 2012-09-24 17:19:03 -07:00
Romain Guy
4c7dc4aa5c Add extra error check when eglCreateContext fails 
Bug #7216919

Change-Id: I322cbe4579d7a4eb2a64d288175e145d0badc857
 2012-09-24 15:35:33 -07:00
Jeff Brown
8d0243a3d0 Fix surface view on secondary display. 
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
 2012-09-24 15:02:15 -07:00
Michael Jurka
8882dd34ae am 7ae18833: Merge "Fix build" into jb-mr1-dev 
* commit '7ae188335e8c876401ae15ac11c8331e88ae1297':
  Fix build
 2012-09-24 14:59:30 -07:00
Michael Jurka
7ae188335e Merge "Fix build" into jb-mr1-dev 2012-09-24 14:57:15 -07:00
Michael Jurka
0988524683 Fix build 
Change-Id: I476664d9c0116fb4b135d443dd36ee7ebe3c25f4
 2012-09-24 14:42:01 -07:00
Jeff Brown
14a9f2b9d2 Fix drag and drop surfaces on secondary displays. 
Bug: 7183618
Change-Id: I4ef746916aad984640f1eb3b3c71b1e34595aabd
 2012-09-24 14:37:31 -07:00
Jeff Brown
2033763bb1 Allow a window on a secondary display to have focus. 
If any window on the default display has focus, then it
gets focus as usual.  If no window on the default display
has focus, then we consider windows on the secondary display.

In the future we will need more elaborate schemes for
managing focus across multiple displays, but this is enough
for testing purposes now.

Bug: 7183618
Change-Id: I21ddb9904eb9e574e42d28743aeca51f4ffebf64
 2012-09-24 14:37:30 -07:00
Jeff Brown
efd43bdb83 Force activities to run on the second display for testing. 
This is a simple hack for testing and development purposes.
It makes the framework place the main window of an activity
on to a secondary display instead of on the default display.

Set the "debug.second-display.pkg" to a substring of the
package name of the activity that you want to have show
up on the secondary display, such as "com.example.android.apis"

Bug: 7183618
Change-Id: I0a9e7f27c8ff253253b9de57d4bc49f31d95a0e2
 2012-09-24 14:37:25 -07:00
Adam Powell
9ceac5a02f TaskStackBuilder and intents without an explicit target 
When Activity#getParentActivityIntent() returns an Intent without an
explicit target, resolve it in order to determine a correct parent
stack.

Bug 7223318

Change-Id: I3e88129f1e538cc3d932d6b4f735a5bec54bb4ad
 2012-09-24 14:28:44 -07:00
Jason Sams
d0de775bce am 816153b0: Merge "Test image for 2 input tests." into jb-mr1-dev 
* commit '816153b0b2b811544468df167d48421e56c03841':
  Test image for 2 input tests.
 2012-09-24 14:27:10 -07:00