ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
18,059 Commits 2 Branches 0 Tags 54 MiB
94eed383c9
Commit Graph

18059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f0df01ce96 am 8ae5a8e7: Get to the point of being able to do native drawing. 
Merge commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb' into gingerbread-plus-aosp

* commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb':
  Get to the point of being able to do native drawing.
 2010-07-01 19:25:01 -07:00
Romain Guy
ed8060feb6 Merge "Track the size in memory of the texture cache." 2010-07-01 18:29:42 -07:00
Shimeng (Simon) Wang
1dbe0982e3 Merge "Fix zoom overview logic." 2010-07-01 17:58:03 -07:00
Alex Sakhartchouk
f826b0575c Merge "Start of mesh API cleanup. Switched all native code to go through Mesh class. Removed SimpleMesh Added java Mesh class Will need to port all existing code to use java Mesh, then remove java SimpleMesh." 2010-07-01 16:47:40 -07:00
Eric Laurent
937296f39a am 64fa7f07: am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call. 
Merge commit '64fa7f072a2eff834206ce245f137993b010f5c0'

* commit '64fa7f072a2eff834206ce245f137993b010f5c0':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 16:41:12 -07:00
Eric Laurent
1856a5c349 am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call. 
Merge commit 'f520411a35db5248934a4b50859ca72e3f865593' into gingerbread-plus-aosp

* commit 'f520411a35db5248934a4b50859ca72e3f865593':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 16:38:33 -07:00
Eric Laurent
44c72e307d am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call. 
Merge commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd' into gingerbread

* commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 16:36:02 -07:00
Dianne Hackborn
6c81b2a0c9 am 58f35ff4: am 54a181b1: Make real API for native code to get its window. 
Merge commit '58f35ff41601769ca4f357575a9385f16c01b991'

* commit '58f35ff41601769ca4f357575a9385f16c01b991':
  Make real API for native code to get its window.
 2010-07-01 16:04:02 -07:00
Dianne Hackborn
5ff2853bdf am 54a181b1: Make real API for native code to get its window. 
Merge commit '54a181b1a2b1517a9479b21fbf7705a688232faf' into gingerbread-plus-aosp

* commit '54a181b1a2b1517a9479b21fbf7705a688232faf':
  Make real API for native code to get its window.
 2010-07-01 16:00:19 -07:00
Jason Sams
9be04e71c9 Merge "Update fountain with multitouch support." 2010-07-01 15:42:47 -07:00
Romain Guy
155cdf9ff6 Merge "Don't use full screen FBOs, this dramatically increase performance." 2010-07-01 15:29:49 -07:00
James Dong
61c67d6aba am d6ec2175: am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 
Merge commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083'

* commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083':
  Refactor Stagefright::StartMPEG4Recording()
 2010-07-01 14:15:00 -07:00
James Dong
4a9c2b66cc am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 
Merge commit '65c83b906d01c3c1493d0547757dbb16d4c3722a' into gingerbread-plus-aosp

* commit '65c83b906d01c3c1493d0547757dbb16d4c3722a':
  Refactor Stagefright::StartMPEG4Recording()
 2010-07-01 14:12:47 -07:00
James Dong
61f7aba45b Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 2010-07-01 14:11:01 -07:00
Amith Yamasani
827d360761 am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 
Merge commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e'

* commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e':
  DO NOT MERGE: Add a battery capacity value to the power profile.
 2010-07-01 13:55:26 -07:00
Amith Yamasani
03bf3721c0 am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 
Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp

* commit 'c7dacb7374e04c003b0764e7c348765b629c18cb':
  DO NOT MERGE: Add a battery capacity value to the power profile.
 2010-07-01 13:53:08 -07:00
Amith Yamasani
d16a91ab95 Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 2010-07-01 13:51:27 -07:00
Jean-Baptiste Queru
dc932feef0 Merge "Fix missing NL" 2010-07-01 13:46:03 -07:00
Adam Powell
7d95278f16 Merge "Add AbsListView#smoothScrollToPositionFromTop" 2010-07-01 13:45:58 -07:00
Jason Parks
dad67f2df1 Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." 2010-07-01 13:37:13 -07:00
satok
349a24f4c0 Merge "Remove EditStyledText from the framekwork" 2010-07-01 13:24:26 -07:00
Eric Laurent
9c904a1f39 am eba857d1: am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 
Merge commit 'eba857d126e2b76a368f41d3169a56fe28029674'

* commit 'eba857d126e2b76a368f41d3169a56fe28029674':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 11:59:10 -07:00
Andreas Huber
e94811e469 am d51c2cac: am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool. 
Merge commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2'

* commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
 2010-07-01 11:56:16 -07:00
Eric Laurent
88658f5dc0 am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 
Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp

* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
 2010-07-01 11:56:11 -07:00
Joe Onorato
7e57a61c24 am 393e1459: am a2dd4c17: put the status bar back in the system process 
Merge commit '393e1459340effdb8bdc6531e22c0976d0aea026'

* commit '393e1459340effdb8bdc6531e22c0976d0aea026':
  put the status bar back in the system process
 2010-07-01 11:55:46 -07:00
Joe Onorato
ef5946d5bf am 6fd470fb: am 6be4739e: quiet noisy debug spew 
Merge commit '6fd470fbdc46777d7dc201bd6f475becc7976014'

* commit '6fd470fbdc46777d7dc201bd6f475becc7976014':
  quiet noisy debug spew
 2010-07-01 11:55:42 -07:00
Chih-Chung Chang
06a5bf2930 am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles. 
Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'

* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
  Add multiple camera support for in MediaProfiles.
 2010-07-01 11:55:27 -07:00
Eric Laurent
5517656148 Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 2010-07-01 11:54:00 -07:00
Christopher Tate
6764eff2f7 resolved conflicts for merge of d3233ae9 to master 
Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6
 2010-07-01 11:49:41 -07:00
Andreas Huber
bea516166c am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool. 
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
 2010-07-01 10:07:17 -07:00
Mike Lockwood
002a6aeb73 Merge "MTP: Remove an unnecessary thread from the MtpClient class." 2010-07-01 08:40:24 -07:00
Joe Malin
e6b2b23ecc Merge "Javadoc for test case classes" 2010-07-01 08:31:12 -07:00
Jeff Hamilton
bb56c13edd Merge "More cleanup after removing the Cursor update logic." 2010-07-01 08:29:52 -07:00
Steve Block
ece68141e4 Merge "Add a class to represent the set of sensitive features of a web application" 2010-07-01 08:08:11 -07:00
Joe Onorato
692919be30 am a2dd4c17: put the status bar back in the system process 
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp

* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
  put the status bar back in the system process
 2010-07-01 05:01:52 -07:00
Joe Onorato
530de461e1 am 6be4739e: quiet noisy debug spew 
Merge commit '6be4739e1b302eb447dee195eaecbfcf82317310' into gingerbread-plus-aosp

* commit '6be4739e1b302eb447dee195eaecbfcf82317310':
  quiet noisy debug spew
 2010-07-01 05:01:48 -07:00
Steve Block
185497c059 Merge "Pass the WebView context to the GeolocationService from WebKit" 2010-07-01 02:18:24 -07:00
Chih-Chung Chang
48cf5b1954 am 09b90057: Add multiple camera support for in MediaProfiles. 
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
  Add multiple camera support for in MediaProfiles.
 2010-06-30 20:22:40 -07:00
Mike Lockwood
63103848cd Merge "Try to fix the simulator build." 2010-06-30 19:23:42 -07:00
Romain Guy
fb338da840 Merge "Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)" 2010-06-30 19:23:08 -07:00
Christopher Tate
c6466bfb57 am 160edb36: Add ability to guard a thread against setting its own prio to bg 
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
  Add ability to guard a thread against setting its own prio to bg
 2010-06-30 18:28:08 -07:00
Shimeng (Simon) Wang
0979fa2ef2 Merge "Fix the initial reflow width when switch between basic pages." 2010-06-30 18:03:53 -07:00
Romain Guy
3d23c4e988 Merge "Add implementation for drawBitmap()." 2010-06-30 17:58:12 -07:00
Adam Powell
dc8e84d972 Merge "Define measuring behavior for action bar/context mode custom views" 2010-06-30 17:16:29 -07:00
Alex Sakhartchouk
c852735c95 Merge "Fixing freetype init/uninit code. Removing debug output from stream." 2010-06-30 16:56:10 -07:00
Dianne Hackborn
ed2b843c91 am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread 
Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8'

* commit '177c405a242e811b1010bd8382b5807ab8df31a8':
  Introduce official public NativeWindow type.
 2010-06-30 16:11:21 -07:00
Dianne Hackborn
d729836ff8 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread 
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
 2010-06-30 16:08:24 -07:00
Romain Guy
cf2b4e79ff Merge "Remove unnecessary return and add bitmap generation ID tracking." 2010-06-30 16:07:09 -07:00
Mathias Agopian
41360867a3 am e341a0b5: am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread 
Merge commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f'

* commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f':
  fix live wallpapers on Droid
 2010-06-30 16:05:37 -07:00
Dianne Hackborn
e12e3d7692 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00