summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAlexF <alexfongg@gmail.com>2015-12-06 21:01:38 +0800
committerjan iversen <jani@documentfoundation.org>2016-01-04 21:08:00 +0000
commitfa354c9ae940ae12abf26b1d8c62836d4e50dfb4 (patch)
tree2bf8e36968b0cd6b8e08a33d4c039f8a68ccdc58 /android
parente488bc443b681c8d1a36667e5d3caa4e42c28baf (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"