Trebuchet: new folder UI v1

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

Designer: Hayden Schoen

Change-Id: I255cd4664432d84aebecf7e16ace5d9948573e27

37 files changed, 241 insertions, 64 deletions

diff --git a/res/drawable-hdpi/folder_bg.9.png b/res/drawable-hdpi/folder_bg.9.png
new file mode 100755
index 000000000..4b2108053
--- /dev/null
+++ b/res/drawable-hdpi/folder_bg.9.png
diff --git a/res/drawable-hdpi/folder_bg_opaque.9.png b/res/drawable-hdpi/folder_bg_opaque.9.png
new file mode 100755
index 000000000..08e152e49
--- /dev/null
+++ b/res/drawable-hdpi/folder_bg_opaque.9.png
diff --git a/res/drawable-hdpi/folder_fill_highlight.9.png b/res/drawable-hdpi/folder_fill_highlight.9.png
new file mode 100755
index 000000000..c7dde8930
--- /dev/null
+++ b/res/drawable-hdpi/folder_fill_highlight.9.png
diff --git a/res/drawable-hdpi/folder_lock.png b/res/drawable-hdpi/folder_lock.png
deleted file mode 100644
index 9d5ac426d..000000000
--- a/res/drawable-hdpi/folder_lock.png
+++ /dev/null
diff --git a/res/drawable-hdpi/folder_lock_light.png b/res/drawable-hdpi/folder_lock_light.png
deleted file mode 100644
index ca849e8d7..000000000
--- a/res/drawable-hdpi/folder_lock_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/folder_unlock.png b/res/drawable-hdpi/folder_unlock.png
deleted file mode 100644
index 58524209c..000000000
--- a/res/drawable-hdpi/folder_unlock.png
+++ /dev/null
diff --git a/res/drawable-mdpi/folder_bg.9.png b/res/drawable-mdpi/folder_bg.9.png
new file mode 100755
index 000000000..36154e2fb
--- /dev/null
+++ b/res/drawable-mdpi/folder_bg.9.png
diff --git a/res/drawable-mdpi/folder_bg_opaque.9.png b/res/drawable-mdpi/folder_bg_opaque.9.png
new file mode 100755
index 000000000..673d740ae
--- /dev/null
+++ b/res/drawable-mdpi/folder_bg_opaque.9.png
diff --git a/res/drawable-mdpi/folder_fill_highlight.9.png b/res/drawable-mdpi/folder_fill_highlight.9.png
new file mode 100755
index 000000000..418048471
--- /dev/null
+++ b/res/drawable-mdpi/folder_fill_highlight.9.png
diff --git a/res/drawable-mdpi/folder_lock.png b/res/drawable-mdpi/folder_lock.png
deleted file mode 100644
index c44921a29..000000000
--- a/res/drawable-mdpi/folder_lock.png
+++ /dev/null
diff --git a/res/drawable-mdpi/folder_lock_light.png b/res/drawable-mdpi/folder_lock_light.png
deleted file mode 100644
index 293444ec8..000000000
--- a/res/drawable-mdpi/folder_lock_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/folder_unlock.png b/res/drawable-mdpi/folder_unlock.png
deleted file mode 100644
index 93e60fc45..000000000
--- a/res/drawable-mdpi/folder_unlock.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/folder_bg.9.png b/res/drawable-xhdpi/folder_bg.9.png
new file mode 100755
index 000000000..c3a30837a
--- /dev/null
+++ b/res/drawable-xhdpi/folder_bg.9.png
diff --git a/res/drawable-xhdpi/folder_bg_opaque.9.png b/res/drawable-xhdpi/folder_bg_opaque.9.png
new file mode 100755
index 000000000..42a1e1d5d
--- /dev/null
+++ b/res/drawable-xhdpi/folder_bg_opaque.9.png
diff --git a/res/drawable-xhdpi/folder_fill_highlight.9.png b/res/drawable-xhdpi/folder_fill_highlight.9.png
new file mode 100755
index 000000000..c1a4f702f
--- /dev/null
+++ b/res/drawable-xhdpi/folder_fill_highlight.9.png
diff --git a/res/drawable-xhdpi/folder_lock.png b/res/drawable-xhdpi/folder_lock.png
deleted file mode 100644
index 5d8610b2f..000000000
--- a/res/drawable-xhdpi/folder_lock.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/folder_lock_light.png b/res/drawable-xhdpi/folder_lock_light.png
deleted file mode 100644
index 4342c50f6..000000000
--- a/res/drawable-xhdpi/folder_lock_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/folder_unlock.png b/res/drawable-xhdpi/folder_unlock.png
deleted file mode 100644
index a5b99c376..000000000
--- a/res/drawable-xhdpi/folder_unlock.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/folder_bg.9.png b/res/drawable-xxhdpi/folder_bg.9.png
new file mode 100755
index 000000000..d698a0750
--- /dev/null
+++ b/res/drawable-xxhdpi/folder_bg.9.png
diff --git a/res/drawable-xxhdpi/folder_bg_opaque.9.png b/res/drawable-xxhdpi/folder_bg_opaque.9.png
new file mode 100755
index 000000000..25a4ffffb
--- /dev/null
+++ b/res/drawable-xxhdpi/folder_bg_opaque.9.png
diff --git a/res/drawable-xxhdpi/folder_fill_highlight.9.png b/res/drawable-xxhdpi/folder_fill_highlight.9.png
new file mode 100755
index 000000000..c80ead243
--- /dev/null
+++ b/res/drawable-xxhdpi/folder_fill_highlight.9.png
diff --git a/res/drawable-xxhdpi/folder_lock.png b/res/drawable-xxhdpi/folder_lock.png
deleted file mode 100644
index 16726d395..000000000
--- a/res/drawable-xxhdpi/folder_lock.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/folder_lock_light.png b/res/drawable-xxhdpi/folder_lock_light.png
deleted file mode 100644
index 4226f6af8..000000000
--- a/res/drawable-xxhdpi/folder_lock_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/folder_unlock.png b/res/drawable-xxhdpi/folder_unlock.png
deleted file mode 100644
index 95c18cbc2..000000000
--- a/res/drawable-xxhdpi/folder_unlock.png
+++ /dev/null
diff --git a/res/drawable/folder_container.xml b/res/drawable/folder_container.xml
new file mode 100644
index 000000000..b0a1c8492
--- /dev/null
+++ b/res/drawable/folder_container.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="72dp"
+        android:width="72dp"
+        android:viewportHeight="72"
+        android:viewportWidth="72">
+
+    <group
+        android:name="folder_container">
+        <path
+            android:name="folder_path"
+            android:pathData="  M6,4
+                                h60
+                                c1.2,0 2,0.8 2,2
+                                v60
+                                c0,1.2 -0.8,2 -2,2
+                                h-60
+                                c-1.2,0 -2,-0.8 -2,-2
+                                v-60
+                                c0,-1.2 0.8,-2 2,-2
+                                z"
+            android:fillColor="#ff524e5e"/>
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/res/drawable/folder_locked.xml b/res/drawable/folder_locked.xml
new file mode 100644
index 000000000..8b887896d
--- /dev/null
+++ b/res/drawable/folder_locked.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+   android:width="24dp"
+   android:height="24dp"
+   android:viewportWidth="24"
+   android:viewportHeight="24">
+
+   <path
+       android:fillColor="#fafafa"
+       android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1 .9 2 2
+2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6-5.1c1.71 0 3.1 1.39 3.1
+3.1v2H9V6h-.1c0-1.71 1.39-3.1 3.1-3.1zM18 20H6V10h12v10zm-6-3c1.1 0 2-.9
+2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z" />
+</vector>
diff --git a/res/drawable/folder_unlocked.xml b/res/drawable/folder_unlocked.xml
new file mode 100644
index 000000000..d34d9b764
--- /dev/null
+++ b/res/drawable/folder_unlocked.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+   android:width="24dp"
+   android:height="24dp"
+   android:viewportWidth="24"
+   android:viewportHeight="24">
+
+   <path
+       android:fillColor="#fafafa"
+       android:pathData="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7
+3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2
+2v10c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z" />
+</vector>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 4c097ba0a..4242b065d 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -24,6 +24,33 @@
     android:layout_height="match_parent"
     android:background="@drawable/workspace_bg">
 
