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

88023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Muramatsu
7cf3bbc4c0 Merge "Use global wifi_sleep_policy constants" into jb-mr1-dev 2012-09-24 18:39:19 -07:00
Doug Zongker
d7ae127b1e Merge "fix argument parser for global settings URLs" into jb-mr1-dev 2012-09-24 18:39:19 -07:00
Amith Yamasani
7934f2c6d1 am 49610b08: am 9ed67e83: Merge "Fix build" into jb-mr1-dev 
* commit '49610b0833925a62f067f90012893431f1d06ca4':
  Fix build
 2012-09-24 18:20:51 -07:00
Amith Yamasani
49610b0833 am 9ed67e83: Merge "Fix build" into jb-mr1-dev 
* commit '9ed67e83b290f48eb3ee72608dead3a1a160e3da':
  Fix build
 2012-09-24 18:18:53 -07:00
Amith Yamasani
9ed67e83b2 Merge "Fix build" into jb-mr1-dev 2012-09-24 18:16:44 -07:00
Amith Yamasani
16979eab19 Fix build 
Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
 2012-09-24 18:14:47 -07:00
Jeff Brown
3a80b1c868 am 22b5cb91: am 51f36148: Merge "Fix dialogs on secondary displays." into jb-mr1-dev 
* commit '22b5cb917ec27327147a508dc12d928e75d6c1da':
  Fix dialogs on secondary displays.
 2012-09-24 18:08:26 -07:00
Jeff Brown
22b5cb917e am 51f36148: Merge "Fix dialogs on secondary displays." into jb-mr1-dev 
* commit '51f36148b736be9d567c2ccdaf79376cbc3c5553':
  Fix dialogs on secondary displays.
 2012-09-24 18:06:17 -07:00
Jeff Brown
51f36148b7 Merge "Fix dialogs on secondary displays." into jb-mr1-dev 2012-09-24 18:03:44 -07:00
Jason Sams
4ba0f5759e am ea8bffe8: am 6bd69aec: Merge "Test FS getElementAt" into jb-mr1-dev 
* commit 'ea8bffe83ddd4ddd7d0ca9d652ad6e0d51d3826a':
  Test FS getElementAt
 2012-09-24 17:56:52 -07:00
Jason Sams
ea8bffe83d am 6bd69aec: Merge "Test FS getElementAt" into jb-mr1-dev 
* commit '6bd69aec538413fbf6fd9d25ff0b00049ce9a096':
  Test FS getElementAt
 2012-09-24 17:54:55 -07:00
Jason Sams
6bd69aec53 Merge "Test FS getElementAt" into jb-mr1-dev 2012-09-24 17:52:58 -07:00
Amith Yamasani
a1a41f5249 am ccf6bdd9: am 8d8766bc: Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 
* commit 'ccf6bdd9ba7cc341518b8e87d1d047ab2ebf6894':
  AppInfo from Notifications for secondary users
 2012-09-24 17:51:30 -07:00
Jeff Sharkey
eb758f5b3e am da9b286b: am 7db28b3a: Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 
* commit 'da9b286bff9b64e68608b1e526c18d731cb644d1':
  Move multi-user OBB under user-specific path.
 2012-09-24 17:51:23 -07:00
Jeff Brown
2fd18b4d23 am 31bf90a2: am c5a2b1a6: Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* commit '31bf90a2e920065c648e8ea801d6a42e1f6ce4c9':
  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-24 17:51:19 -07:00
Jeff Brown
c89644cb41 am c765f3b5: am 3f24678f: Merge "Force activities to run on the second display for testing." into jb-mr1-dev 
* commit 'c765f3b5bb085b1860e0476d8be7d183f9ba44a2':
  Force activities to run on the second display for testing.
 2012-09-24 17:51:15 -07:00
Amith Yamasani
ccf6bdd9ba am 8d8766bc: Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 
* commit '8d8766bc781f7008bcec385019dc104fc1154987':
  AppInfo from Notifications for secondary users
 2012-09-24 17:46:13 -07:00
Jeff Sharkey
da9b286bff am 7db28b3a: Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 
* commit '7db28b3a4a4b6a690358c8c4d8dc60e6983465df':
  Move multi-user OBB under user-specific path.
 2012-09-24 17:44:23 -07:00
Amith Yamasani
8d8766bc78 Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 2012-09-24 17:43:18 -07:00
Jeff Sharkey
7db28b3a4a Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 2012-09-24 17:42:16 -07:00
Jason Sams
ae760511d8 Test FS getElementAt 
bug 7190126

Change-Id: I1fbaa77af051cf44134f8bfe56339ce5d3b7edbb
 2012-09-24 17:42:14 -07:00
Jeff Brown
31bf90a2e9 am c5a2b1a6: Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* commit 'c5a2b1a6f30e136dedea1224dee442635c767dde':
  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-24 17:41:41 -07:00
Jason Sams
645d3a31fe am 8e55ef65: am c412fb94: Merge "Add test for copy kernels." into jb-mr1-dev 
* commit '8e55ef6552cfeb0905476964ab6a1dfd3ed5b18a':
  Add test for copy kernels.
 2012-09-24 17:40:10 -07:00
Jeff Brown
c765f3b5bb am 3f24678f: Merge "Force activities to run on the second display for testing." into jb-mr1-dev 
* commit '3f24678f238b4ddd6d80040b8882595e0c7ec62e':
  Force activities to run on the second display for testing.
 2012-09-24 17:39:45 -07:00
Jeff Brown
c5a2b1a6f3 Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* changes:
  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-24 17:38:23 -07:00
