summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAlexF <alexfongg@gmail.com>2015-12-06 21:01:38 +0800
committerJan Holesovsky <kendy@collabora.com>2016-01-05 11:39:32 +0100
commit7115f0360a8758297c82752f9bf3543fc66015ea (patch)
tree896043b165f31e151b1b9465e8595c6c9226a2bb /android
parent715f21a000e59af064c0d2684fe815615bd4eec4 (diff)
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 <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'android')
-rw-r--r--android/source/res/layout/activity_main.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml
index 881466d39f19..625422e3d808 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"