Updated with new twopane layout and dimensions.

This commit is contained in:
Dan Galpin
2015-05-25 02:35:36 -07:00
parent 26159a5f42
commit 3bf4a5e030
3 changed files with 48 additions and 1 deletions

View File

@@ -0,0 +1,45 @@
<!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Master layout. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3">
<include layout="@layout/detail_today_grid"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@android:color/transparent" />
</FrameLayout>
<include layout="@layout/detail_extras_grid"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"/>
</LinearLayout>

View File

@@ -15,5 +15,5 @@
limitations under the License. limitations under the License.
--> -->
<resources> <resources>
<item type="layout" name="fragment_detail_start">@layout/fragment_detail</item> <item type="layout" name="fragment_detail_start">@layout/fragment_detail_twopane</item>
</resources> </resources>

View File

@@ -49,4 +49,6 @@
<dimen name="detail_view_padding">@dimen/abc_list_item_padding_horizontal_material</dimen> <dimen name="detail_view_padding">@dimen/abc_list_item_padding_horizontal_material</dimen>
<dimen name="forecast_detail_padding_wide">16dp</dimen> <dimen name="forecast_detail_padding_wide">16dp</dimen>
<dimen name="detail_container_bottom_margin">@dimen/detail_view_padding</dimen> <dimen name="detail_container_bottom_margin">@dimen/detail_view_padding</dimen>
<dimen name="detail_card_elevation">6dp</dimen>
</resources> </resources>