ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,332 Commits 2 Branches 0 Tags 54 MiB
243ce507c4
Commit Graph

17332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
243ce507c4 am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 
Merge commit 'cefb88587443323d147e687ff78eae9195eb584c'

* commit 'cefb88587443323d147e687ff78eae9195eb584c':
  Added support for the GL_TEXTURE_EXTERNAL target
 2010-06-23 10:17:56 -07:00
Mathias Agopian
46640ff993 am bf900939: am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread 
Merge commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6'

* commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6':
  Improve SensorManager documentation
 2010-06-23 10:17:42 -07:00
Jeff Brown
12c9ce8bc4 am b1efc3f6: am 7fbdc84e: More native input event dispatching. 
Merge commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe'

* commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe':
  More native input event dispatching.
 2010-06-23 10:17:22 -07:00
Steve Block
718a4ecd56 Merge "Adds a Geolocation permission handler to the WebRuntime" 2010-06-23 07:45:51 -07:00
Jason Sams
2966efc2b9 Merge "Fix 32&24 ->16 bit bitmap uploads." 2010-06-22 17:46:18 -07:00
Jason Sams
f72bf05ae2 Merge "Re-enable optimization for detecting nop state changes in fragment and vertex programs." 2010-06-22 17:23:47 -07:00
Vasu Nori
c297df055f Merge "fix broken current.xml" 2010-06-22 16:05:11 -07:00
Vasu Nori
f5825be44f Merge "for memory databases, don't set journal_mode and don't allow WAL" 2010-06-22 15:53:18 -07:00
John Wang
e45202ac2f Merge "Create CallManager class." 2010-06-22 13:56:44 -07:00
Mike Lockwood
10810e7bc0 Merge "MTP: Use a fd instead of a file path in file transfer ioctls." 2010-06-22 13:40:09 -07:00
Mike Lockwood
aec9a875e6 Merge "mtptest: Add option to specify storage path at the command line." 2010-06-22 13:39:36 -07:00
Romain Guy
54331629b4 Merge "Fix simulator build again." 2010-06-22 13:30:14 -07:00
Vasu Nori
81488d75b1 Merge "when corruption occurs, not clsing the db is casuing stack overflow" 2010-06-22 13:13:16 -07:00
Romain Guy
2857f969e4 Merge "Fix the simulator build." 2010-06-22 13:12:44 -07:00
Grace Kloba
aa94a360cd Merge "Add a WebSettings to control whether WebView will use some perf trick, e.g. pause updating the picture, during panning and zooming transition." 2010-06-22 10:39:18 -07:00
Ben Murdoch
f63483376c Merge "Web runtime - link following with simple SOP check - back button - fullscreen (title shown as toast for now)" 2010-06-22 05:45:43 -07:00
Romain Guy
e170304161 Merge "Add glOrtho equivalent to the OpenGL ES 2.0 renderer." 2010-06-21 19:36:59 -07:00
Jason Sams
f8aed6b04f Merge "Fix build error." 2010-06-21 18:33:17 -07:00
Jason Sams
59f509e2d1 Merge "Move ImageProcessing and ModelViewer to reflected files. Implement boolean support." 2010-06-21 17:45:57 -07:00
Jason Sams
abd8fee235 Merge "Remove the obsolete film example." 2010-06-21 17:44:35 -07:00
Jason Sams
ea7edda281 Merge "Fountain example cleanup. Remove compatability versions of rsg functions that took old 'i' types." 2010-06-21 17:44:25 -07:00
Gilles Debunne
902fe2f39a Merge "Fixed scrolling issue when moving cursor in long TextViews." 2010-06-21 16:56:15 -07:00
Daniel Lehmann
f4c47a5c3e Merge "Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on" 2010-06-21 16:36:58 -07:00
Adam Powell
829af3b832 Merge "Changes for bluetooth keyboard support." 2010-06-21 16:36:57 -07:00
Robert Greenwalt
9ac04de58d Merge "Don't modify a list while iterating." 2010-06-21 15:32:43 -07:00
Mathias Agopian
38c371361b am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 
Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp

