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

88049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Irfan Sheriff
59358536d2 Update doc on getConfiguredNetworks 
BUg: 7223590
Change-Id: Id92699ae48ea75f94638fcc3bd776b863911985b
 2012-09-24 17:36:19 -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
Romain Guy
ddbe3fac76 am 270d08d6: am dd6d7841: Merge "Add extra error check when eglCreateContext fails Bug #7216919" into jb-mr1-dev 
* commit '270d08d6cb80fe03c97bc6031979861946741080':
  Add extra error check when eglCreateContext fails Bug #7216919
 2012-09-24 15:44:23 -07:00
Romain Guy
270d08d6cb am dd6d7841: Merge "Add extra error check when eglCreateContext fails Bug #7216919" into jb-mr1-dev 
* commit 'dd6d7841fd8e4a8211ca44641d3e4677136f685e':
  Add extra error check when eglCreateContext fails Bug #7216919
 2012-09-24 15:42:54 -07:00
Chris Wren
482410de94 reduce notification pad on large displays. 
Bug:7053073
Change-Id: Icbb98ba31b79e25ca37757bf6e898f2575c0e487
 2012-09-24 18:41:18 -04:00
Romain Guy
dd6d7841fd Merge "Add extra error check when eglCreateContext fails Bug #7216919" into jb-mr1-dev 2012-09-24 15:39:48 -07:00
Adam Powell
7a8a6391e9 am 91fc5461: am 71779b9f: Merge "Allow multiple \'parcelable\' declarations in aidl files" into jb-mr1-dev 
* commit '91fc5461b6fc2f7032c5ffa0653cc3aa3af91a3b':
  Allow multiple 'parcelable' declarations in aidl files
 2012-09-24 15:39:21 -07:00
Eino-Ville Talvala
d8c2862ab1 am 04831eab: am f6103b6b: Merge "Camera: Improve enableShutterSound documentation." into jb-mr1-dev 
* commit '04831eabc2a92c26664f78f48686165019d8fc5b':
  Camera: Improve enableShutterSound documentation.
 2012-09-24 15:37:34 -07:00
Adam Powell
91fc5461b6 am 71779b9f: Merge "Allow multiple \'parcelable\' declarations in aidl files" into jb-mr1-dev 
* commit '71779b9f5bb068f9b1323a2260a8586b27b32063':
  Allow multiple 'parcelable' declarations in aidl files
 2012-09-24 15:36:59 -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
Eino-Ville Talvala
04831eabc2 am f6103b6b: Merge "Camera: Improve enableShutterSound documentation." into jb-mr1-dev 
* commit 'f6103b6bfd21fb77db1626f49c884c5472c7556d':
  Camera: Improve enableShutterSound documentation.
 2012-09-24 15:35:07 -07:00
Adam Powell
71779b9f5b Merge "Allow multiple 'parcelable' declarations in aidl files" into jb-mr1-dev 2012-09-24 15:33:07 -07:00
Eino-Ville Talvala
f6103b6bfd Merge "Camera: Improve enableShutterSound documentation." into jb-mr1-dev 2012-09-24 15:31:21 -07:00
Romain Guy
95a12d575e am c49e5d0d: am da42438c: Merge "Add a property to disable libhwui\'s scissor optimization Bug #7158326" into jb-mr1-dev 
* commit 'c49e5d0dbdce1da85699cbdce32f7372af99d7fb':
  Add a property to disable libhwui's scissor optimization Bug #7158326
 2012-09-24 15:16:55 -07:00
Romain Guy
c49e5d0dbd am da42438c: Merge "Add a property to disable libhwui\'s scissor optimization Bug #7158326" into jb-mr1-dev 
* commit 'da42438cf7dbcdd364337b1046f78411401a388b':
  Add a property to disable libhwui's scissor optimization Bug #7158326
 2012-09-24 15:14:29 -07:00
Dianne Hackborn
06fed8e2c4 am 885fcee4: am 4c0f6782: Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." into jb-mr1-dev 
* commit '885fcee4bf01758e53602fdaab37601fbd56ae6c':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-24 15:12:44 -07:00
Romain Guy
da42438cf7 Merge "Add a property to disable libhwui's scissor optimization Bug #7158326" into jb-mr1-dev 2012-09-24 15:11:03 -07:00
Dianne Hackborn
885fcee4bf am 4c0f6782: Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." into jb-mr1-dev 
* commit '4c0f6782845b1a74ff88e30b99489fe9ca3ee847':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-24 15:10:31 -07:00
Dianne Hackborn
4c0f678284 Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." into jb-mr1-dev 2012-09-24 15:08:31 -07:00
Martijn Coenen
a385657b9f am e75104a4: am ed50c006: Merge "Add NfcBarcode technology API." into jb-mr1-dev 
* commit 'e75104a4e7b3ffffb47c7239c06baae4c3bbf4f6':
  Add NfcBarcode technology API.
 2012-09-24 15:06:54 -07:00
Martijn Coenen
e75104a4e7 am ed50c006: Merge "Add NfcBarcode technology API." into jb-mr1-dev 
* commit 'ed50c0065313b0ddd84b80a3ed470db1da543361': (89 commits)
  Add NfcBarcode technology API.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Handle requestLayout() calls during layout
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix Skia assertions where we were allowing immutable bitmaps to be written to.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Push event logging down into libcore.EventLogger
  ...
 2012-09-24 15:04:34 -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
0ea326d1b4 am 6be73659: am 7ae18833: Merge "Fix build" into jb-mr1-dev 
* commit '6be7365945be90998fb34b6623ed6c554eb09643':
  Fix build
 2012-09-24 15:01:35 -07:00
Martijn Coenen
ed50c00653 Merge "Add NfcBarcode technology API." into jb-mr1-dev 2012-09-24 15:01:20 -07:00
Michael Jurka
6be7365945 am 7ae18833: Merge "Fix build" into jb-mr1-dev 
* commit '7ae188335e8c876401ae15ac11c8331e88ae1297':
  Fix build
 2012-09-24 15:00:10 -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