Skip to content

Commit

Permalink
Merge pull request #8 from mishkaowner/master
Browse files Browse the repository at this point in the history
changed activity_nested_toolbar.xml
  • Loading branch information
Suleiman19 committed Jun 27, 2015
2 parents 929549b + 7f4e993 commit e8db095
Showing 1 changed file with 29 additions and 27 deletions.
56 changes: 29 additions & 27 deletions MaterialSample/app/src/main/res/layout/activity_nested_toolbar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,38 @@
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_double_height"
android:background="?attr/colorPrimary" />

<android.support.v7.widget.CardView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/cardview_toolbar_spacer"
android:layout_marginLeft="@dimen/cardview_toolbar_spacer"
android:layout_marginRight="@dimen/cardview_toolbar_spacer"
android:layout_marginStart="@dimen/cardview_toolbar_spacer"
android:layout_marginTop="?attr/actionBarSize"
app:cardBackgroundColor="@android:color/white"
app:cardElevation="2dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/cardview_toolbar_spacer"
android:layout_marginLeft="@dimen/cardview_toolbar_spacer"
android:layout_marginRight="@dimen/cardview_toolbar_spacer"
android:layout_marginStart="@dimen/cardview_toolbar_spacer"
android:layout_marginTop="?attr/actionBarSize"
app:cardBackgroundColor="@android:color/white"
app:cardElevation="2dp">

<android.support.v7.widget.Toolbar
android:id="@+id/nested_toolbar_2"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="-4dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:alpha="0.12"
android:background="@android:color/black" />
</LinearLayout>
<android.support.v7.widget.Toolbar
android:id="@+id/nested_toolbar_2"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="-4dp" />

</android.support.v7.widget.CardView>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:alpha="0.12"
android:background="@android:color/black" />
</LinearLayout>

</android.support.v7.widget.CardView>
</RelativeLayout>
</FrameLayout>

0 comments on commit e8db095

Please sign in to comment.