commit eabb31b088b0083833eef77cf2e236f8f6124ef0
author The Android Automerger <android-build@android.com> Fri Oct 12 10:27:16 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Oct 12 10:27:16 2012 -0700
tree 66cacc7845f482311eeb5ed38fadba936e3bd659
parent 0d06152d4026e933d8308002e1d53ca4eba6cad2
parent 3e40565ed1093d446ed76fc9247f9d7ea06fd5bd

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19d363c..04e45ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,4 +261,17 @@
     <string name="folder_renamed">Folder renamed to <xliff:g id="name" example="Games">%1$s</xliff:g></string>
     <!-- Folder name format -->
     <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string>
+
+    <!-- Strings used in device overlays -->
+
+    <!-- Clings -->
+    <!-- Dummy string [CHAR_LIMIT=40] -->
+    <add-resource type="string" name="custom_workspace_cling_title_1"/>
+    <!-- Dummy string [CHAR_LIMIT=60] -->
+    <add-resource type="string" name="custom_workspace_cling_description_1"/>
+    <!-- Dummy string [CHAR_LIMIT=40] -->
+    <add-resource type="string" name="custom_workspace_cling_title_2"/>
+    <!-- Dummy string [CHAR_LIMIT=60] -->
+    <add-resource type="string" name="custom_workspace_cling_description_2"/>
+
 </resources>

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 6350c84..4940ae0 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -254,6 +254,13 @@
     private float[] mNewRotationYs;
     private float mTransitionProgress;
 
+    private final Runnable mBindPages = new Runnable() {
+        @Override
+        public void run() {
+            mLauncher.getModel().bindRemainingSynchronousPages();
+        }
+    };
+
     /**
      * Used to inflate the Workspace from XML.
      *
@@ -1292,12 +1299,7 @@
         super.onDraw(canvas);
 
         // Call back to LauncherModel to finish binding after the first draw
-        post(new Runnable() {
-            @Override
-            public void run() {
-                mLauncher.getModel().bindRemainingSynchronousPages();
-            }
-        });
+        post(mBindPages);
     }
 
     boolean isDrawingBackgroundGradient() {