From 35614fdc7d13179ba9cbc80f15eca6d63cf3229d Mon Sep 17 00:00:00 2001
From: Vineet Patil <vpatil@cyngn.com>
Date: Tue, 17 Nov 2015 14:23:05 -0800
Subject: Implementation of folder animation changes as per cm-13.0 Folder
 animations in parity with cm.

Folder Layout Revision

Updated the folder layout to reflect design revisions based on community feedback

Change-Id: Ica1bb796dfccf779a954cf0903a1ae94a010ea1a

Conflicts:
	res/drawable-hdpi/folder_bg.9.png
	res/drawable-hdpi/folder_fill_highlight.9.png
	res/drawable-mdpi/folder_bg.9.png
	res/drawable-mdpi/folder_fill_highlight.9.png
	res/drawable-xhdpi/folder_bg.9.png
	res/drawable-xhdpi/folder_fill_highlight.9.png
	res/drawable-xxhdpi/folder_bg.9.png
	res/drawable-xxhdpi/folder_fill_highlight.9.png
	res/layout-land/launcher.xml
	res/layout-port/launcher.xml
	res/layout-sw720dp/launcher.xml
	res/layout/user_folder.xml
	res/values/dimens.xml
	src/com/android/launcher3/Folder.java
	src/com/android/launcher3/FolderIcon.java
	src/com/android/launcher3/Launcher.java

Folder animation changes as per cm-13.0

Change-Id: I019511a58bd9f6a60a3c9b68c826726881cec83f

Implementing folder animations

Change-Id: I83f17c996ecc894ce22fd195b9b33caf58e2e822
---
 res/layout/folder_icon.xml | 50 +++++++++++++++++++++++++++++++++++++++-------
 res/layout/user_folder.xml |  6 +++---
 2 files changed, 46 insertions(+), 10 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml
index 237af6890..5e29a1a0d 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"/>
+        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/Icon"
         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/user_folder.xml b/res/layout/user_folder.xml
index 252ebf01e..2152a9986 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -18,7 +18,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/quantum_panel"
+    android:background="@drawable/folder_bg"
     android:elevation="5dp"
     android:orientation="vertical" >
 
@@ -67,7 +67,7 @@
             android:paddingBottom="8dp"
             android:paddingTop="4dp"
             android:singleLine="true"
-            android:textColor="#ff777777"
+            android:textColor="@color/workspace_icon_text_color"
             android:textColorHighlight="#ffCCCCCC"
             android:textColorHint="#ff808080"
             android:textSize="14sp" />
@@ -81,4 +81,4 @@
 
     </LinearLayout>
 
-</com.android.launcher3.Folder>
\ No newline at end of file
+</com.android.launcher3.Folder>
-- 
cgit v1.2.3