Themes: Expose and separate values for themes

[android-x86/packages-apps-Eleven.git] / res / layout / grid_items_normal.xml

diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index f61af9a..3c1b0dd 100644 (file)
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -1,46 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2012 Andrew Neal
- 
+  Copyright (C) 2014 The CyanogenMod 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
- 
+
+  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.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical" >
-
-    <include layout="@layout/square_image_view" />
+    card_view:cardElevation="4dp"
+    card_view:cardCornerRadius="2dp"
+    card_view:cardBackgroundColor="@color/cards_bg_color" >
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/grid_bottom_height"
-        android:layout_below="@+id/square_view"
-        android:background="@drawable/cardcontainer"
-        android:paddingLeft="@dimen/grid_item_padding_left" >
-
-        <TextView
-            android:id="@+id/line_one"
-            style="@style/ListItemMainText.Grid.Single"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/square_image_view" />
 
-        <TextView
-            android:id="@+id/line_two"
-            style="@style/ListItemSecondaryText.Grid.Single"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/line_one" />
-    </RelativeLayout>
+            android:layout_height="@dimen/grid_bottom_height"
+            android:paddingLeft="@dimen/grid_item_padding_left"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/line_one"
+                    style="@style/ListItemMainText.Grid.Single"
+                    android:textColor="@color/grid_items_normal_line_one"
+                    android:paddingBottom="1dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/line_two"
+                    style="@style/ListItemSecondaryText.Grid.Single"
+                    android:textColor="@color/grid_items_normal_line_two"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+            </LinearLayout>
+
+            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+                android:id="@+id/popup_menu_button"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingRight="@dimen/grid_item_padding_right"
+                android:src="@drawable/menu_button_light" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>