Jason Sams
8e55ef6552 am c412fb94: Merge "Add test for copy kernels." into jb-mr1-dev 
* commit 'c412fb943c2220d5497e1ba1a80ffb8c0fbd001c':
  Add test for copy kernels.
 2012-09-24 17:37:59 -07:00
Jeff Brown
3f24678f23 Merge "Force activities to run on the second display for testing." into jb-mr1-dev 2012-09-24 17:37:02 -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
c412fb943c Merge "Add test for copy kernels." into jb-mr1-dev 2012-09-24 17:34:52 -07:00
Jason Sams
85d4955a13 Add test for copy kernels. 
bug 7224526

Change-Id: I76e1e63b6bd53d84df9c60a61e6588b21f33c2e3
 2012-09-24 17:27:59 -07:00
Romain Guy
f73b686824 am 6b3c7b3a: am d831ecdd: Merge "Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476" into jb-mr1-dev 
* commit '6b3c7b3a3275768aacf3d0eb20141a006147bd26':
  Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
 2012-09-24 17:22:44 -07:00
Romain Guy
6b3c7b3a32 am d831ecdd: Merge "Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476" into jb-mr1-dev 
* commit 'd831ecdd1e2b01f9da396bc8f2eac77cdd962c1c':
  Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
 2012-09-24 17:20:38 -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
d831ecdd1e Merge "Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476" into jb-mr1-dev 2012-09-24 17:15:02 -07:00
Dianne Hackborn
9abcaa7431 am b41671b9: am e7075904: Merge "Fix build." into jb-mr1-dev 
* commit 'b41671b95a1f66e0a623bf44e733b9487a502c78':
  Fix build.
 2012-09-24 16:53:18 -07:00
Dianne Hackborn
b41671b95a am e7075904: Merge "Fix build." into jb-mr1-dev 
* commit 'e7075904e84699f2de0e204b56486efebab3a9ce':
  Fix build.
 2012-09-24 16:50:41 -07:00
Dianne Hackborn
e7075904e8 Merge "Fix build." into jb-mr1-dev 2012-09-24 16:48:30 -07:00
Martijn Coenen
ca0cf4ee78 Fix build. 
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
 2012-09-24 16:39:19 -07:00
Svetoslav Ganov
187f3f9490 Magnified frame not properly computed when keyguard goes away. 
1. The keyguard force hides some windows when it is shown and as soon
   as the keyguard goes away there windows are made visible. However,
   the window transition that the keyguard is moving away is reported
   before the force hidden windows are shown which makes the screen
   magnifier compute the magnified region with an incomplete list of
   windows of interest.

bug:7215285

Change-Id: I3abc4d97b7a74de8183ad20477dadf66c82da037
 2012-09-24 16:34:26 -07:00
Kristian Monsen
d0b90d30d8 Hiding a method for JB-MR1 
This one got left out in the last round of method hiding.

This got lost in the last round of method hiding.

Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
 2012-09-24 19:11:30 -04:00
Sara Ting
03fbd24e79 am 696608fd: am db8f10ad: Merge "Adding support for new \'uid2445\' column in Calendar\'s Events table." into jb-mr1-dev 
* commit '696608fd6916df972316c08a107937cf49c1d211':
  Adding support for new 'uid2445' column in Calendar's Events table.
 2012-09-24 16:08:41 -07:00
Romain Guy
f8e6a7c5ec 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-24 16:07:05 -07:00
Sara Ting
696608fd69 am db8f10ad: Merge "Adding support for new \'uid2445\' column in Calendar\'s Events table." into jb-mr1-dev 
* commit 'db8f10ad9aae814f73a03e38bdf477acc01e11b4':
  Adding support for new 'uid2445' column in Calendar's Events table.
 2012-09-24 16:06:49 -07:00
Sara Ting
db8f10ad9a Merge "Adding support for new 'uid2445' column in Calendar's Events table." into jb-mr1-dev 2012-09-24 16:03:22 -07:00
Eric Laurent
c1f1c79ab4 am ae839479: am bbc4c17f: Merge "pause music playback when switching user." into jb-mr1-dev 
* commit 'ae8394790a9cdac3a4e7c5e9d425935bf6b47716':
  pause music playback when switching user.
 2012-09-24 16:00:49 -07:00
Eric Laurent
ae8394790a am bbc4c17f: Merge "pause music playback when switching user." into jb-mr1-dev 
* commit 'bbc4c17f95a93976fd62169ca29555eb8e77b206':
  pause music playback when switching user.
 2012-09-24 15:59:17 -07:00
Eric Laurent
bbc4c17f95 Merge "pause music playback when switching user." into jb-mr1-dev 2012-09-24 15:56:42 -07:00
Adam Powell
172f363f75 am 0c8267ec: am ff997bc9: Merge "TaskStackBuilder and intents without an explicit target" into jb-mr1-dev 
* commit '0c8267ec4fc374fced50b158e573b84c0fa3db54':
  TaskStackBuilder and intents without an explicit target
 2012-09-24 15:50:30 -07:00
Adam Powell
0c8267ec4f am ff997bc9: Merge "TaskStackBuilder and intents without an explicit target" into jb-mr1-dev 
* commit 'ff997bc9501b3100817e17b37300c489265867da':
  TaskStackBuilder and intents without an explicit target
 2012-09-24 15:48:54 -07:00
Adam Powell
ff997bc950 Merge "TaskStackBuilder and intents without an explicit target" into jb-mr1-dev 2012-09-24 15:46:26 -07:00