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/source | |
parent | 2ff595dbf2b42b4b3ee961b63e5da92067aa8fd9 (diff) |
android: remove no longer used files
Change-Id: Id3b71ac50e3c8ce9705f6df18edaaaa6ba8ad3fd
Diffstat (limited to 'android/source')
-rw-r--r-- | android/source/res/drawable-hdpi/bg_striped_img.png | bin | 143 -> 0 bytes | |||
-rw-r--r-- | android/source/res/drawable-hdpi/bg_striped_split_img.png | bin | 143 -> 0 bytes | |||
-rw-r--r-- | android/source/res/drawable-mdpi/bg_striped_img.png | bin | 129 -> 0 bytes | |||
-rw-r--r-- | android/source/res/drawable-mdpi/bg_striped_split_img.png | bin | 129 -> 0 bytes | |||
-rw-r--r-- | android/source/res/drawable-xhdpi/bg_striped_img.png | bin | 152 -> 0 bytes | |||
-rw-r--r-- | android/source/res/drawable-xhdpi/bg_striped_split_img.png | bin | 153 -> 0 bytes | |||
-rw-r--r-- | android/source/res/drawable/bg_striped.xml | 6 | ||||
-rw-r--r-- | android/source/res/drawable/bg_striped_split.xml | 6 | ||||
-rw-r--r-- | android/source/res/drawable/black_white_gradient.xml | 15 | ||||
-rw-r--r-- | android/source/res/layout/navigation_grid_item.xml | 23 | ||||
-rw-r--r-- | android/source/res/values-v21/themes.xml | 18 | ||||
-rw-r--r-- | android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 4 | ||||
-rw-r--r-- | android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java | 50 |
13 files changed, 2 insertions, 120 deletions
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: */ |