diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-10-03 19:39:55 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-10-03 22:54:37 +0200 |
commit | de376cb1c42543cd7717b0de88056ed4ab8af6d4 (patch) | |
tree | 004d79a951894d35331e1525c4a6c8b11bec8861 /android | |
parent | Web Wizard, ftp part: fix logic for dialog (diff) | |
download | core-de376cb1c42543cd7717b0de88056ed4ab8af6d4.tar.gz core-de376cb1c42543cd7717b0de88056ed4ab8af6d4.zip |
android: remove no longer used files
Change-Id: Id3b71ac50e3c8ce9705f6df18edaaaa6ba8ad3fd
Diffstat (limited to 'android')
15 files changed, 4 insertions, 227 deletions
diff --git a/android/Bootstrap/AndroidManifest.xml b/android/Bootstrap/AndroidManifest.xml index 69c83e5a2224..b602c871dc58 100644 --- a/android/Bootstrap/AndroidManifest.xml +++ b/android/Bootstrap/AndroidManifest.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.libreoffice.android" + package="org.libreoffice.kit" android:versionCode="1" android:versionName="1.0"> <application> - <activity android:name="org.libreoffice.android.Bootstrap" /> + <activity android:name="org.libreoffice.kit.LibreOfficeKit" /> </application> </manifest> diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java deleted file mode 100644 index ca7d48b0cc27..000000000000 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ /dev/null @@ -1,105 +0,0 @@ -// -*- Mode: Java; 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/. -// - -package org.libreoffice.android; - -import android.app.Activity; -import android.content.pm.ApplicationInfo; -import android.util.Log; - -import java.io.InputStream; - -// final because subclassing would be meaningless. -public final class Bootstrap -{ - // private constructor because instantiating would be meaningless - private Bootstrap() - { - } - - private static String TAG = "lo-bootstrap"; - - // Native methods in this class are all implemented in - // sal/android/lo-bootstrap.c as the lo-bootstrap library is loaded with - // System.loadLibrary() and Android's JNI works only to such libraries, it - // seems. - - private static native boolean setup(String dataDir, - String cacheDir, - String apkFile); - - // Wrapper for getpid() - public static native int getpid(); - - // Wrapper for system() - public static native void system(String cmdline); - - // Wrapper for putenv() - public static native void putenv(String string); - - // A wrapper for osl_setCommandArgs(). Before calling - // osl_setCommandArgs(), argv[0] is prefixed with the parent directory of - // where the lo-bootstrap library is. - public static native void setCommandArgs(String[] argv); - - // A method that starts a thread to redirect stdout and stderr writes to - // the Android logging mechanism, or stops the redirection. - public static native void redirect_stdio(boolean state); - - static boolean setup_done = false; - - // This setup() method should be called from the upper Java level of - // LO-based apps. - public static synchronized void setup(Activity activity) - { - if (setup_done) - return; - - setup_done = true; - - String dataDir = null; - - ApplicationInfo ai = activity.getApplicationInfo(); - dataDir = ai.dataDir; - Log.i(TAG, String.format("dataDir=%s\n", dataDir)); - - redirect_stdio(true); - - if (!setup(dataDir, - activity.getApplication().getCacheDir().getAbsolutePath(), - activity.getApplication().getPackageResourcePath())) - return; - - // If we notice that a fonts.conf file was extracted, automatically - // set the FONTCONFIG_FILE env var. - InputStream i; - try { - i = activity.getAssets().open("unpack/etc/fonts/fonts.conf"); - } - catch (java.io.IOException e) { - i = null; - } - putenv("OOO_DISABLE_RECOVERY=1"); - if (i != null) - putenv("FONTCONFIG_FILE=" + dataDir + "/etc/fonts/fonts.conf"); - - // TMPDIR is used by osl_getTempDirURL() - putenv("TMPDIR=" + activity.getCacheDir().getAbsolutePath()); - } - - // 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-native-code"); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/source/res/drawable-hdpi/bg_striped_img.png b/android/source/res/drawable-hdpi/bg_striped_img.png Binary files differdeleted file mode 100644 index fd234f336406..000000000000 --- a/android/source/res/drawable-hdpi/bg_striped_img.png +++ /dev/null diff --git a/android/source/res/drawable-hdpi/bg_striped_split_img.png b/android/source/res/drawable-hdpi/bg_striped_split_img.png Binary files differdeleted file mode 100644 index 84d36608abb1..000000000000 --- a/android/source/res/drawable-hdpi/bg_striped_split_img.png +++ /dev/null diff --git a/android/source/res/drawable-mdpi/bg_striped_img.png b/android/source/res/drawable-mdpi/bg_striped_img.png Binary files differdeleted file mode 100644 index 4bbd7037f636..000000000000 --- a/android/source/res/drawable-mdpi/bg_striped_img.png +++ /dev/null diff --git a/android/source/res/drawable-mdpi/bg_striped_split_img.png b/android/source/res/drawable-mdpi/bg_striped_split_img.png Binary files differdeleted file mode 100644 index 3415ac163418..000000000000 --- a/android/source/res/drawable-mdpi/bg_striped_split_img.png +++ /dev/null diff --git a/android/source/res/drawable-xhdpi/bg_striped_img.png b/android/source/res/drawable-xhdpi/bg_striped_img.png Binary files differdeleted file mode 100644 index 79b9ffd0a285..000000000000 --- a/android/source/res/drawable-xhdpi/bg_striped_img.png +++ /dev/null diff --git a/android/source/res/drawable-xhdpi/bg_striped_split_img.png b/android/source/res/drawable-xhdpi/bg_striped_split_img.png Binary files differdeleted file mode 100644 index 8e68c983ad15..000000000000 --- a/android/source/res/drawable-xhdpi/bg_striped_split_img.png +++ /dev/null diff --git a/android/source/res/drawable/bg_striped.xml b/android/source/res/drawable/bg_striped.xml deleted file mode 100644 index 77e0aab2221b..000000000000 --- a/android/source/res/drawable/bg_striped.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/bg_striped_img" - android:tileMode="repeat" - android:dither="true" />
\ No newline at end of file diff --git a/android/source/res/drawable/bg_striped_split.xml b/android/source/res/drawable/bg_striped_split.xml deleted file mode 100644 index 9b0e31354b28..000000000000 --- a/android/source/res/drawable/bg_striped_split.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/bg_striped_split_img" - android:tileMode="repeat" - android:dither="true" />
\ No newline at end of file diff --git a/android/source/res/drawable/black_white_gradient.xml b/android/source/res/drawable/black_white_gradient.xml deleted file mode 100644 index 3ed538ccec34..000000000000 --- a/android/source/res/drawable/black_white_gradient.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <gradient - android:type="radial" - android:gradientRadius="200" - android:startColor="#FF000000" - android:endColor="#00FFFFFF" - android:angle="45"/> - <padding android:left="7dp" - android:top="7dp" - android:right="7dp" - android:bottom="7dp" /> - <corners android:radius="8dp" /> -</shape>
\ No newline at end of file diff --git a/android/source/res/layout/navigation_grid_item.xml b/android/source/res/layout/navigation_grid_item.xml deleted file mode 100644 index 20ad60f3c855..000000000000 --- a/android/source/res/layout/navigation_grid_item.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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/. - --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="150dp" - android:layout_height="150dp" - android:layout_gravity="center" - android:background="#00880000" - android:orientation="vertical" > - <!-- Can I give all thumbs the same ID? works in grid adapter "getView" --> - <ImageView - android:src="@drawable/dummy_page" - android:id="@+id/thumbnail" - android:layout_width="120dp" - android:layout_height="120dp" - android:layout_margin="15dp" - android:layout_gravity="center"/> -</LinearLayout> diff --git a/android/source/res/values-v21/themes.xml b/android/source/res/values-v21/themes.xml deleted file mode 100644 index 441ed82777f1..000000000000 --- a/android/source/res/values-v21/themes.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="LibreOfficeTheme" parent="LibreOfficeTheme.Base"> - <item name="android:windowContentTransitions">true</item> - <item name="android:windowAllowEnterTransitionOverlap">true</item> - <item name="android:windowAllowReturnTransitionOverlap">true</item> - <item name="android:windowSharedElementEnterTransition">@android:transition/move</item> - <item name="android:windowSharedElementExitTransition">@android:transition/move</item> - </style> - - <style name="BrowserTheme" parent="@style/Theme.AppCompat.Light.NoActionBar"> - <item name="android:windowContentTransitions">true</item> - <item name="android:windowAllowEnterTransitionOverlap">true</item> - <item name="android:windowAllowReturnTransitionOverlap">true</item> - <item name="android:windowSharedElementEnterTransition">@android:transition/move</item> - <item name="android:windowSharedElementExitTransition">@android:transition/move</item> - </style> -</resources> diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index c7fb3427bbec..ad7247f2473f 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -11,7 +11,7 @@ import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; @@ -42,7 +42,7 @@ import java.util.List; /** * Main activity of the LibreOffice App. It is started in the UI thread. */ -public class LibreOfficeMainActivity extends ActionBarActivity { +public class LibreOfficeMainActivity extends AppCompatActivity { private static final String LOGTAG = "LibreOfficeMainActivity"; private static final String DEFAULT_DOC_PATH = "/assets/example.odt"; diff --git a/android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java b/android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java deleted file mode 100644 index 56a2038257e1..000000000000 --- a/android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- 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/. - */ - -package org.libreoffice.ui; - -import org.libreoffice.R; - -import android.app.ActionBar; -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.MenuItem; - -public class WriterViewerActivity extends Activity{ - private Bundle extras; - - @Override - protected void onCreate(Bundle savedInstanceState) { - // TODO Auto-generated method stub - super.onCreate(savedInstanceState); - extras = getIntent().getExtras(); - setContentView(R.layout.main); - ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - // app icon in action bar clicked; go home - Intent intent = new Intent(this, LibreOfficeUIActivity.class); - intent.putExtras( extras ); - //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startActivity(intent); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |