ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,455 Commits 2 Branches 0 Tags 54 MiB
130d6278a4
Commit Graph

30455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
d758cc306d am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb 
* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
  Cleanup of the code in view to do creation/destruction in the right places.
 2011-02-10 15:07:59 -08:00
Adam Powell
d8b138d0a2 Merge "Fix bug 3372468 - ActionBar menu shouldn't be clickable after ActionBar.hide() is called" 2011-02-10 15:07:09 -08:00
Shimeng (Simon) Wang
e366850e9e Merge "Don't send scroll events in case of new picture from webkit." 2011-02-10 15:07:07 -08:00
Jean-Baptiste Queru
a4c04ad917 am fe9b24f4: Ignore a8d3f02a from honeycomb - already there 
* commit 'fe9b24f4cd665573c2dc0ced444ecc4997ece1a1':
  DO NOT MERGE
 2011-02-10 15:04:20 -08:00
Huahui Wu
96ec7bf323 Merge "b/3416864 Send the cert info from Native to Java side." 2011-02-10 15:00:23 -08:00
Jean-Baptiste Queru
6d2cb2f356 Ignore a8d3f02a from honeycomb - already there 
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
 2011-02-10 14:49:12 -08:00
Gilles Debunne
6d9d20c695 am aff2cfd1: resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp 
* commit 'aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3':
  Text selection is broken.
 2011-02-10 14:48:02 -08:00
Gilles Debunne
23820f6a89 resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp 
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
 2011-02-10 14:43:35 -08:00
Jesse Wilson
0ff5e20989 Merge "Document that LruCache is threadsafe." 2011-02-10 14:33:20 -08:00
Vasu Nori
91c2e35dfb Merge "bug:3443154 fix database tests after disabling sqlite wal" 2011-02-10 14:13:49 -08:00
Eric Laurent
b52e46c729 Merge "Fix issue 3435692" 2011-02-10 14:01:27 -08:00
Steve Block
0769187ac4 Merge "Adds CookieManager methods to configure policy for cookies for file scheme URLs" 2011-02-10 13:59:09 -08:00
Wink Saville
7cf3907b6f am 48fe5c3a: am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '48fe5c3a86435a401fa88b43e15b84e29e660173':
  Telephony: Fix cb sms implementation
 2011-02-10 13:57:10 -08:00
Mathias Agopian
e939d4b903 am b624eea7: am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 
* commit 'b624eea70c18d616a1d0860eb30ae31ac5a33085':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
 2011-02-10 13:57:05 -08:00
Scott Main
9e0b6052e2 am 0d66a2ec: am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page 
* commit '0d66a2ec428fe5ae746629b6c62750d1201e3f6f':
  add 2.3.3 announcement to site home page
 2011-02-10 13:57:02 -08:00
Jeff Hamilton
fb76c902dc am 9e5ffb55: am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '9e5ffb55e8eabf8fd9215cbc68538ed5d9efe2d4':
  More documentation updates for NFC.
 2011-02-10 13:56:56 -08:00
Dirk Dougherty
79dcd9ce21 am 58dacceb: am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit '58dacceb789929c0d870649c5c0c2cab1045b898':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-10 13:56:52 -08:00
Nick Pelly
5e1a7d6a19 am cc47600d: am 47dac545: am 39cf3a44: Document NFC permissions. 
* commit 'cc47600d4d7850f2903d2d59cc7f44528d40c8e5':
  Document NFC permissions.
 2011-02-10 13:56:46 -08:00
Jeff Hamilton
1c6af4a189 am 510ced64: am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '510ced64f4316702cea07a55d1d473bdc07b2c86':
  Improve the docs a bit for foreground dispatch.
 2011-02-10 13:56:41 -08:00
Eric Fischer
0daa3f9035 am bdf587e8: (-s ours) am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'bdf587e8b9247fbf8e544f330cf0ec9efb1194db':
  Import revised translations.  DO NOT MERGE
 2011-02-10 13:56:36 -08:00
