Commit graph

55 commits

Author SHA1 Message Date
Tor Lillqvist
602f93da37 Link in more libs
Change-Id: I5e016a061ea4206966757cda2d6681617b45b550
2012-10-11 10:07:06 +03:00
Tor Lillqvist
8ab89346ba Add some more components/libraries
Change-Id: I2dba9bceee4c68b551ed8ed9239e93ea9ae93117
2012-10-11 10:07:06 +03:00
Tor Lillqvist
4b7e701024 Use DISABLE_DYNLOADING on Android
IN this branch these changes are not conditional. Unclear yet whether
this is what we finally will want to use or not. Maybe should make
these changes conditional and do this stuff in master instead?

Change-Id: I379d570a0e00648d295c675fd90eba6594ba3182
2012-10-11 10:07:05 +03:00
Anurag Jain
37a2fa5d5a fdo#51304: Remove the author of some java source files
This patch remove some '@author' for Java souce files, and removes some
commented code founded when removing the '@author'.

Change-Id: Ic4fcd028a9cdbd85c693d93bcd48e41f36386d22
2012-10-01 14:10:03 +02:00
Michael Meeks
e989d16748 dung out no longer needed initUCBHelper methods; thanks to sberg. 2012-09-19 18:41:45 +01:00
Tor Lillqvist
f9e88410cf Drop misleading comment
Change-Id: I90bc8870fcc7919f2b9c224160d7cb2e7ef285e7
2012-09-04 14:01:39 +03:00
Matúš Kukan
dc8f9877d1 libmerged: another small component libraries for android
Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad
2012-09-01 21:06:12 +02:00
Matúš Kukan
3f750f8e7b merge more, mostly small libraries for android
Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0
2012-08-25 12:45:36 +02:00
Matúš Kukan
4d7b955705 libmerged: add more libraries
Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
2012-08-25 12:45:35 +02:00
Tor Lillqvist
a1aed54fee Build basebmp as a static library for Android
Reduces shared library count by one... This is tedious.

