android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png              
       |binary
 android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png            
       |binary
 android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png         
       |binary
 android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png              
       |binary
 android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png            
       |binary
 android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png         
       |binary
 android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png             
       |binary
 android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png           
       |binary
 android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png        
       |binary
 android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png           
       |binary
 android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png         
       |binary
 android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png      
       |binary
 android/experimental/LOAndroid3/res/menu/main.xml                              
       |   14 +++++++++-
 android/experimental/LOAndroid3/res/values/strings.xml                         
       |    2 +
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |    6 ++++
 dev/null                                                                       
       |binary
 16 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit b4e48845662a3c4fde6f9c4fb2219f676cdd693c
Author: Siqi Liu <m...@siqi.fr>
Date:   Mon Apr 6 11:58:49 2015 +0200

    add italic/underline button with icons for different screen res
    
    Change-Id: Ib158f32af7ef8d65d4ddd822839b260161a74343

diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png 
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png
new file mode 100644
index 0000000..950d615
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png 
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png
new file mode 100644
index 0000000..399bb9c
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png 
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png
new file mode 100644
index 0000000..09f8b20
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png 
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png
new file mode 100644
index 0000000..bc60968
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png 
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png
new file mode 100644
index 0000000..6394cf9
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png 
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png
new file mode 100644
index 0000000..3b6c7f6
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png 
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png
new file mode 100644
index 0000000..95c985e
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png 
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png
new file mode 100644
index 0000000..e4366f4
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png 
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png
new file mode 100644
index 0000000..421a750
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png
new file mode 100644
index 0000000..c5256f5
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png
new file mode 100644
index 0000000..a5e921f
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
new file mode 100644
index 0000000..4cd7971
Binary files /dev/null and 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png 
differ
diff --git 
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_bold_grey600_24dp.png
 
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_bold_grey600_24dp.png
deleted file mode 100644
index 2d7688a..0000000
Binary files 
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_bold_grey600_24dp.png
 and /dev/null differ
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml 
b/android/experimental/LOAndroid3/res/menu/main.xml
index 8670ed3..1a1c22a 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -6,7 +6,19 @@
 
     <item android:id="@+id/action_bold"
           android:title="@string/action_bold"
-          android:icon="@drawable/ic_format_bold_grey600_24dp"
+          android:icon="@drawable/action_bold"
+          android:orderInCategory="100"
+          app:showAsAction="always"/>
+
+    <item android:id="@+id/action_italic"
+          android:title="@string/action_italic"
+          android:icon="@drawable/action_italic"
+          android:orderInCategory="100"
+          app:showAsAction="always"/>
+
+    <item android:id="@+id/action_underline"
+          android:title="@string/action_underline"
+          android:icon="@drawable/action_underline"
           android:orderInCategory="100"
           app:showAsAction="always"/>
 
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml 
b/android/experimental/LOAndroid3/res/values/strings.xml
index 3d8c3aa..939804d 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -35,6 +35,8 @@
     <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_underline">Underline</string>
+    <string name="action_italic">Italic</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 3aaa2b2..ed87f8c 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -78,6 +78,12 @@ 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_italic:
+                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, 
".uno:Italic"));
+                return true;
+            case R.id.action_underline:
+                LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, 
".uno:Underline"));
+                return true;
             case R.id.action_keyboard:
                 showSoftKeyboard();
                 break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to