Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f64c812 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fix toolbar is overlaid on ni-co-bar" into android-snapdragonGallery.lnx.2.0

parents 26a13939 6100e0c6

res/layout/gallery_main.xml

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/drawerLayout"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <!-- MAIN CONTENT -->

res/layout/toolbar.xml

100644 → 100755
+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 


<Toolbar xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/toolbar_height"

    android:paddingTop="26dp"

    android:layout_height="?android:attr/actionBarSize"

    android:background="@color/toolbar_theme"

    android:elevation="4dp"

    android:theme="@style/ToolbarTheme"