commit a1c7ff12192b3bf670f7870f22b0f9b8ed161289
author Winson Chung <winsonc@google.com> Fri Sep 09 11:34:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 09 11:34:13 2011 -0700
tree 74ea6e0197bee4c6f7f70b20316c44c89b8588d0
parent ce39bfdb168d45018cec989eccc7a4754f1ea900
parent 09bfc45ae8aee2db579698c15007b1d138b4141f

Merge "Fixing small regression where dropping from a folder causes the search bar to flash."

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 65ed04b..78c4b29 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,7 +200,7 @@
     <skip />    
 
     <!-- The Google Apps folder name -->
-    <string name="google_apps_folder_name">Google Apps</string>
+    <string name="google_apps_folder_name">Google</string>
 
     <!-- Text to show user in place of a gadget when we can't display it properly -->
     <string name="gadget_error_text">Problem loading widget</string>

res/xml/default_workspace.xml

diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 5bb6b4b..860e41f 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -37,7 +37,8 @@
     <folder
         launcher:screen="2"
         launcher:x="3"
-        launcher:y="3">
+        launcher:y="3"
+        launcher:title="@string/google_apps_folder_name">
         <favorite
             launcher:packageName="com.google.android.apps.plus"
             launcher:className="com.google.android.apps.plus.phone.HomeActivity" />