Skip to content

Commit 3bf4a5e

Browse files
committed
Updated with new twopane layout and dimensions.
1 parent 26159a5 commit 3bf4a5e

3 files changed

Lines changed: 48 additions & 1 deletion

File tree

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<!--
2+
Copyright (C) 2015 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<!-- Master layout. -->
17+
<LinearLayout
18+
xmlns:android="http://schemas.android.com/apk/res/android"
19+
android:layout_width="match_parent"
20+
android:layout_height="match_parent"
21+
android:orientation="vertical">
22+
23+
<FrameLayout
24+
android:layout_width="match_parent"
25+
android:layout_height="0dp"
26+
android:layout_weight="3">
27+
28+
<include layout="@layout/detail_today_grid"
29+
android:layout_width="match_parent"
30+
android:layout_height="match_parent"/>
31+
32+
<android.support.v7.widget.Toolbar
33+
android:id="@+id/toolbar"
34+
android:layout_width="match_parent"
35+
android:layout_height="?attr/actionBarSize"
36+
android:background="@android:color/transparent" />
37+
</FrameLayout>
38+
39+
<include layout="@layout/detail_extras_grid"
40+
android:layout_width="match_parent"
41+
android:layout_height="0dp"
42+
android:layout_weight="2"/>
43+
44+
45+
</LinearLayout>

app/src/main/res/values-sw600dp-land/refs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
limitations under the License.
1616
-->
1717
<resources>
18-
<item type="layout" name="fragment_detail_start">@layout/fragment_detail</item>
18+
<item type="layout" name="fragment_detail_start">@layout/fragment_detail_twopane</item>
1919
</resources>

app/src/main/res/values/dimens.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,6 @@
4949
<dimen name="detail_view_padding">@dimen/abc_list_item_padding_horizontal_material</dimen>
5050
<dimen name="forecast_detail_padding_wide">16dp</dimen>
5151
<dimen name="detail_container_bottom_margin">@dimen/detail_view_padding</dimen>
52+
53+
<dimen name="detail_card_elevation">6dp</dimen>
5254
</resources>

0 commit comments

Comments
 (0)