+    <FrameLayout
+        android:id="@+id/reveal_fake_page_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible"
+        android:alpha=".5"
+        android:clipToPadding="false">
+        <View
+            android:id="@+id/reveal_fake_page"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/folder_background"/>
+
+        <View
+            android:id="@+id/reveal_fake_folder_outline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/folder_bg_opaque"/>
+
+        <ImageView
+            android:id="@+id/reveal_fake_folder_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:background="@drawable/folder_bg_opaque"/>
+    </FrameLayout>
+
     <com.android.launcher3.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index e193e4820..9ff292824 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -24,6 +24,33 @@
     android:layout_height="match_parent"
     android:background="@drawable/workspace_bg">
 
+    <FrameLayout
+        android:id="@+id/reveal_fake_page_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible"
+        android:alpha=".5"
+        android:clipToPadding="false">
+        <View
+            android:id="@+id/reveal_fake_page"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/folder_background"/>
+
+        <View
+            android:id="@+id/reveal_fake_folder_outline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/folder_bg_opaque"/>
+
+        <ImageView
+            android:id="@+id/reveal_fake_folder_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:background="@drawable/folder_bg_opaque"/>
+    </FrameLayout>
+
     <com.android.launcher3.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 772110527..abf06ae25 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -24,6 +24,33 @@
     android:layout_height="match_parent"
     android:background="@drawable/workspace_bg">
 
