ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
23,654 Commits 2 Branches 0 Tags 54 MiB
698346ed59
Commit Graph

23654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
698346ed59 am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:23:46 -07:00
Mathias Agopian
3e98e38510 am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:19:43 -07:00
Jeff Hamilton
22c8778e7a am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:18:08 -07:00
Mathias Agopian
2edb0ed093 Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:18:07 -07:00
Jeff Hamilton
bbab50ff23 am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:16:10 -07:00
Jeff Hamilton
8709d74a96 Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:14:17 -07:00
Xavier Ducrohet
8f6977ac48 am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:13:32 -07:00
Xavier Ducrohet
2232558582 am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:10:28 -07:00
Xavier Ducrohet
a0afe4ee27 Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:09:18 -07:00
James Dong
afb6aeb53a Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java" 2010-10-26 12:01:39 -07:00
Gil Dobjanschi
3949f151f3 Merge "Effects and overlays are not modified when a video clip is trimmed." 2010-10-26 11:50:04 -07:00
Jaikumar Ganesh
a75e30eb46 Merge "Fix A2DP connection problem, if disconnected while playing music." 2010-10-26 11:31:44 -07:00
Patrick Scott
79c2d6acc7 Merge "Fix debug statements and aapt assert." 2010-10-26 11:26:19 -07:00
Dianne Hackborn
16db2fe012 Merge "Fix issue #3130426: Finsky crash in switching from window carousel" 2010-10-26 11:20:06 -07:00
Gilles Debunne
26657c3f66 Merge "New Holo style for Tabs." 2010-10-26 11:18:51 -07:00
Shimeng (Simon) Wang
2298a36361 Merge "Fix the viewport height to view height when title bar is visible." 2010-10-26 10:05:20 -07:00
James Dong
4a2cb3bf78 Merge "Add two creation flags to OMXCodec::Create()" 2010-10-26 09:26:24 -07:00
Justin Ho
c6e6e302d0 am cc8de576: (-s ours) am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:13:08 -07:00
Justin Ho
8b46c7fea2 am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:11:12 -07:00
Justin Ho
44f5078102 Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:09:22 -07:00
Mike Lockwood
f6a75550eb am 1b571bd3: am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:38:51 -07:00
Mike Lockwood
986ecf09ac am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:36:24 -07:00
Mike Lockwood
0404c45a79 Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:34:32 -07:00
Eric Laurent
d4fd4b098d am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:17:07 -07:00
Eric Laurent
d75ac5a652 am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:14:48 -07:00
Eric Laurent
81396baafa Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:13:32 -07:00
Ben Murdoch
2bfdc7493c Merge "Update WebView useragent string for merge to WebKit r70209" 2010-10-26 07:44:34 -07:00
Jeff Hamilton
f02c2a0add am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:28:57 -07:00
Joe Onorato
acf134b23d am a1e74744: am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:28:51 -07:00
Jeff Hamilton
b24144b049 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Joe Onorato
515c360b92 am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:24:41 -07:00
Jeff Hamilton
dbb47535b5 Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:16:47 -07:00
Chet Haase
01f90d3edc Merge "DisplayList optimizations and fixes." 2010-10-26 06:59:19 -07:00
Jaikumar Ganesh
dda0980589 Merge "Add logs to debug incoming A2DP connection issue." 2010-10-26 00:32:06 -07:00
Jaikumar Ganesh
7ad5e59401 Merge "Clean up some logging to make it more useful to debug." 2010-10-26 00:18:31 -07:00
Jim Miller
2346053100 Merge "Fix 3117937: Add simplified "recent apps"." 2010-10-25 20:33:48 -07:00
Jaikumar Ganesh
fe15af9001 Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent." 2010-10-25 19:41:57 -07:00
Jack Palevich
38f1020a8f Merge "Do not exit the GLSurfaceView thread when detached from a window." 2010-10-25 19:39:20 -07:00
Gil Dobjanschi
111864ad2a Merge "Transition bug fix" 2010-10-25 19:13:32 -07:00
Jeff Brown
7bb57bcd56 Merge "Tweak log messages a bit." 2010-10-25 18:51:57 -07:00
Joe Onorato
69f8423ad9 Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-25 18:48:08 -07:00
Romain Guy
9ad4d2a7a4 Merge "Small cleanup." 2010-10-25 18:46:04 -07:00
Romain Guy
552504620a Merge "Don't change texture unit when not needed." 2010-10-25 18:36:13 -07:00
Romain Guy
3e45fe980a Merge "Don't change textures wrap modes on every draw." 2010-10-25 18:06:45 -07:00
James Dong
7c58a3e7ed Merge "Remove OMX.PV.* components from OMXCodec.cpp" 2010-10-25 18:02:44 -07:00
Jean-Baptiste Queru
088d370aea am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'

* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
  frameworks/base: Handle null from topRunningNonDelayedActivityLocked
 2010-10-25 17:59:49 -07:00
Scott Main
03012a361f Merge "resolved conflicts for merge of f0b3fa60 to master" 2010-10-25 17:56:40 -07:00
James Dong
2c37260a82 Merge "Don't change the video recording frame rate if it is not requested." 2010-10-25 17:56:14 -07:00
Scott Main
862b23cb62 resolved conflicts for merge of f0b3fa60 to master 
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
 2010-10-25 17:54:33 -07:00
Adam Powell
a7c6b15b1f Merge "Holo: vertical dividers, group button states, default window backgrounds." 2010-10-25 17:44:35 -07:00