[Libreoffice-commits] core.git: android/source

[AlexF]

 android/source/res/layout/activity_main.xml |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fa354c9ae940ae12abf26b1d8c62836d4e50dfb4
Author: AlexF <alexfongg at 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 <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at 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"