android/qa/desktop/Makefile | 14 ++++++++++++++ android/qa/desktop/fonts.conf | 21 +++++++++++++++++++++ desktop/source/app/app.cxx | 6 +++--- vcl/android/androidinst.cxx | 14 +++++++++++--- 4 files changed, 49 insertions(+), 6 deletions(-)
New commits: commit c2aab432b172e0d1974139e62f64e36aa3dbfb85 Author: Michael Meeks <michael.me...@suse.com> Date: Tue Jan 31 17:39:05 2012 +0000 android: get BGR to RGB swap right in conversion diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 02219c8..b20d7c4 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -231,9 +231,9 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer *pOutBuffer, nDestX * 4 /* dest pixel size */ ); for (unsigned int x = 0; x < (unsigned int)(aSrcRect.right - aSrcRect.left); x++) { - dp[x*4 + 0] = sp[x*3 + 0]; // B + dp[x*4 + 0] = sp[x*3 + 2]; // R dp[x*4 + 1] = sp[x*3 + 1]; // G - dp[x*4 + 2] = sp[x*3 + 2]; // R + dp[x*4 + 2] = sp[x*3 + 0]; // B dp[x*4 + 3] = 255; // A } break; commit 9634eec8e123c0860f2716039570dd91a9839943 Author: Michael Meeks <michael.me...@suse.com> Date: Tue Jan 31 17:33:40 2012 +0000 android: debug / dump multi-touch events diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 081f11b..02219c8 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -443,11 +443,19 @@ int32_t AndroidSalInstance::onInputEvent (struct android_app* app, AInputEvent* } case AINPUT_EVENT_TYPE_MOTION: { - fprintf (stderr, "motion event %d %g %g %s\n", + size_t nPoints = AMotionEvent_getPointerCount(event); + fprintf (stderr, "motion event %d %g,%g %d points: %s\n", AMotionEvent_getAction(event), AMotionEvent_getXOffset(event), AMotionEvent_getYOffset(event), + (int)nPoints, MotionEdgeFlagsToString(AMotionEvent_getEdgeFlags(event)).getStr()); + for (size_t i = 0; i < nPoints; i++) + fprintf(stderr, "\t%d: %g,%g - pressure %g\n", + (int)i, + AMotionEvent_getX(event, i), + AMotionEvent_getY(event, i), + AMotionEvent_getPressure(event, i)); break; } default: commit 755227bf6dd5d8061869e68f5c970780a5e3b53b Author: Michael Meeks <michael.me...@suse.com> Date: Tue Jan 31 17:32:09 2012 +0000 android: get non-modal message dialog up, and continue to main app execute diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 6101827..966bebb 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1863,9 +1863,9 @@ int Desktop::Main() ::plasma_now("pre hit execute!"); // For some reason we're not getting a desktop frame or component [odd] - ErrorBox aKickStartVCL( NULL, WB_OK, rtl::OUString::createFromAscii("Title!") ); - aKickStartVCL.SetText( rtl::OUString::createFromAscii("Foo") ); - aKickStartVCL.Execute(); + ErrorBox aKickStartVCL( NULL, WB_OK, rtl::OUString::createFromAscii("My very own title!") ); + aKickStartVCL.SetText( rtl::OUString::createFromAscii("Delphic Utterance") ); + aKickStartVCL.Show(); // don't execute - just leave it lying around .... ::plasma_now("hit execute!"); commit 96445c9520a252fdb41c934cc77764c200c086af Author: Michael Meeks <michael.me...@suse.com> Date: Tue Jan 31 17:30:27 2012 +0000 android: try to get skeletal fonts into fontconfig setup diff --git a/android/qa/desktop/fonts.conf b/android/qa/desktop/fonts.conf index 0e92c5d..64d714c 100644 --- a/android/qa/desktop/fonts.conf +++ b/android/qa/desktop/fonts.conf @@ -7,6 +7,27 @@ <dir>/system/fonts</dir> + <alias> + <family>serif</family> + <prefer> + <family>DroidSerif</family> + <family>Roboto</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> + <family>Roboto</family> + <family>DroidSerif</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> + <family>DroidSansMono</family> + </prefer> + </alias> + <!-- Accept deprecated 'mono' alias, replacing it with 'monospace' --> commit 498fc0b198f81e4f2aa2e69f60b7877f6db3dd0c Author: Michael Meeks <michael.me...@suse.com> Date: Tue Jan 31 17:22:20 2012 +0000 android: package more components needed for writer diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 876c432..3475248 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -104,13 +104,19 @@ copy-stuff: buildrcs # Libs and UNO components that we need. # for F in $(strip \ + analysislo \ + avmedialo \ basebmplo \ basegfxlo \ bootstrap.uno \ + canvastoolslo \ comphelpgcc3 \ configmgr.uno \ + cppcanvaslo \ deployment \ deploymentmisclo \ + drawinglayerlo \ + editenglo \ fileacc \ fontconfig \ forlo \ @@ -139,6 +145,7 @@ copy-stuff: buildrcs msfilterlo \ ooxlo \ package2 \ + reflection.uno \ reg \ saxlo \ sblo \ @@ -150,6 +157,8 @@ copy-stuff: buildrcs store \ svllo \ svtlo \ + svxlo \ + svxcorelo \ test \ tklo \ tllo \ @@ -170,6 +179,11 @@ copy-stuff: buildrcs xcrlo \ xml2 \ xmlreader \ + xolo \ + xstor \ + \ + swlo \ + swdlo \ ); do \ $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \ done _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits