diff options
Diffstat (limited to 'android')
36 files changed, 271 insertions, 369 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index f1a7aa91f77d..e0bd143eb81c 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -15,8 +15,7 @@ SODEST=libs/$(ANDROID_APP_ABI) OBJLOCAL=obj/local/$(ANDROID_APP_ABI) define COPYSO -cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ -cp $(1) $(OBJLOCAL)$(if $(2),/$(2)) + $(error COPYSO should not be used now with DISABLE_DYNLOADING) endef define COPYJAR diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index b97adfb6261a..2c8d2e7b31d1 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -62,21 +62,9 @@ public class Bootstrap extends NativeActivity String apkFile, String[] ld_library_path); - public static native boolean setup(int lo_main_ptr, - Object lo_main_argument, + public static native boolean setup(Object lo_main_argument, int lo_main_delay); - // This is not just a wrapper for the C library dlopen(), but also - // loads recursively dependent libraries. - public static native int dlopen(String library); - - // This is just a wrapper for the C library dlsym(). - public static native int dlsym(int handle, String symbol); - - // To be called after you are sure libgnustl_shared.so - // has been loaded - static native void patch_libgnustl_shared(); - // Extracts files in the .apk that need to be extraced into the app's tree static native void extract_files(); @@ -148,11 +136,6 @@ public class Bootstrap extends NativeActivity if (!setup(dataDir, activity.getApplication().getPackageResourcePath(), llpa)) return; - // We build LO code against the shared GNU C++ library - dlopen("libgnustl_shared.so"); - // and need to patch it. - patch_libgnustl_shared(); - // Extract files from the .apk that can't be used mmapped directly from it extract_files(); @@ -224,35 +207,8 @@ public class Bootstrap extends NativeActivity System.arraycopy(argv, 0, newargv, 1, argv.length); argv = newargv; - // Load the LO "program" here and look up lo_main - int loLib = dlopen(mainLibrary); - - if (loLib == 0) { - Log.i(TAG, String.format("Error: could not load %s", mainLibrary)); - mainLibrary = "libmergedlo.so"; - loLib = dlopen(mainLibrary); - if (loLib == 0) { - Log.i(TAG, String.format("Error: could not load fallback %s", mainLibrary)); - return; - } - } - - int lo_main = dlsym(loLib, "lo_main"); - if (lo_main == 0) { - Log.i(TAG, String.format("No lo_main in %s", mainLibrary)); - return; - } - - // Get extra libraries to load early, so that it's easier to debug - // them even with a buggy ndk-gdb that doesn't grok debugging - // information from libraries loaded after it has been attached to the - // process. - String extraLibs = getIntent().getStringExtra("lo-extra-libs"); - if (extraLibs != null) { - for (String lib : extraLibs.split(":")) { - dlopen(lib); - } - } + // Load the LO "program" here + System.loadLibrary(mainLibrary); // Start a strace on ourself if requested. @@ -272,7 +228,7 @@ public class Bootstrap extends NativeActivity delay = Integer.parseInt(sdelay); // Tell lo-bootstrap.c the stuff it needs to know - if (!setup(lo_main, argv, delay)) + if (!setup(argv, delay)) return; // Finally, call our super-class, NativeActivity's onCreate(), @@ -286,14 +242,12 @@ public class Bootstrap extends NativeActivity super.onCreate(savedInstanceState); } - // This is used to load the 'lo-bootstrap' library on application - // startup. The library has already been unpacked into - // /data/data/<app name>/lib/liblo-bootstrap.so at installation - // time by the package manager. + // Now with static loading we always have all native code in one native + // library which we always call liblo-native-code.so, regardless of the + // app. The library has already been unpacked into /data/data/<app + // name>/lib at installation time by the package manager. static { - System.loadLibrary("lo-bootstrap"); - System.loadLibrary("gnustl_shared"); - System.loadLibrary("libotouchlo"); + System.loadLibrary("lo-native-code"); } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java b/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java index 8340fb591bf8..8b5eebfc9e47 100755 --- a/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java +++ b/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java @@ -35,8 +35,6 @@ import com.actionbarsherlock.view.MenuItem; * <p>This class will manage interaction with a custom action bar based on the
* Android 4.0 source code. The exposed API mirrors that of its native
* counterpart and you should refer to its documentation for instruction.</p>
- *
- * @author Jake Wharton <jakewharton@gmail.com>
*/
public abstract class ActionBarSherlock {
protected static final String TAG = "ActionBarSherlock";
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index d4504092830c..d9e7c88830bd 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -19,15 +19,22 @@ APP_DATA_PATH=/data/data/$(APP_PACKAGE) SODEST=libs/$(ANDROID_APP_ABI) OBJLOCAL=obj/local/$(ANDROID_APP_ABI) -define COPYSO -cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ -cp $(1) $(OBJLOCAL)$(if $(2),/$(2)) -endef - define COPYJAR cp $(1) libs endef +LIBS = \ + -Wl,--start-group \ + $(wildcard $(OUTDIR)/lib/lib*.a) \ + -Wl,--end-group + +WHOLELIBS = \ + -Wl,--whole-archive \ + $(addprefix -l,$(strip \ + juh \ + )) \ + -Wl,--no-whole-archive + # The default target just builds. all: build-ant @@ -39,87 +46,16 @@ properties: echo "APP_ABI := $(ANDROID_APP_ABI)" >>jni/Application.mk echo "APP_PLATFORM := android-14" >>jni/Application.mk +link-so: +# Build the single .so for this app + mkdir -p $(OBJLOCAL) + $(CXX) -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + mkdir -p $(SODEST) + cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) + $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so + copy-stuff: -# First always clean - rm -rf libs $(OBJLOCAL) - mkdir -p $(SODEST) $(OBJLOCAL) -# -# Copy shared libraries (including UNO components) we need to -# libs/$(ANDROID_APP_ABI) so that ant will include them in the .apk. -# -# Copy them to obj/local/$(ANDROID_APP_ABI), too, where gdb will look for -# them. -# - for F in $(strip \ - basegfxlo \ - bootstrap.uno \ - comphelpgcc3 \ - dbaxmllo \ - dbtoolslo \ - expwrap.uno \ - frmlo \ - gcc3_uno \ - i18nisolang1gcc3 \ - icudatalo \ - icui18nlo \ - iculelo \ - icuuclo \ - introspection.uno \ - java_uno \ - juh \ - juhx \ - jvmaccessgcc3 \ - jvmfwk \ - libotouchlo \ - lo-bootstrap \ - localedata_en \ - localedata_others \ - lwpftlo \ - mergedlo \ - msfilterlo \ - mswordlo \ - ooxlo \ - reflection.uno \ - reg \ - sclo \ - scdlo \ - scfiltlo \ - sddlo \ - smdlo \ - stocservices.uno \ - store \ - svgfilterlo \ - swdlo \ - swlo \ - t602filterlo \ - textinstream.uno \ - tllo \ - ucbhelper4gcc3 \ - ucppkg1 \ - uno_cppu \ - uno_cppuhelpergcc3 \ - uno_sal \ - uno_salhelpergcc3 \ - uno_cppuhelpergcc3 \ - unordflo \ - unoxmllo \ - vbahelperlo \ - vbaswobj.uno \ - wpftdrawlo \ - wpftwriterlo \ - xml2 \ - xmlfdlo \ - xmlreader \ - xmlsecurity \ - xslt \ - ); do \ - $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \ - done -# -# Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ANDROID_APP_ABI)/libgnustl_shared.so) -# -# Then other "assets". Let the directory structure under assets mimic +# Then "assets". Let the directory structure under assets mimic # that under solver for now. # # Please note that I have no idea what all of this is really necessary and for @@ -216,10 +152,11 @@ copy-stuff: # # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # + mkdir -p $(SODEST) cp $(ANDROID_NDK_GDBSERVER) $(SODEST) echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup -build-ant: copy-stuff properties +build-ant: copy-stuff link-so properties # # Copy jar files we need # @@ -246,7 +183,6 @@ uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) run: -# /data/local/tmp/sample-document.odt adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx new file mode 100644 index 000000000000..d4ef4b0e82fe --- /dev/null +++ b/android/experimental/DocumentLoader/native-code.cxx @@ -0,0 +1,100 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "osl/detail/android-bootstrap.h" + +extern "C" +{ + extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fileacc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xof_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +} + +extern "C" +__attribute__ ((visibility("default"))) +const lib_to_component_mapping * +lo_get_libmap(void) +{ + static lib_to_component_mapping map[] = { + { "libavmedialo.a", avmedia_component_getFactory }, + { "libdbaxmllo.a", dbaxml_component_getFactory }, + { "libevtattlo.a", evtatt_component_getFactory }, + { "libfileacc.a", fileacc_component_getFactory }, + { "libfrmlo.a", frm_component_getFactory }, + { "libfsstorage.uno.a", fsstorage_component_getFactory }, + { "libfwklo.a", fwk_component_getFactory }, + { "libfwllo.a", fwl_component_getFactory }, + { "libfwmlo.a", fwm_component_getFactory }, + { "libhwplo.a", hwp_component_getFactory }, + { "libhyphenlo.a", hyphen_component_getFactory }, + { "liblnglo.a", lng_component_getFactory }, + { "liblnthlo.a", lnth_component_getFactory }, + { "liblwpftlo.a", lotuswordpro_component_getFactory }, + { "libooxlo.a", oox_component_getFactory }, + { "libscdlo.a", scd_component_getFactory }, + { "libscfiltlo.a", scfilt_component_getFactory }, + { "libsblo.a", sb_component_getFactory }, + { "libsclo.a", sc_component_getFactory }, + { "libsddlo.a", sdd_component_getFactory }, + { "libsdlo.a", sd_component_getFactory }, + { "libsmdlo.a", smd_component_getFactory }, + { "libsmlo.a", sm_component_getFactory }, + { "libsvgfilterlo.a", svgfilter_component_getFactory }, + { "libswdlo.a", swd_component_getFactory }, + { "libswlo.a", sw_component_getFactory }, + { "libt602filterlo.a", t602filter_component_getFactory }, + { "libtextfdlo.a", textfd_component_getFactory }, + { "libunordflo.a", unordf_component_getFactory }, + { "libunoxmllo.a", unoxml_component_getFactory }, + { "libwpftdrawlo.a", wpftdraw_component_getFactory }, + { "libwpftwriterlo.a", wpftwriter_component_getFactory }, + { "libxmlfdlo.a", xmlfd_component_getFactory }, + { "libxmlsecurity.a", xmlsecurity_component_getFactory }, + { "libxoflo.a", xof_component_getFactory }, + { "libxolo.a", xo_component_getFactory }, + { NULL, NULL } + }; + + return map; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/experimental/DocumentLoader/src/com/polites/android/Animation.java b/android/experimental/DocumentLoader/src/com/polites/android/Animation.java index 993620893f91..a0d218b1e552 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/Animation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/Animation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public interface Animation { /** diff --git a/android/experimental/DocumentLoader/src/com/polites/android/Animator.java b/android/experimental/DocumentLoader/src/com/polites/android/Animator.java index fb0728b7bf13..6fc82f127503 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/Animator.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/Animator.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class Animator extends Thread { private GestureImageView view; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java index 3124b6201464..9afd54969b50 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public class FlingAnimation implements Animation { private float velocityX; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java index b9611d51c040..8f0dd3d77e79 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface FlingAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java b/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java index 4a52358216d5..487620a7c225 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author jasonpolites - * - */ public interface GestureImageViewListener { public void onTouch(float x, float y); diff --git a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java index 5303d646672b..8cdebb61838a 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class MoveAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java index a19a265e5844..4574caa3a938 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface MoveAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java index 673b7f9cb148..c709a1b7b513 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java @@ -17,11 +17,6 @@ package com.polites.android; import android.graphics.PointF; - -/** - * @author Jason Polites - * - */ public class ZoomAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java index 8df4bf641952..21b6ec9a6fb0 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface ZoomAnimationListener { public void onZoom(float scale, float x, float y); public void onComplete(); diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java index 638c9b950a05..e1e7506a75af 100644 --- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java +++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java @@ -597,6 +597,7 @@ public class DocumentLoader final int level, final int location) { + Log.i(TAG, "renderPage(" + number + ", " + level + ", " + location + ")"); try { // Use dummySmallDevice with no scale or offset just to find out // the paper size of this page. @@ -727,6 +728,8 @@ public class DocumentLoader { int number = params[0]; + Log.i(TAG, "doInBackground(" + number + ")"); + if (number >= pageCount) return -1; @@ -929,13 +932,7 @@ public class DocumentLoader Bootstrap.setup(this); // Avoid all the old style OSL_TRACE calls especially in vcl - Bootstrap.putenv("SAL_LOG=+WARN+INFO-INFO.legacy.osl"); - - // Load a lot of shlibs here explicitly in advance because that - // makes debugging work better, sigh - Bootstrap.dlopen("libmergedlo.so"); - Bootstrap.dlopen("libswdlo.so"); - Bootstrap.dlopen("libswlo.so"); + Bootstrap.putenv("SAL_LOG=+WARN+INFO"); // Log.i(TAG, "Sleeping NOW"); // Thread.sleep(20000); diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java index 5f3229119bcd..d747e2ebf138 100644 --- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java +++ b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java @@ -30,9 +30,6 @@ import android.util.Log; /** * Mesh is a base class for 3D objects making it easier to create and maintain * new primitives. - * - * @author Per-Erik Bergman (per-erik.bergman@jayway.com) - * */ public class Mesh { // Our vertex buffer. @@ -259,4 +256,4 @@ public class Mesh { GLUtils.texImage2D(GL10.GL_TEXTURE_2D, 0, mBitmap, 0); Log.d("gl-load-texture", Integer.toString(mTextureId) ); } -}
\ No newline at end of file +} diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 3f0be60a46d5..f81e814e56be 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -1,102 +1,36 @@ include ../../../config_host.mk -include ../../Bootstrap/Makefile.shared -# The package of this app -APP_PACKAGE=org.libreoffice +LIBS = \ + -Wl,--start-group \ + $(wildcard $(OUTDIR)/lib/lib*.a) \ + -Wl,--end-group + +WHOLELIBS = \ + -Wl,--whole-archive \ + $(addprefix -l,$(strip \ + juh \ + )) \ + -Wl,--no-whole-archive # The default target just builds. all: build-ant +include ../../Bootstrap/Makefile.shared + +# The package of this app +APP_PACKAGE=org.libreoffice + +link-so: +# Build the single .so for this app + mkdir -p $(OBJLOCAL) + $(CXX) -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + mkdir -p $(SODEST) + cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) + $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so + copy-stuff: -# First always clean - rm -rf libs $(OBJLOCAL) - mkdir -p $(SODEST) $(OBJLOCAL) -# -# Copy shared libraries (including UNO components) we need to -# libs/$(ANDROID_APP_ABI) so that ant will include them in the .apk. -# -# Copy them to obj/local/$(ANDROID_APP_ABI), too, where gdb will look for -# them. -# - for F in $(strip \ - basegfxlo \ - bootstrap.uno \ - chartcontrollerlo \ - chartcorelo \ - comphelpgcc3 \ - dbaxmllo \ - dbtoolslo \ - expwrap.uno \ - frmlo \ - gcc3_uno \ - i18nisolang1gcc3 \ - icudatalo \ - icui18nlo \ - iculelo \ - icuuclo \ - introspection.uno \ - java_uno \ - juh \ - juhx \ - jvmaccessgcc3 \ - jvmfwk \ - libotouchlo \ - lo-bootstrap \ - localedata_en \ - localedata_es \ - localedata_euro \ - localedata_others \ - lwpftlo \ - mergedlo \ - msfilterlo \ - mswordlo \ - ooxlo \ - reflection.uno \ - reg \ - sclo \ - sclo \ - scdlo \ - scfiltlo \ - sdlo \ - sddlo \ - smdlo \ - stocservices.uno \ - store \ - svgfilterlo \ - swdlo \ - swlo \ - swdlo \ - t602filterlo \ - textinstream.uno \ - tllo \ - ucbhelper4gcc3 \ - ucppkg1 \ - uno_cppu \ - uno_cppuhelpergcc3 \ - uno_sal \ - uno_salhelpergcc3 \ - uno_cppuhelpergcc3 \ - unordflo \ - unoxmllo \ - vbahelperlo \ - vbaswobj.uno \ - wpftdrawlo \ - wpftwriterlo \ - xml2 \ - xmlfdlo \ - xmlreader \ - xmlsecurity \ - xoflo \ - xslt \ - ); do \ - $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \ - done -# -# Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ANDROID_APP_ABI)/libgnustl_shared.so) -# -# Then other "assets". Let the directory structure under assets mimic +# Then "assets". Let the directory structure under assets mimic # that under solver for now. # # Please note that I have no idea what all of this is really necessary and for @@ -195,10 +129,11 @@ copy-stuff: # # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # + mkdir -p $(SODEST) cp $(ANDROID_NDK_GDBSERVER) $(SODEST) echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup -build-ant: copy-stuff properties +build-ant: copy-stuff link-so properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties # ActionBarSherlock uses the v4 support library, apparently one needs to copy # it like this for it to be found @@ -221,6 +156,4 @@ build-ant: copy-stuff properties unset JAVA_HOME && $(ANT) debug run: -# /data/local/tmp/sample-document.odt -# add -e lo-strace to strace - adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e lo-strace -e input /assets/test1.odt + adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx new file mode 100644 index 000000000000..d4ef4b0e82fe --- /dev/null +++ b/android/experimental/LibreOffice4Android/native-code.cxx @@ -0,0 +1,100 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "osl/detail/android-bootstrap.h" + +extern "C" +{ + extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fileacc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * xof_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +} + +extern "C" +__attribute__ ((visibility("default"))) +const lib_to_component_mapping * +lo_get_libmap(void) +{ + static lib_to_component_mapping map[] = { + { "libavmedialo.a", avmedia_component_getFactory }, + { "libdbaxmllo.a", dbaxml_component_getFactory }, + { "libevtattlo.a", evtatt_component_getFactory }, + { "libfileacc.a", fileacc_component_getFactory }, + { "libfrmlo.a", frm_component_getFactory }, + { "libfsstorage.uno.a", fsstorage_component_getFactory }, + { "libfwklo.a", fwk_component_getFactory }, + { "libfwllo.a", fwl_component_getFactory }, + { "libfwmlo.a", fwm_component_getFactory }, + { "libhwplo.a", hwp_component_getFactory }, + { "libhyphenlo.a", hyphen_component_getFactory }, + { "liblnglo.a", lng_component_getFactory }, + { "liblnthlo.a", lnth_component_getFactory }, + { "liblwpftlo.a", lotuswordpro_component_getFactory }, + { "libooxlo.a", oox_component_getFactory }, + { "libscdlo.a", scd_component_getFactory }, + { "libscfiltlo.a", scfilt_component_getFactory }, + { "libsblo.a", sb_component_getFactory }, + { "libsclo.a", sc_component_getFactory }, + { "libsddlo.a", sdd_component_getFactory }, + { "libsdlo.a", sd_component_getFactory }, + { "libsmdlo.a", smd_component_getFactory }, + { "libsmlo.a", sm_component_getFactory }, + { "libsvgfilterlo.a", svgfilter_component_getFactory }, + { "libswdlo.a", swd_component_getFactory }, + { "libswlo.a", sw_component_getFactory }, + { "libt602filterlo.a", t602filter_component_getFactory }, + { "libtextfdlo.a", textfd_component_getFactory }, + { "libunordflo.a", unordf_component_getFactory }, + { "libunoxmllo.a", unoxml_component_getFactory }, + { "libwpftdrawlo.a", wpftdraw_component_getFactory }, + { "libwpftwriterlo.a", wpftwriter_component_getFactory }, + { "libxmlfdlo.a", xmlfd_component_getFactory }, + { "libxmlsecurity.a", xmlsecurity_component_getFactory }, + { "libxoflo.a", xof_component_getFactory }, + { "libxolo.a", xo_component_getFactory }, + { NULL, NULL } + }; + + return map; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java index 993620893f91..a0d218b1e552 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public interface Animation { /** diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java b/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java index fb0728b7bf13..6fc82f127503 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class Animator extends Thread { private GestureImageView view; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java index 3124b6201464..9afd54969b50 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public class FlingAnimation implements Animation { private float velocityX; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java index b9611d51c040..8f0dd3d77e79 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface FlingAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java index ab3007a14b00..cf6f45bc2875 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java @@ -18,11 +18,6 @@ package com.polites.android; import android.view.GestureDetector.SimpleOnGestureListener; import android.view.MotionEvent; - -/** - * @author Jason Polites - * - */ public class FlingListener extends SimpleOnGestureListener { private float velocityX; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java index 4a52358216d5..487620a7c225 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author jasonpolites - * - */ public interface GestureImageViewListener { public void onTouch(float x, float y); diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java index 5303d646672b..8cdebb61838a 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class MoveAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java index a19a265e5844..4574caa3a938 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface MoveAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java index 673b7f9cb148..c709a1b7b513 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java @@ -17,11 +17,6 @@ package com.polites.android; import android.graphics.PointF; - -/** - * @author Jason Polites - * - */ public class ZoomAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java index 8df4bf641952..21b6ec9a6fb0 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface ZoomAnimationListener { public void onZoom(float scale, float x, float y); public void onComplete(); diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java index 5fc3fad2a950..601e583268d7 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java @@ -961,12 +961,6 @@ public class DocumentLoader // Avoid all the old style OSL_TRACE calls especially in vcl Bootstrap.putenv("SAL_LOG=+WARN+INFO-INFO.legacy.osl"); - // Load a lot of shlibs here explicitly in advance because that - // makes debugging work better, sigh - Bootstrap.dlopen("libmergedlo.so"); - Bootstrap.dlopen("libswdlo.so"); - Bootstrap.dlopen("libswlo.so"); - // Log.i(TAG, "Sleeping NOW"); // Thread.sleep(20000); diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java index 70ca6f6cf71a..d47d25599066 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -139,11 +139,6 @@ public class LibreOfficeUIActivity extends SherlockActivity implements ActionBar Bootstrap.putenv("SAL_LOG=yes"); - // Load a lot of shlibs here explicitly in advance because that - // makes debugging work better, sigh - Bootstrap.dlopen("libmergedlo.so"); - Bootstrap.dlopen("libswdlo.so"); - Bootstrap.dlopen("libswlo.so"); } public void createUI(){ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java index ba8cc9887a7a..f7846b01bfdd 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java @@ -21,8 +21,6 @@ import android.support.v4.content.LocalBroadcastManager; /** * Standard Network client. Connects to a server using Sockets. - * - * @author Andrzej J.R. Hunt */ public class BluetoothClient extends Client { @@ -88,4 +86,4 @@ public class BluetoothClient extends Client { } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java index 5e6a50b937f1..4f90eb246091 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java @@ -22,8 +22,6 @@ import android.content.Intent; * transport medium you must provide input and output streams ( * <code>mInputStream</code> and <code>mOutputStream</code> before calling any * methods. - * - * @author Andrzej J.R. Hunt */ public abstract class Client { @@ -139,4 +137,4 @@ public abstract class Client { } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java index ff49a537a567..3da51544d3a1 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java @@ -22,8 +22,6 @@ import android.support.v4.content.LocalBroadcastManager; /** * Standard Network client. Connects to a server using Sockets. - * - * @author Andrzej J.R. Hunt */ public class NetworkClient extends Client { @@ -133,4 +131,4 @@ public class NetworkClient extends Client { } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java index 1a9560456f92..480324e64fb5 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java @@ -12,8 +12,6 @@ import android.graphics.Color; /** * Interface to send commands to the server. - * - * @author Andrzej J.R. Hunt */ public class Transmitter { @@ -68,4 +66,4 @@ public class Transmitter { mClient.sendCommand("presentation_stop\n\n"); } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java b/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java index 88f0da6d3623..1328d45294f2 100644 --- a/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java +++ b/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java @@ -16,7 +16,6 @@ * This code is base on the Android Gallery widget and was Created * by Neil Davies neild001 'at' gmail dot com to be a Coverflow widget * - * @author Neil Davies */ package pl.polidea.coverflow; @@ -385,4 +384,4 @@ public class CoverFlow extends Gallery { } } -}
\ No newline at end of file +} diff --git a/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java b/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java index f16c11259da4..009a69b34ccb 100644 --- a/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java +++ b/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java @@ -32,9 +32,6 @@ import android.graphics.Shader.TileMode; /** * This adapter provides reflected images from linked adapter. - * - * @author potiuk - * */ public class ReflectingImageAdapter extends AbstractCoverFlowImageAdapter { |