android/source/res/layout/activity_main.xml | 3 +--
android/source/src/java/org/libreoffice/ui/GridItemAdapter.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 7115f0360a8758297c82752f9bf3543fc66015ea
Author: AlexF <alexfo...@gmail.com>
Date: Sun Dec 6 21:01:38 2015 +0800
tdf#96127 Android: No UI visible
Duplicate <include layout="@layout/toolbar"/> statement found.
Problem could be caused by either
1) a differing xml reading mechanism across android versions
2) toolbar being accessed in a different way across android versions
Duplicate element removed, and linearlayout shifted below first toolbar.
Change-Id: I084b6498745bc72988f3a8eed12f7a72d261e267
Reviewed-on: https://gerrit.libreoffice.org/20422
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/android/source/res/layout/activity_main.xml
b/android/source/res/layout/activity_main.xml
index 881466d..625422e 100644
--- a/android/source/res/layout/activity_main.xml
+++ b/android/source/res/layout/activity_main.xml
@@ -20,10 +20,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/toolbar_bottom"
+ android:layout_below="@+id/toolbar"
android:orientation="vertical">
- <include layout="@layout/toolbar"/>
-
<RelativeLayout
android:id="@+id/gecko_layout"
android:layout_width="match_parent"
commit 715f21a000e59af064c0d2684fe815615bd4eec4
Author: AlexF <alexfo...@gmail.com>
Date: Thu Nov 12 09:49:36 2015 +0800
tdf#88391 android document browser: draw and impress icon is the same
Added missing code to set icon for draw in grid mode.
Change-Id: I9ee356d5ab1a296a90e5ece11f5f4c50e7600f13
Reviewed-on: https://gerrit.libreoffice.org/19921
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
index d1e4278..b083de4 100644
--- a/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -101,7 +101,9 @@ public class GridItemAdapter extends BaseAdapter {
case FileUtilities.CALC:
imageView.setImageResource(R.drawable.calc);
break;
- case FileUtilities.DRAWING: // FIXME: only for now ...
+ case FileUtilities.DRAWING:
+ imageView.setImageResource(R.drawable.draw);
+ break;
case FileUtilities.IMPRESS:
imageView.setImageResource(R.drawable.impress);
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