* commit '28333315c6f62b303de2ec0ac9e48158ed419f06':
  Added support for the GL_TEXTURE_EXTERNAL target
 2010-06-21 15:14:29 -07:00
Mathias Agopian
8207575c21 am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread 
Merge commit '7e73a2ce17740abd028d9944c423e191e5b4854c' into gingerbread-plus-aosp

* commit '7e73a2ce17740abd028d9944c423e191e5b4854c':
  Improve SensorManager documentation
 2010-06-21 15:12:14 -07:00
Mathias Agopian
b16fa651dd Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 2010-06-21 15:11:18 -07:00
Mathias Agopian
06a7cd44e1 Merge "Improve SensorManager documentation" into gingerbread 2010-06-21 15:10:13 -07:00
Jean-Baptiste Queru
98815ecfdf Merge "Recover a handful of commits that were reverted earlier" 2010-06-21 14:29:47 -07:00
Robert Greenwalt
a29e9300ad Merge "Reorder ThrottleService startup to avoid race." 2010-06-21 14:12:38 -07:00
Jeff Brown
a7a0b1ec5c am 7fbdc84e: More native input event dispatching. 
Merge commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a' into gingerbread-plus-aosp

* commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a':
  More native input event dispatching.
 2010-06-21 14:06:31 -07:00
Jeff Brown
51d45a710e More native input event dispatching. 
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.

Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
 2010-06-21 13:59:34 -07:00
Jean-Baptiste Queru
ff5f34f3c9 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
Vasu Nori
b2e002a8d5 Merge "fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f" 2010-06-21 13:18:00 -07:00
Jean-Baptiste Queru
645c8560ce Undo previous merge 
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
 2010-06-21 12:37:08 -07:00
Evan Millar
1b14497710 am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit '9afeda0519c4f4892611565d678f01d269863bb8'

* commit '9afeda0519c4f4892611565d678f01d269863bb8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:12:55 -07:00
Evan Millar
c7e9defdd3 am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp

* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:10:55 -07:00
Evan Millar
a2f89660b4 Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 2010-06-21 12:09:40 -07:00
Jean-Baptiste Queru
9b0db86c2e resolved conflicts for merge of 6c9a3004 to master 
Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95
 2010-06-21 11:44:49 -07:00
Kenny Root
9a5366d778 am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations 
Merge commit '0fcfa0a53f92f32d50870c246763da30a106d13a'

* commit '0fcfa0a53f92f32d50870c246763da30a106d13a':
  Import revised translations
 2010-06-21 11:37:10 -07:00
Andrew Stadler
9e02ba78dc Merge "Add getWrappedCursor, and update the JavaDoc." 2010-06-21 11:35:51 -07:00
The Android Open Source Project
ecfae4c86a merge from froyo-plus-aosp 
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
 2010-06-21 11:23:45 -07:00
Kenny Root
c74dafe038 am f25c560d: am 30cf330f: Import revised translations 
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
 2010-06-21 11:20:28 -07:00
Kenny Root
5adc399c76 am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:17:07 -07:00
Vasu Nori
63f6dee628 Merge "journal_mode should be set only on non-memory databases" 2010-06-21 10:46:29 -07:00
Kenny Root
102961979e am b2ce04c2: am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de'

* commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de':
  Import revised translations
 2010-06-21 10:16:48 -07:00
Chia-chi Yeh
2cf5e79922 am d9e9132e: am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d'

* commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 10:16:45 -07:00
Shimeng (Simon) Wang
fbb7afa1a1 Merge "Add dumpChildFramesAsText function support in LayoutTestController." 2010-06-21 10:07:35 -07:00
Brad Fitzpatrick
83f737ab6d am 65ff03a1: am 04b243d0: Fix NPE during ANRs. 
Merge commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0'

* commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0':
  Fix NPE during ANRs.
 2010-06-21 09:54:24 -07:00