Scott Main
45db4ff7c9 am 51d94b26: am 129c7372: am 3c01a139: rename SIP doc title 
* commit '51d94b268a63d0ffffce92aa7cb822ae99529d84':
  rename SIP doc title
 2011-02-10 13:56:29 -08:00
Wink Saville
11b5325535 am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
  Telephony: Fix cb sms implementation
 2011-02-10 13:53:10 -08:00
Mathias Agopian
71fcb03f87 am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 
* commit 'd0f27f435eb8a2c7e5841da68760d1f023fcf919':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
 2011-02-10 13:53:01 -08:00
Scott Main
3ac3afb0f3 am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page 
* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
  add 2.3.3 announcement to site home page
 2011-02-10 13:52:57 -08:00
Jeff Hamilton
2ac5673e83 am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
  More documentation updates for NFC.
 2011-02-10 13:52:48 -08:00
Dirk Dougherty
0cbf55999f am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-10 13:52:40 -08:00
Nick Pelly
6f1ae086a9 am 47dac545: am 39cf3a44: Document NFC permissions. 
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
  Document NFC permissions.
 2011-02-10 13:52:34 -08:00
Jeff Hamilton
165c1ad42f am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
  Improve the docs a bit for foreground dispatch.
 2011-02-10 13:52:23 -08:00
Scott Main
f8535bf802 am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp 
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
  docs: move the SIP guide into guide/network/
 2011-02-10 13:51:30 -08:00
Eric Fischer
0c365669ad am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
  Import revised translations.  DO NOT MERGE
 2011-02-10 13:50:51 -08:00
Scott Main
22201fb079 am 129c7372: am 3c01a139: rename SIP doc title 
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
  rename SIP doc title
 2011-02-10 13:50:44 -08:00
Scott Main
81363d359f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp 
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
 2011-02-10 13:47:32 -08:00
Jesse Wilson
4be44052c0 Merge "Remove SSLPerformanceTest and DatabaseSessionCache." 2011-02-10 13:44:56 -08:00
Jason Sams
5170719304 Merge "Basic 101 level compute example for RS." into honeycomb 2011-02-10 13:06:16 -08:00
Katie McCormick
8952156b4b am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-10 13:03:27 -08:00
Xavier Ducrohet
00c662cbdf Merge "LayoutLib: remove some exceptions." 2011-02-10 13:01:34 -08:00
Katie McCormick
b91f20af98 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
 2011-02-10 12:38:07 -08:00
Andreas Huber
277b95db21 Merge "Fix the build." 2011-02-10 12:35:06 -08:00
Mathias Agopian
aa60b1f889 Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb 2011-02-10 12:29:19 -08:00
Marco Nelissen
937eb81ec9 Merge "Better genre support." 2011-02-10 12:23:11 -08:00
Steve Block
a137e211c2 Merge "Increase DRT timeout while waiting for WebView to dump as text" 2011-02-10 12:13:27 -08:00
Adam Powell
11a21bff64 Merge "Fix bug 3440372 - Spinner measurement issues with new rules" 2011-02-10 12:07:38 -08:00
Dirk Dougherty
6ae328cec7 Merge "Doc change: changes for 3.0 SDK" into honeycomb 2011-02-10 12:02:38 -08:00
Andreas Huber
71a2cbd8b4 Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support" 2011-02-10 11:55:22 -08:00
John Reck
ef0c9cb3bf Merge "Fix spacing issue" 2011-02-10 11:53:10 -08:00
Xavier Ducrohet
d8d6552230 Merge "LayoutLib: Annotate the custom delegate methods." 2011-02-10 11:27:27 -08:00
Robert Ly
13e49458c9 Merge "clean up and add javadocs" into honeycomb 2011-02-10 10:15:14 -08:00
Alex Sakhartchouk
4782b521f6 Merge "HelloWorld graphics sample for Renderscript." into honeycomb 2011-02-10 09:53:30 -08:00
Alex Sakhartchouk
4029472744 Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb 2011-02-10 09:51:34 -08:00
Santosh Madhava
3cb3346451 Merge "Fix for 3431967: Memory leak from video editor engine in JNI" 2011-02-10 09:41:27 -08:00