Commit Graph

43 Commits

Author SHA1 Message Date
be1bb7b1cc java: use Boolean.valueOf instead of instantiating Boolean objects
Change-Id: Ie41d6b0170a035a694dd270c311a137fd1810e74
2014-08-19 14:57:16 +02:00
33ab92fe56 android: make this a bit more readable
Change-Id: I765458daa808245ec736a3d184ba64c2dcd3a10b
2012-11-26 09:30:51 +01:00
593e4a11ed android: extract duplicated casts to helper methods
Change-Id: Ib77731839ad9e46626a7a07d4b2c6c7e32d4bba1
2012-11-26 09:30:51 +01:00
a3b8cfa65c android: clean up no longer needed onSaveInstanceState()
It could not be used to save whole objects, so get rid of it and use
onRetainNonConfigurationInstance() exclusively.

Change-Id: I7cc3951b60a054b5b2488b49791b58707dc8a68b
2012-11-22 15:56:58 +01:00
3ef3601f79 android: add 'go to page' menu item
Change-Id: Ie9d04ef9aeef5cacd1c3b8557111ee3a6194ccd4
2012-11-21 17:16:30 +01:00
4460f406a4 android: don't load the document after every rotation
Change-Id: I0af154bc5bc6cc79ab45a85a5a06e4539442ec81
2012-11-20 12:51:00 +01:00
a1d9caffa3 android: move toolkit and dummySmallDevice to bootstrapContext as well
Change-Id: I4b6ce49aa5e6d391e832dc1023e47d694a480948
2012-11-20 12:10:52 +01:00
4c359c22e1 android: don't bootstrap after every rotation in DocumentLoader
It seems that previously onCreate served 3 different purposes:

1) bootstrap UNO machinery
2) load the document
3) create the view

Ideally it should do the first two only if not done already -- as a
first step, this commit extracts 1) and does only once.

Change-Id: I087a6b934c05295263080f571c95ef152e4602cb
2012-11-20 11:02:25 +01:00
677ca1d596 android: remember displayed page during rotation in DocumentLoader
Change-Id: I1948dcc76026e4c906407932aa67371e5e9e8bb6
2012-11-13 14:25:52 +01:00
f252b332dd fdo#46808, renamet awt::XToolkit2 to XToolkitExperimental..
..because we want to use the name for the new merged interface
for the Toolkit service.

Change-Id: Ib1e193c7d04729f6420ee6984231fd50181e59d3
2012-10-24 16:49:49 +02:00
d8feea6c28 Seems that on the emulator the y scale is -1, huh
Change-Id: I1ad30e278a5b04de3ee544c30c38f4765539157d
2012-10-22 15:18:29 +03:00
8ede8ee2ce Some more logging
Change-Id: Ib901de4a10cb18ce8e1f5d0293c61ab0eed2a4e8
2012-10-11 10:07:07 +03:00
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
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
e989d16748 dung out no longer needed initUCBHelper methods; thanks to sberg. 2012-09-19 18:41:45 +01:00
4967a9d8f9 libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
2012-08-20 11:22:22 +02:00
cc37b54230 Silence the annoyingly verbose vcl OSL_TRACEs
Change-Id: Ibd7c6ac56e56cf0e3e706a905603ef1a17a4579c
2012-08-09 10:53:42 +03:00
8841e75d5a Hacking on on-demand multiple-level-of-detail quad-tree ideas
Change-Id: Ie5efb45d401721e844e3137474c1a7473a1ac144
2012-06-30 10:16:01 +03:00
0179c96282 Adapt page switch animation duration to fling velocity
Change-Id: I30e177b45b0e25d92fd7dea02ffe4e9c0731dce5
2012-06-27 12:58:50 +03:00
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
6263315825 Whitespace cleanup
Change-Id: I52590908e6ba59c19aded2771d779c1cfa3a45ea
2012-06-27 12:56:31 +03:00
478465f216 Fixed some erroneous package references. 2012-06-25 14:26:18 +01:00
cd43461697 Add some "thinking aloud" style comments
Change-Id: Ib4a57649ec98bcbce851687633f35e52771f137a
2012-06-25 09:12:11 +03:00
a84eb85c35 Fixed file opening. 2012-06-22 21:28:50 +01:00
785221e74c Use actual view size instead of 1024x1024
Change-Id: I66ae59fe88411f3f0d2423fd6f1412f7ac0e1a36
2012-06-20 15:14:57 +03:00
08a1763147 Parametrize the page cache size
Change-Id: Ia3d5538feaf1fc0aad4a0f1d901ae7bd22eae61d
2012-06-20 15:14:43 +03:00
f3748935be Further tweaks to the async code
Change-Id: Ib1e76687054a254a9918a4391a1cb512c59c6515
2012-06-20 12:40:51 +03:00
7bcadeadfe Asynchronous document loading and page rendering
Change-Id: I085024b6bfccf6846167a5de316912a395f4e301
2012-06-19 19:29:41 +03:00
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
61c6c7f8f7 Experiment with ViewFlipper
Change-Id: I0b1523b5c898375b5cf23294b0a9462a6a651e32
2012-06-14 22:03:48 +03:00
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
e243a5b462 Verify that we do get the RGBX format DIB we expect
Change-Id: I9f44547fbc5e13daa297720dfd814d2192114125
2012-06-07 21:54:20 +03:00
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
5dc2b43e46 Use Jason Polites's GestureImageView, and some cleanup
Change-Id: I916c36b3b55681cdf8f0d1ffd0236e54f3b67b86
2012-05-31 22:32:40 +03:00
8c803ef232 Display the rendered document
Change-Id: Ie0735d4eb903b38a44bef8110bf520cfde54cb09
2012-05-31 16:20:54 +03:00
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
d69bcc9979 Getting closer, maybe
Change-Id: Ifcfdd33631c257d2cf6f54fe0d00444200f48335
2012-05-31 00:00:51 +03:00
e28ad1b5d8 More experimentation
Change-Id: I8ad45f173c4f2b37aca6506d9021e8346c17db16
2012-05-30 00:02:18 +03:00
05f786fd2e More clueless test hacking
Change-Id: I2623625380b11f3d6bf720387504b23ccce529e1
2012-05-24 17:41:52 +03:00
b93300d91e A bit more introspective debugging output...
Change-Id: Ibfafe0d6420ad59e12b9eed4847c89e57a18d679
2012-05-22 11:58:00 +03:00
62f030133d Move the sleep (for attaching debugger) earlier
Change-Id: I3183ed3da25bd0fbd2121f235f209edb51a21d2e
2012-05-16 18:37:39 +03:00
409f117e1c Enable loading of several documents, and do that then 2012-04-20 00:57:23 +03:00
4b663231f6 Move DocumentLoader to the "experimental" subdirectory 2012-04-18 10:01:59 +03:00