Trebuchet: new folder UI v1

This change adds a number of new UI components and animations for
folders.

Designer: Hayden Schoen

Change-Id: I255cd4664432d84aebecf7e16ace5d9948573e27

3 files changed, 85 insertions, 52 deletions

diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml
index fd45d7685..cdb67fd77 100644
--- a/res/layout/folder_icon.xml
+++ b/res/layout/folder_icon.xml
@@ -20,17 +20,53 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:focusable="true" >
-    <ImageView
+    <RelativeLayout
         android:id="@+id/preview_background"
-        android:layout_gravity="center_horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:antialias="true"
-        android:src="@drawable/portal_ring_inner_holo"/>
+        android:layout_width="@dimen/folder_icon"
+        android:layout_height="@dimen/folder_icon"
+        android:layout_gravity="center_horizontal|top"
+        android:background="@drawable/folder_bg" >
+        <ImageView
+            android:id="@+id/folder_lock_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/folder_locked"
+            android:scaleType="center"
+            android:visibility="invisible" />
+        <ImageView
+            android:id="@+id/app_0"
+            android:layout_width="@dimen/folder_icon_app_preview"
+            android:layout_height="@dimen/folder_icon_app_preview"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:antialias="true"/>
+        <ImageView
+            android:id="@+id/app_1"
+            android:layout_width="@dimen/folder_icon_app_preview"
+            android:layout_height="@dimen/folder_icon_app_preview"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:antialias="true"/>
+        <ImageView
+            android:id="@+id/app_2"
+            android:layout_width="@dimen/folder_icon_app_preview"
+            android:layout_height="@dimen/folder_icon_app_preview"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            android:antialias="true"/>
+        <ImageView
+            android:id="@+id/app_3"
+            android:layout_width="@dimen/folder_icon_app_preview"
+            android:layout_height="@dimen/folder_icon_app_preview"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:antialias="true"/>
+    </RelativeLayout>
+
     <com.android.launcher3.BubbleTextView
         style="@style/WorkspaceIcon"
         android:id="@+id/folder_icon_name"
-        android:layout_gravity="top"
+        android:layout_gravity="bottom"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </com.android.launcher3.FolderIcon>
diff --git a/res/layout/hidden_folder.xml b/res/layout/hidden_folder.xml
index ca06f6e48..59006fb2c 100644
--- a/res/layout/hidden_folder.xml
+++ b/res/layout/hidden_folder.xml
@@ -22,7 +22,7 @@
             android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:src="@drawable/folder_unlock"
+            android:src="@drawable/folder_unlocked"
             android:background="@drawable/listitem_bg" />
 
         <EditText
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 3b1e5be7c..2339e7a93 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -13,62 +13,59 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <com.android.launcher3.Folder
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/quantum_panel">
+    android:paddingStart="@dimen/folder_preview_padding"
+    android:paddingEnd="@dimen/folder_preview_padding"
+    android:layout_gravity="center">
+
+    <ImageView
+        android:id="@+id/folder_lock"
+        android:layout_width="@dimen/folder_lock_icon"
+        android:layout_height="@dimen/folder_lock_icon"
+        android:paddingBottom="@dimen/folder_name_padding"
+        android:paddingTop="@dimen/folder_name_padding"
+        android:paddingLeft="@dimen/folder_name_padding"
+        android:paddingRight="@dimen/folder_name_padding"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="@dimen/folder_lock_margin"
+        android:src="@drawable/folder_unlocked" />
 
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-      <com.android.launcher3.CellLayout
-          android:id="@+id/folder_content"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:cacheColorHint="#ff333333"
-          android:hapticFeedbackEnabled="false" />
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal">
+        <com.android.launcher3.CellLayout
+            android:id="@+id/folder_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:cacheColorHint="#ff333333"
+            android:hapticFeedbackEnabled="false" />
     </ScrollView>
 
-    <RelativeLayout
-        android:id="@+id/folder_title_section"
-        android:layout_width="match_parent"
+    <com.android.launcher3.FolderEditText
+        android:id="@+id/folder_name"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:id="@+id/folder_lock"
-            android:layout_width="@dimen/folder_lock_icon"
-            android:layout_height="@dimen/folder_lock_icon"
-            android:paddingBottom="@dimen/folder_name_padding"
-            android:paddingTop="@dimen/folder_name_padding"
-            android:adjustViewBounds="true"
-            android:layout_alignParentRight="true"
-            android:src="@drawable/folder_unlock" />
-
-        <com.android.launcher3.FolderEditText
-            android:id="@+id/folder_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:background="#00000000"
-            android:fontFamily="sans-serif-condensed"
-            android:gravity="center_horizontal"
-            android:hint="@string/folder_hint_text"
-            android:imeOptions="flagNoExtractUi"
-            android:paddingBottom="@dimen/folder_name_padding"
-            android:paddingTop="@dimen/folder_name_padding"
-            android:singleLine="true"
-            android:textColor="#ff777777"
-            android:textColorHighlight="#ffCCCCCC"
-            android:textCursorDrawable="@null"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@id/folder_lock"
-            android:textSize="16sp" />
-    </RelativeLayout>
+        android:layout_centerHorizontal="true"
+        android:background="#00000000"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="center_horizontal"
+        android:layout_gravity="center_horizontal"
+        android:hint="@string/folder_hint_text"
+        android:imeOptions="flagNoExtractUi"
+        android:paddingBottom="@dimen/folder_name_padding"
+        android:paddingTop="@dimen/folder_name_padding"
+        android:singleLine="true"
+        android:textColor="@color/workspace_icon_text_color"
+        android:textColorHighlight="#ffCCCCCC"
+        android:textColorHint="#78ffffff"
+        android:textCursorDrawable="@null"
+        android:textSize="20sp" />
 
 </com.android.launcher3.Folder>