Change-Id: I3bdc0a5c4ee4cabf9bbcedc469ca6e94d0103d6b
2012-08-23 22:26:01 +03:00
Tor Lillqvist
07df4c9ed0 fileacc is in merged
Change-Id: If58adf2558c2baac51f91d621b75f2d37f935dfd
2012-08-23 22:26:00 +03:00
Tor Lillqvist
811751bbad Don't hardcode jni/Application.mk either
Change-Id: Id8787a04a3b1720490e7d79a254ca11835df242a
2012-08-23 12:37:21 +03:00
Tor Lillqvist
c02e838ec2 Factor out the Android APP_ABI sanely instead of copy-paste galore
Change-Id: I66e97d73c410ac6f2e481ba9b2b22183f57438bd
2012-08-23 12:28:59 +03:00
Tor Lillqvist
e9f3727313 Don't be shy
Change-Id: I806dcac11667abfd89a3202ed56e6370e18e185d
2012-08-20 17:36:06 +03:00
Matúš Kukan
4967a9d8f9 libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
2012-08-20 11:22:22 +02:00
Tor Lillqvist
ff8681a3b0 Add the fileacc library
Change-Id: Id6ef637ac0fec76ecea6be7aef6bbfc92a7f05ec
2012-08-20 09:49:17 +03:00
Matúš Kukan
5f9774ed5f merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
2012-08-13 01:48:57 +02:00
Tor Lillqvist
cc37b54230 Silence the annoyingly verbose vcl OSL_TRACEs
Change-Id: Ibd7c6ac56e56cf0e3e706a905603ef1a17a4579c
2012-08-09 10:53:42 +03:00
Tor Lillqvist
e8533bb028 Fix edit mistake, the point is to not include the SDK build.xml here
Change-Id: I3cfd5819be8075869906dac3b963b4d0b2cf2890
2012-08-09 10:53:41 +03:00
Michael Meeks
ab852cc0b6 android: share the clobbering of ant rules to not compress resources
Change-Id: Id2aa869f05b09dc22676d63390ec10bf575571ef
2012-08-03 10:50:21 +01:00
Tor Lillqvist
2d757306e2 Adapt architecture-specific bits from ../LibreOffice4Android/Makefile
Change-Id: I06ecb06df4df61fccc53477b5789a171e62248ec
2012-08-03 08:52:38 +03:00
Tor Lillqvist
963f417fa8 More NDK r8b adaptation
Change-Id: Ic65795a1b7bfe0435292f87f27ae39e2c3069fed
2012-07-31 09:55:08 +03:00
Tor Lillqvist
f7e4239ce4 Update for SDK tools rev 20
Change-Id: I482d0a488e9de5b59ce74b9c4057b4103fb048dc
2012-06-30 10:16:05 +03:00
Tor Lillqvist
8841e75d5a Hacking on on-demand multiple-level-of-detail quad-tree ideas
Change-Id: Ie5efb45d401721e844e3137474c1a7473a1ac144
2012-06-30 10:16:01 +03:00
Tor Lillqvist
c793a57f54 Use "largeHeap" and "hardwareAccelerated" (quite visible improvement)
Change-Id: I853ab39599fdc8d1b1eae5d2b2748f39535ebf64
2012-06-27 17:29:13 +03:00
Tor Lillqvist
0179c96282 Adapt page switch animation duration to fling velocity
Change-Id: I30e177b45b0e25d92fd7dea02ffe4e9c0731dce5
2012-06-27 12:58:50 +03:00
Tor Lillqvist
5bfb819581 Use GestureImageView again but still do handle page changes
Make the GestureImageView constructors take a OnGestureListener, and
store that, Move the FlingListener class into
GestureImageViewTouchListener so that FlingListener has access to the
fields of GestureImageViewTouchListener. If the image is fully zoomed
out and can't be dragged, pass flings on up, to DocumentLoader's
gestureListener.

Change-Id: I574280de23bdab2772a361833f561dff3e182bcd
2012-06-27 12:58:37 +03:00
Tor Lillqvist
6263315825 Whitespace cleanup
Change-Id: I52590908e6ba59c19aded2771d779c1cfa3a45ea
2012-06-27 12:56:31 +03:00
Iain Billett
478465f216 Fixed some erroneous package references. 2012-06-25 14:26:18 +01:00
Tor Lillqvist
cd43461697 Add some "thinking aloud" style comments
Change-Id: Ib4a57649ec98bcbce851687633f35e52771f137a
2012-06-25 09:12:11 +03:00
Iain Billett
a84eb85c35 Fixed file opening. 2012-06-22 21:28:50 +01:00
Tor Lillqvist
785221e74c Use actual view size instead of 1024x1024
Change-Id: I66ae59fe88411f3f0d2423fd6f1412f7ac0e1a36
2012-06-20 15:14:57 +03:00
Tor Lillqvist
08a1763147 Parametrize the page cache size
Change-Id: Ia3d5538feaf1fc0aad4a0f1d901ae7bd22eae61d
2012-06-20 15:14:43 +03:00
Tor Lillqvist
f3748935be Further tweaks to the async code
Change-Id: Ib1e76687054a254a9918a4391a1cb512c59c6515
2012-06-20 12:40:51 +03:00
Tor Lillqvist
7bcadeadfe Asynchronous document loading and page rendering
Change-Id: I085024b6bfccf6846167a5de316912a395f4e301
2012-06-19 19:29:41 +03:00
Tor Lillqvist
daaa550121 Pass also scale and offset to createScreenCompatibleDeviceUsingBuffer()
Pass on to VirtualDevice where used to set the MapMode of the device
appropriately. Adapt DocumentLoader, use to scale the page rendering
to exactly fit the virtual device.

