diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-13 18:21:30 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-16 09:38:12 +0100 |
| commit | 2479fae410070f0e352dc15053718c88e7eca6d1 (patch) | |
| tree | 7cfc05f6f655a0238ebbca9d4f24bcb649d00f7c /android | |
| parent | af379e99eb83fab544565d34f11f38241d0d4e8d (diff) | |
android: add toolbar button to force-show the soft keyboard
Change-Id: I1758f4db7b6894df66d721af77092754b0252100
Diffstat (limited to 'android')
4 files changed, 10 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 000000000000..cfad1beddcca --- /dev/null +++ b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml index 52f4ebc40c9a..8670ed3658fc 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 e2c6ffc69698..3d8c3aa6f9ef 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 e1af1e293e7a..48f7850d409a 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; |