+    <FrameLayout
+        android:id="@+id/reveal_fake_page_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible"
+        android:alpha=".5"
+        android:clipToPadding="false">
+        <View
+            android:id="@+id/reveal_fake_page"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/folder_background"/>
+
+        <View
+            android:id="@+id/reveal_fake_folder_outline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/folder_bg_opaque"/>
+
+        <ImageView
+            android:id="@+id/reveal_fake_folder_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:background="@drawable/folder_bg_opaque"/>
+    </FrameLayout>
+
     <com.android.launcher3.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
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>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7f2f07ad7..901604d70 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -4,16 +4,16 @@
 **
 ** Copyright 2008, 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 
+** 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 
+** 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.
 */
 -->
@@ -57,4 +57,6 @@
 
     <color name="scrubber_background">#CC14191E</color>
     <color name="aftv_shadowColor">#b0000000</color>
+
+    <color name="folder_background">#141a1e</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0171fc55a..b915a2876 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -4,9 +4,9 @@
      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.
@@ -104,9 +104,14 @@
 <!-- Folders -->
     <!-- The amount that the preview contents are inset from the preview background -->
     <dimen name="folder_preview_padding">4dp</dimen>
+    <dimen name="folder_lock_margin">6dp</dimen>
     <dimen name="folder_name_padding">10dp</dimen>
     <dimen name="folder_lock_icon">50dp</dimen>
 
+    <!-- Folder icon dimens -->
+    <dimen name="folder_icon">64dp</dimen>
+    <dimen name="folder_icon_app_preview">26dp</dimen>
+
 <!-- Sizes for managed profile badges -->
     <dimen name="profile_badge_size">24dp</dimen>
     <dimen name="profile_badge_margin">4dp</dimen>
@@ -136,4 +141,8 @@
     <dimen name="aftv_marginTop">10dp</dimen>
     <dimen name="aftv_minTextSize">8sp</dimen>
     <dimen name="aftv_textSize">24sp</dimen>
+
+    <!-- Folder open animation -->
+    <integer name="folder_translate_y_dist">300</integer>
+    <integer name="folder_icon_translate_y_dist">100</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 69b296c26..adaa25a04 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -203,7 +203,7 @@ s -->
     <string name="dream_name">Rocket Launcher</string>
 
     <!-- Default folder title -->
-    <string name="folder_hint_text">Unnamed Folder</string>
+    <string name="folder_hint_text">Tap to Name</string>
 
     <!-- Accessibility -->
     <skip />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3ab25a2de..bb0401868 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -47,7 +47,7 @@
 
     <style name="WorkspaceIcon.Folder">
         <item name="android:background">@null</item>
-        <item name="android:textColor">@color/quantum_panel_text_color</item>
+        <item name="android:textColor">@color/workspace_icon_text_color</item>
         <item name="android:shadowRadius">0</item>
         <item name="customShadows">false</item>
     </style>