Change-Id: I4b0bc67e12114d3d9d493ff1aca2ef5d2cc78912
2012-06-18 22:38:41 +03:00
Tor Lillqvist
61c6c7f8f7 Experiment with ViewFlipper
Change-Id: I0b1523b5c898375b5cf23294b0a9462a6a651e32
2012-06-14 22:03:48 +03:00
Tor Lillqvist
3ea3c6afa2 Use XToolkit2::createScreenCompatibleDeviceUsingBuffer
Render directly to a direct ByteBuffer allocated on the Java side.

Change-Id: I2d66e4146df77e92260918a78ef22cd9b8c95384
2012-06-12 13:50:50 +03:00
Tor Lillqvist
e243a5b462 Verify that we do get the RGBX format DIB we expect
Change-Id: I9f44547fbc5e13daa297720dfd814d2192114125
2012-06-07 21:54:20 +03:00
Tor Lillqvist
8ae077379e Use 32bpp bitmaps on Android (and iOS)
Modify DocumentLoader correspondingly. Take Android bug 32588 into
account.

Ideal would be to extend the XDevice stuff, or something, so that one
could hand it a pre-allocated RGBA buffer into which the
drawing/rendering would go. Then one could get rid of the silly
convert-to-BMP phase, which prefixes the bitmap data with BMP and DIB
headers (and thus, I guess, has to copy and allocate another
copy). Will see.

Change-Id: I4597cd933db8faa8105dc8f19638d712d5d2238a
2012-06-05 17:17:41 +03:00
Tor Lillqvist
5dc2b43e46 Use Jason Polites's GestureImageView, and some cleanup
Change-Id: I916c36b3b55681cdf8f0d1ffd0236e54f3b67b86
2012-05-31 22:32:40 +03:00
Tor Lillqvist
8c803ef232 Display the rendered document
Change-Id: Ie0735d4eb903b38a44bef8110bf520cfde54cb09
2012-05-31 16:20:54 +03:00
Tor Lillqvist
82f6505456 Progress finally
Now I get (a page of) the document rendered into a
bitmap. Unfortunately css.awt.XBitmap::getDIB() provides an in-core
24-bit (BGR) BMP file. (Yes, despite the name, it's not just the DIB,
but is prefixed with a BMP file header.) Android's Image class wants
RGBA. Hmm.

Change-Id: Ie0effef20751e1959644861af358d81538b6d6ea
2012-05-31 00:00:51 +03:00
Tor Lillqvist
d69bcc9979 Getting closer, maybe
Change-Id: Ifcfdd33631c257d2cf6f54fe0d00444200f48335
2012-05-31 00:00:51 +03:00
Tor Lillqvist
e28ad1b5d8 More experimentation
Change-Id: I8ad45f173c4f2b37aca6506d9021e8346c17db16
2012-05-30 00:02:18 +03:00
Tor Lillqvist
05f786fd2e More clueless test hacking
Change-Id: I2623625380b11f3d6bf720387504b23ccce529e1
2012-05-24 17:41:52 +03:00
Tor Lillqvist
4ff08c21ce Don't bother with so many test docs
Change-Id: I725255224ae7a38d7a7843516b7ac979f79e0207
2012-05-24 17:41:51 +03:00
Tor Lillqvist
b93300d91e A bit more introspective debugging output...
Change-Id: Ibfafe0d6420ad59e12b9eed4847c89e57a18d679
2012-05-22 11:58:00 +03:00
Tor Lillqvist
40fab3bd05 Don't create the local.properties files in the source tree from configure
Change-Id: Ic87be0146360c5e32f1f12f255c897e051c9a50c
2012-05-16 18:59:28 +03:00
Tor Lillqvist
62f030133d Move the sleep (for attaching debugger) earlier
Change-Id: I3183ed3da25bd0fbd2121f235f209edb51a21d2e
2012-05-16 18:37:39 +03:00