diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | android/Makefile | 4 | ||||
| -rw-r--r-- | android/source/build.gradle | 3 | ||||
| -rw-r--r-- | android/source/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | android/source/res/values-tr/strings.xml | 1 | ||||
| -rw-r--r-- | android/source/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/AboutDialogFragment.java | 7 |
7 files changed, 2 insertions, 16 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 951ee1450ec7..ffb2c16a832d 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -100,7 +100,6 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk && echo " liboSharedResFolder = '$(LIBO_SHARE_RESOURCE_FOLDER)'" \ && echo " liboUREJavaFolder = '$(LIBO_URE_SHARE_JAVA_FOLDER)'" \ && echo " liboShareJavaFolder = '$(LIBO_SHARE_JAVA_FOLDER)'" \ - && echo " liboExampleDocument = '$(if $(exampleDocument),$(exampleDocument),$(SRC_ROOT)/android/default-document/example.odt)'" \ && echo " liboVersionMajor = '$(LIBO_VERSION_MAJOR)'" \ && echo " liboVersionMinor = '$(LIBO_VERSION_MINOR)'" \ && echo " liboGitFullCommit = '$(shell cd $(SRCDIR) && git log -1 --format=%H)'" \ diff --git a/android/Makefile b/android/Makefile index 796f8092959b..a0a7231f7b07 100644 --- a/android/Makefile +++ b/android/Makefile @@ -13,10 +13,10 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk .PHONY: sign SIGNED_APK := $(BUILDDIR)/android/source/bin/LibreOfficeViewer.apk -RELEASE_APK_USAGE := echo; echo "Usage: make versionCode=<version_num+1> exampleDocument=</absolute/path/example.odt> key=<key_name> release-apk" +RELEASE_APK_USAGE := echo; echo "Usage: make versionCode=<version_num+1> key=<key_name> release-apk" release-apk: build - # versionCode and key are mandatory, exampleDocument is not + # versionCode and key are mandatory @if test -z "$(versionCode)" ; then $(RELEASE_APK_USAGE) ; exit 1 ; fi @if test -z "$(key)" ; then $(RELEASE_APK_USAGE) ; exit 1 ; fi diff --git a/android/source/build.gradle b/android/source/build.gradle index f207ddedf267..1ae292ba1006 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -197,9 +197,6 @@ task copyAppResources(type: Copy) { rename "LICENSE", "license.txt" rename "NOTICE", "notice.txt" } - from("${liboExampleDocument}") { - rename ".*", "example.odt" - } } task createFullConfig(type: Copy) { diff --git a/android/source/res/values-de/strings.xml b/android/source/res/values-de/strings.xml index 30dd48ceb16e..88fdbaedd73d 100644 --- a/android/source/res/values-de/strings.xml +++ b/android/source/res/values-de/strings.xml @@ -13,7 +13,6 @@ <string name="about_license">Lizenz anzeigen</string> <string name="about_notice">Hinweise anzeigen</string> - <string name="about_moreinfo">Weitere Informationen</string> <string name="new_textdocument">Neues Textdokument</string> <string name="new_presentation">Neue Präsentation</string> diff --git a/android/source/res/values-tr/strings.xml b/android/source/res/values-tr/strings.xml index ec7274c8cca6..ef0722f035cd 100644 --- a/android/source/res/values-tr/strings.xml +++ b/android/source/res/values-tr/strings.xml @@ -13,7 +13,6 @@ <string name="about_license">Lisansı Görüntüle</string> <string name="about_notice">Bildiriyi Görüntüle</string> - <string name="about_moreinfo">Daha Fazla Bilgi</string> <string name="new_textdocument">Yeni Kelime İşlemci</string> <string name="new_presentation">Yeni Sunum</string> diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index 37ed16e4503c..77bfc8c110e0 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -13,7 +13,6 @@ <string name="about_license">Show License</string> <string name="about_notice">Show Notice</string> - <string name="about_moreinfo">More Info</string> <string name="create_file">Create New File</string> <string name="new_textdocument">New Text Document</string> diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java index 9695d1e9d650..17c43787e619 100644 --- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java +++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java @@ -86,13 +86,6 @@ public class AboutDialogFragment extends DialogFragment { loadFromAbout(R.raw.notice); dialog.dismiss(); } - }) - .setNeutralButton(R.string.about_moreinfo, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int id) { - loadFromAbout(R.raw.example); - dialog.dismiss(); - } }); return builder.create(); |