Merge "Added action bar shadow for pre-L devices" into ub-gmail-ur14-dev
diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index 40072a2..ee58ca3 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml
@@ -44,6 +44,7 @@
<include layout="@layout/search_suggestion_list" />
+ <include layout="@layout/pre_l_actionbar_shadow" />
</FrameLayout>
</LinearLayout>
@@ -54,4 +55,4 @@
android:layout_height="match_parent"
android:layout_gravity="start" />
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/pre_l_actionbar_shadow.xml b/res/layout/pre_l_actionbar_shadow.xml
new file mode 100644
index 0000000..f0454b6
--- /dev/null
+++ b/res/layout/pre_l_actionbar_shadow.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Google Inc.
+ Licensed to 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.
+-->
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="7dp"
+ android:background="@drawable/action_bar_shadow"
+ style="@style/ActionBarShadow" />
diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml
index eb194c9..c616643 100644
--- a/res/layout/two_pane_activity.xml
+++ b/res/layout/two_pane_activity.xml
@@ -77,6 +77,7 @@
<include layout="@layout/search_suggestion_list" />
+ <include layout="@layout/pre_l_actionbar_shadow" />
</FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 608c2fd..4fe0581 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -23,6 +23,10 @@
<item name="android:textAllCaps">false</item>
</style>
+ <style name="ActionBarShadow">
+ <item name="android:visibility">gone</item>
+ </style>
+
<style name="ConversationListFadeBase" parent="android:Widget.Material.Light.ListView" />
<style name="MinTimeProgressViewStyle" parent="android:Widget.Material.Light.ProgressBar" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 18b5fa9..0bc58bc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -446,6 +446,10 @@
<item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item>
</style>
+ <style name="ActionBarShadow">
+ <item name="android:visibility">visible</item>
+ </style>
+
<style name="ActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/actionbar_color</item>
</style>