diff options
| author | Ximeng Zu <uznomis@yahoo.com> | 2017-08-14 11:41:30 -0500 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-11-16 06:31:48 +0100 |
| commit | 8d977511e3ab755da65d34a0bd618ef3c9db90c7 (patch) | |
| tree | 50ac7f7a84c4560e42375e1df409d46ecb20ebb0 /android/source/res | |
| parent | 4e2555b7f37172ab28d43d5aecfa52a38c0cdd65 (diff) | |
tdf#106370 Android: add ability to insert pictures
Added ability to insert pictures to Android Viewer.
You can take photo or select photo from device or
the cloud (Google photos, Dropbox). You can also
compress the picture before inserting it with multiple
compress grades. So far, inserting doesn't work for
Writer due LO native library issues (I think).
Change-Id: If6841ba04fe18585703c8b85909cf39747dbbc2f
Reviewed-on: https://gerrit.libreoffice.org/41150
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android/source/res')
| -rw-r--r-- | android/source/res/layout/toolbar_bottom.xml | 10 | ||||
| -rw-r--r-- | android/source/res/values/strings.xml | 11 | ||||
| -rw-r--r-- | android/source/res/xml/file_paths.xml | 4 |
3 files changed, 25 insertions, 0 deletions
diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index 1b4730d89adf..a537a52d32b9 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -328,6 +328,16 @@ android:paddingBottom="12dp" android:paddingTop="12dp" app:srcCompat="@drawable/ic_rect" /> + + <ImageButton + android:id="@+id/button_insert_picture" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="12dp" + android:paddingTop="12dp" + app:srcCompat="@drawable/ic_folder_black_24dp" /> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index e84c496db3c5..3f6955cd7a7b 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -157,4 +157,15 @@ <string name="action_pwd_dialog_cancel">Cancel</string> <string name="action_pwd_dialog_title">Please enter password</string> + <!-- Insert Image Strings --> + <string name="take_photo">Take Photo</string> + <string name="select_photo">Select Photo</string> + <string name="select_photo_title">Select Picture</string> + <string name="no_camera_found">No Camera Found</string> + <string name="compress_photo_smallest_size">Smallest Size</string> + <string name="compress_photo_medium_size">Medium Size</string> + <string name="compress_photo_max_quality">Max Quality</string> + <string name="compress_photo_no_compress">Don\'t Compress</string> + <string name="compress_photo_title">Do you want to compress the photo?</string> + </resources> diff --git a/android/source/res/xml/file_paths.xml b/android/source/res/xml/file_paths.xml new file mode 100644 index 000000000000..2bbe2aef17ea --- /dev/null +++ b/android/source/res/xml/file_paths.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<paths> + <external-path name="LO_files_universal" path="Android/" /> +</paths>
\ No newline at end of file |