Add shadow between favorites and frequent lists on tablet
- Remove styles for the favorites/frequent fragments
because we now have people_activity.xml in the sw580dp
and sw580dp-w1000dp folders
Bug: 5143908
Change-Id: Id81df82b50bc62cb2fd6de66684e89fc9a41fa23
diff --git a/res/drawable-hdpi/panel_favorites_holo_light.9.png b/res/drawable-hdpi/panel_favorites_holo_light.9.png
new file mode 100644
index 0000000..effe70c
--- /dev/null
+++ b/res/drawable-hdpi/panel_favorites_holo_light.9.png
Binary files differ
diff --git a/res/drawable-mdpi/panel_favorites_holo_light.9.png b/res/drawable-mdpi/panel_favorites_holo_light.9.png
new file mode 100644
index 0000000..fb76aa7
--- /dev/null
+++ b/res/drawable-mdpi/panel_favorites_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/panel_favorites_holo_light.9.png b/res/drawable-xhdpi/panel_favorites_holo_light.9.png
new file mode 100644
index 0000000..13212c4
--- /dev/null
+++ b/res/drawable-xhdpi/panel_favorites_holo_light.9.png
Binary files differ
diff --git a/res/layout-sw580dp-w1000dp/people_activity.xml b/res/layout-sw580dp-w1000dp/people_activity.xml
index 7d8d064..9a7c5ae 100644
--- a/res/layout-sw580dp-w1000dp/people_activity.xml
+++ b/res/layout-sw580dp-w1000dp/people_activity.xml
@@ -118,23 +118,32 @@
android:background="@drawable/list_background_holo">
<!-- Starred -->
- <fragment
- android:id="@+id/favorites_fragment"
- class="com.android.contacts.list.ContactTileListFragment"
+ <FrameLayout
+ android:layout_width="0dip"
android:layout_height="match_parent"
- style="@style/FavoritesFragmentStyle"
- android:layout_marginTop="32dip"
- android:layout_marginLeft="32dip"
- android:layout_marginRight="32dip" />
+ android:layout_weight="7"
+ android:background="@drawable/panel_favorites_holo_light">
+
+ <fragment
+ android:id="@+id/favorites_fragment"
+ class="com.android.contacts.list.ContactTileListFragment"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_marginTop="32dip"
+ android:layout_marginRight="32dip"
+ android:layout_marginLeft="32dip"/>
+
+ </FrameLayout>
<!-- Most Frequent -->
<fragment
android:id="@+id/frequent_fragment"
class="com.android.contacts.list.ContactTileListFragment"
- style="@style/FrequentFragmentStyle"
+ android:layout_width="0dip"
android:layout_height="match_parent"
- android:layout_marginTop="32dip"
- android:layout_marginRight="32dip"/>
+ android:layout_weight="3"
+ android:layout_marginTop="32dip"/>
+
</LinearLayout>
</view>
diff --git a/res/layout-sw580dp/people_activity.xml b/res/layout-sw580dp/people_activity.xml
index 35c11b1..feeff6c 100644
--- a/res/layout-sw580dp/people_activity.xml
+++ b/res/layout-sw580dp/people_activity.xml
@@ -110,23 +110,32 @@
android:background="@drawable/list_background_holo">
<!-- Starred -->
- <fragment
- android:id="@+id/favorites_fragment"
- class="com.android.contacts.list.ContactTileListFragment"
+ <FrameLayout
+ android:layout_width="0dip"
android:layout_height="match_parent"
- style="@style/FavoritesFragmentStyle"
- android:layout_marginTop="32dip"
- android:layout_marginLeft="32dip"
- android:layout_marginRight="32dip" />
+ android:layout_weight="1"
+ android:background="@drawable/panel_favorites_holo_light">
+
+ <fragment
+ android:id="@+id/favorites_fragment"
+ class="com.android.contacts.list.ContactTileListFragment"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_marginTop="32dip"
+ android:layout_marginRight="32dip"
+ android:layout_marginLeft="32dip"/>
+
+ </FrameLayout>
<!-- Most Frequent -->
<fragment
android:id="@+id/frequent_fragment"
class="com.android.contacts.list.ContactTileListFragment"
- style="@style/FrequentFragmentStyle"
+ android:layout_width="0dip"
android:layout_height="match_parent"
- android:layout_marginTop="32dip"
- android:layout_marginRight="32dip"/>
+ android:layout_weight="1"
+ android:layout_marginTop="32dip"/>
+
</LinearLayout>
</view>
diff --git a/res/values-sw580dp-w1000dp/styles.xml b/res/values-sw580dp-w1000dp/styles.xml
deleted file mode 100644
index 85f4733..0000000
--- a/res/values-sw580dp-w1000dp/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<resources>
- <style name="FavoritesFragmentStyle">
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_weight">7</item>
- </style>
-
- <style name="FrequentFragmentStyle">
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_weight">3</item>
- </style>
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9b60ceb..cbb03c4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -307,16 +307,6 @@
<item name="android:background">#7F000000</item>
</style>
- <style name="FavoritesFragmentStyle">
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_weight">1</item>
- </style>
-
- <style name="FrequentFragmentStyle">
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_weight">1</item>
- </style>
-
<style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
<item name="android:backgroundSplit">@drawable/ab_bottom_opaque_dark_holo</item>
<item name="android:backgroundStacked">@drawable/ab_stacked_opaque_dark_holo</item>
