From 5dcb4adf2d7c28d6725227150d1162e79843bff7 Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Thu, 28 Jun 2012 10:51:37 -0700
Subject: [PATCH] Fixup position of folder icon/ folder name.

Change-Id: I24b5ca12a72eeb092c7a0c0b4d93c5613f9b3c43
---
 email2/res/layout/folder_item.xml | 82 +++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 email2/res/layout/folder_item.xml

diff --git a/email2/res/layout/folder_item.xml b/email2/res/layout/folder_item.xml
new file mode 100644
index 000000000..f950eb2e1
--- /dev/null
+++ b/email2/res/layout/folder_item.xml
@@ -0,0 +1,82 @@
+<?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.
+-->
+
+<com.android.mail.ui.FolderItemView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:minHeight="@dimen/folder_list_minimum_height"
+    android:background="@drawable/folder_item">
+
+    <ImageView
+        android:id="@+id/folder_parent_icon"
+        android:layout_width="16dip"
+        android:layout_height="16dip"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:visibility="gone"
+        android:src="@drawable/folder_parent_icon" />
+
+    <ImageView
+        android:id="@+id/folder_box"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dip"
+        android:layout_marginRight="8dp" />
+
+    <TextView
+        android:id="@+id/unread"
+        style="@style/UnreadCount"
+        android:layout_marginRight="@dimen/folder_list_item_right_margin"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_alignParentRight="true"
+        android:layout_toLeftOf="@id/folder_parent_icon"
+        android:textColor="@color/folder_name_color_primary_invertible" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/folder_box"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_marginTop="@dimen/folder_swatch_height"
+        android:layout_marginBottom="@dimen/folder_swatch_height">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textColor="@color/folder_name_color_primary_invertible"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_below="@id/name"
+            android:textColor="@color/folder_name_color_primary_invertible"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:visibility="gone" />
+
+    </RelativeLayout>
+
+</com.android.mail.ui.FolderItemView>
\ No newline at end of file