From b25326e845c5ec31eee841be3740a65dd568ed73 Mon Sep 17 00:00:00 2001
From: Christophe Beyls <software@digitalia.be>
Date: Mon, 19 Jan 2015 22:57:38 +0100
Subject: [PATCH] Tweak track_schedule layout in tablet landscape mode to
 increase card elevation and compensate for the compatibility padding.

---
 .../main/res/layout-sw600dp-land/track_schedule.xml   | 11 +++++++----
 app/src/main/res/values-v21/dimens.xml                | 10 ++++++++++
 app/src/main/res/values/dimens.xml                    |  7 +++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-v21/dimens.xml

diff --git a/app/src/main/res/layout-sw600dp-land/track_schedule.xml b/app/src/main/res/layout-sw600dp-land/track_schedule.xml
index 61b4066..f4c26e8 100644
--- a/app/src/main/res/layout-sw600dp-land/track_schedule.xml
+++ b/app/src/main/res/layout-sw600dp-land/track_schedule.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
@@ -13,7 +14,7 @@
             style="@style/Toolbar.Fosdem"
             android:layout_width="match_parent"
             android:layout_height="128dp"
-            android:elevation="2dp"
+            android:elevation="4dp"
             android:gravity="top"/>
 
         <FrameLayout
@@ -28,9 +29,11 @@
         android:id="@+id/event"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/schedule_column_width"
-        android:layout_marginRight="96dp"
-        android:layout_marginTop="64dp"/>
+        android:layout_marginBottom="@dimen/detail_card_view_margin_bottom"
+        android:layout_marginLeft="@dimen/detail_card_view_margin_left"
+        android:layout_marginRight="@dimen/detail_card_view_margin_right"
+        android:layout_marginTop="@dimen/detail_card_view_margin_top"
+        app:cardElevation="@dimen/detail_card_view_elevation"/>
 
     <ImageView
         android:id="@+id/fab"
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
new file mode 100644
index 0000000..45414f1
--- /dev/null
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Use original values for native card view elevation -->
+    <dimen name="detail_card_view_margin_left">@dimen/schedule_column_width</dimen>
+    <dimen name="detail_card_view_margin_right">96dp</dimen>
+    <dimen name="detail_card_view_margin_top">64dp</dimen>
+    <dimen name="detail_card_view_margin_bottom">0dp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1a1c40e..54337b3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,6 +11,13 @@
     <dimen name="content_margin">16dp</dimen>
     <dimen name="toolbar_elevation">8dp</dimen>
     <dimen name="schedule_column_width">360dp</dimen>
+    <dimen name="detail_card_view_elevation">6dp</dimen>
+    <!-- Enlarge the card view by 7dp left & right and 10dp top & bottom
+        to compensate for the compatibility padding of the 6dp elevation -->
+    <dimen name="detail_card_view_margin_left">353dp</dimen>
+    <dimen name="detail_card_view_margin_right">89dp</dimen>
+    <dimen name="detail_card_view_margin_top">54dp</dimen>
+    <dimen name="detail_card_view_margin_bottom">-10dp</dimen>
     <dimen name="fab_diameter">56dp</dimen>
     <dimen name="fab_elevation_low">2dp</dimen>
     <dimen name="fab_elevation_high">4dp</dimen>