[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental

[Miklos Vajna]

 android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png |binary
 android/experimental/LOAndroid3/res/menu/main.xml                                        |    6 ++++++
 android/experimental/LOAndroid3/res/values/strings.xml                                   |    1 +
 android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java    |    3 +++
 4 files changed, 10 insertions(+)

New commits:
commit 9de0f2d63c37f789ffe26d5af2db9d60b58f80f5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Mar 13 18:21:30 2015 +0100

    android: add toolbar button to force-show the soft keyboard
    
    Change-Id: I1758f4db7b6894df66d721af77092754b0252100

diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png
new file mode 100644
index 0000000..cfad1bed
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png differ
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml
index 52f4ebc..8670ed3 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -10,6 +10,12 @@
           android:orderInCategory="100"
           app:showAsAction="always"/>
 
+    <item android:id="@+id/action_keyboard"
+          android:title="@string/action_keyboard"
+          android:icon="@drawable/ic_format_keyboard_grey600_24dp"
+          android:orderInCategory="100"
+          app:showAsAction="always"/>
+
     <item android:id="@+id/action_about"
         android:title="@string/action_about"
         android:orderInCategory="100" />
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index e2c6ffc..3d8c3aa 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -35,5 +35,6 @@
     <string name="local_documents">Local documents</string>
     <string name="local_file_system">Local file system</string>
     <string name="action_bold">Bold</string>
+    <string name="action_keyboard">Show keyboard</string>
 
 </resources>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index e1af1e2..48f7850 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -79,6 +79,9 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
             case R.id.action_bold:
                 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Bold"));
                 return true;
+            case R.id.action_keyboard:
+                showSoftKeyboard();
+                break;
             case R.id.action_about:
                 mAbout.showAbout();
                 return true;