summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorSiqi Liu <me@siqi.fr>2015-04-06 14:03:35 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-07 09:18:21 +0200
commit600781382c068212f312f9d9a3de4c903ba83766 (patch)
tree8c3e179aec68d287d817ec70598036258086e937 /android
parent950d33871d5ac4f4ab73f515a89b9e1b9a0ff91c (diff)
implement strike out and .uno:Save
.uno:Save works out of box for when tested against documents (impress, calc) loaded directly from dropbox for example. However, it doesn't work with impress/calc documents loaded from local files. Writer documents won't save, either locally or from network resources. More research needed. Change-Id: Ibdcc209a71f14ec91ba9c1152b305e0278787713
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.pngbin0 -> 429 bytes
-rw-r--r--android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.pngbin0 -> 405 bytes
-rw-r--r--android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.pngbin0 -> 726 bytes
-rw-r--r--android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.pngbin0 -> 1632 bytes
-rw-r--r--android/experimental/LOAndroid3/res/menu/main.xml6
-rw-r--r--android/experimental/LOAndroid3/res/values/strings.xml1
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java6
7 files changed, 12 insertions, 1 deletions
diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
new file mode 100644
index 000000000000..f7682ab45433
--- /dev/null
+++ b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
Binary files differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
new file mode 100644
index 000000000000..955f1cb166c8
--- /dev/null
+++ b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
Binary files differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
new file mode 100644
index 000000000000..e9eccc8c208c
--- /dev/null
+++ b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
Binary files differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
new file mode 100644
index 000000000000..0b2c39fa8bf2
--- /dev/null
+++ b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
Binary files differ
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml
index 979bbd1efec9..09314f52c9b7 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -16,6 +16,12 @@
android:orderInCategory="100"
app:showAsAction="always"/>
+ <item android:id="@+id/action_strikeout"
+ android:title="@string/action_strikeout"
+ android:icon="@drawable/action_strikeout"
+ android:orderInCategory="100"
+ app:showAsAction="always"/>
+
<item android:id="@+id/action_underline"
android:title="@string/action_underline"
android:icon="@drawable/action_underline"
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index 0b9e7a23f752..ffce3d845fdb 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -37,6 +37,7 @@
<string name="action_bold">Bold</string>
<string name="action_underline">Underline</string>
<string name="action_italic">Italic</string>
+ <string name="action_strikeout">Strike Out</string>
<string name="action_keyboard">Show keyboard</string>
<string name="action_save">Save</string>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 466468794f09..c83197705536 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -85,6 +85,9 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
case R.id.action_underline:
LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Underline"));
return true;
+ case R.id.action_strikeout:
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:StrikeOut"));
+ return true;
case R.id.action_keyboard:
showSoftKeyboard();
break;
@@ -92,7 +95,8 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
mAbout.showAbout();
return true;
case R.id.action_save:
- Toast.makeText(this, "saving the document...", Toast.LENGTH_SHORT).show();
+ Toast.makeText(this, "Saving the document...", Toast.LENGTH_SHORT).show();
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Save"));
return true;
case R.id.action_parts:
mDrawerLayout.openDrawer(mDrawerList);