1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-11 14:51:11 +01:00

Merge remote-tracking branch 'origin/master' into rework_settings

This commit is contained in:
vanitasvitae 2016-06-24 12:40:56 +02:00
commit becef9ca71
9 changed files with 310 additions and 19 deletions

View file

@ -42,13 +42,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:theme="@style/AppTheme.AppBarOverlay">
android:theme="@style/AppTheme.AppBarOverlay"
app:layout_behavior=".ui.BottomBarBehavior">
<android.support.v7.widget.ActionMenuView
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways|snap"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>