From 2777273a2a5c710f26726ada0fe4a8f33da57b52 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 11 Nov 2013 14:00:56 +0000
Subject: [PATCH 001/147] Add method to determine if Launcher is using vertical
 bars

Change-Id: I7e9096cf81b49d213025c6f98708186330448fc0
---
 src/com/android/launcher3/Launcher.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d52ef9f7e4..ba334e304c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3953,6 +3953,11 @@ public class Launcher extends Activity
         return bounceAnim;
     }
 
+    public boolean useVerticalBarLayout() {
+        return LauncherAppState.getInstance().getDynamicGrid().
+                getDeviceProfile().isVerticalBarLayout();
+    }
+
     @Override
     public void bindSearchablesChanged() {
         boolean searchVisible = updateGlobalSearchIcon();

From ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 11 Nov 2013 15:37:21 +0000
Subject: [PATCH 002/147] Fix NPE we're seeing in feedback (issue 11626428)

Change-Id: I848ca84b325339004ba8ea50a01f5240eea356f5
---
 src/com/android/launcher3/DragController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 5e733f08bf..ab4823343e 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -327,7 +327,7 @@ public class DragController {
                 for (AppInfo info : appInfos) {
                     // Added null checks to prevent NPE we've seen in the wild
                     if (dragInfo != null &&
-                        dragInfo.intent != null) {
+                            dragInfo.intent != null && info != null) {
                         ComponentName cn = dragInfo.intent.getComponent();
                         boolean isSameComponent = cn.equals(info.componentName) ||
                                 packageNames.contains(cn.getPackageName());

From 2d13e6934fd613a289a220b224d45e76f5dd211d Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 11 Nov 2013 16:44:44 +0100
Subject: [PATCH 003/147] Fix wallpaper cropping bugs

- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size

Change-Id: I42be79c68b883a6e329dcc5645d7db6cd6e3eeeb
---
 src/com/android/launcher3/CropView.java       |  3 +-
 .../launcher3/WallpaperCropActivity.java      | 29 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java
index 9224e3bb21..578b8eafd0 100644
--- a/src/com/android/launcher3/CropView.java
+++ b/src/com/android/launcher3/CropView.java
@@ -165,7 +165,8 @@ public class CropView extends TiledImageView implements OnScaleGestureListener {
                 final float imageWidth = imageDims[0];
                 final float imageHeight = imageDims[1];
                 mMinScale = Math.max(w / imageWidth, h / imageHeight);
-                mRenderer.scale = Math.max(mMinScale, mRenderer.scale);
+                mRenderer.scale =
+                        Math.max(mMinScale, resetScale ? Float.MIN_VALUE : mRenderer.scale);
             }
         }
     }
diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
index 276aba3061..65223ad22d 100644
--- a/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/src/com/android/launcher3/WallpaperCropActivity.java
@@ -550,6 +550,8 @@ public class WallpaperCropActivity extends Activity {
                 Rect roundedTrueCrop = new Rect();
                 Matrix rotateMatrix = new Matrix();
                 Matrix inverseRotateMatrix = new Matrix();
+
+                Point bounds = getImageBounds();
                 if (mRotation > 0) {
                     rotateMatrix.setRotate(mRotation);
                     inverseRotateMatrix.setRotate(-mRotation);
@@ -557,7 +559,6 @@ public class WallpaperCropActivity extends Activity {
                     mCropBounds.roundOut(roundedTrueCrop);
                     mCropBounds = new RectF(roundedTrueCrop);
 
-                    Point bounds = getImageBounds();
                     if (bounds == null) {
                         Log.w(LOGTAG, "cannot get bounds for image");
                         failure = true;
@@ -629,12 +630,38 @@ public class WallpaperCropActivity extends Activity {
                         Utils.closeSilently(is);
                     }
                     if (fullSize != null) {
+                        // Find out the true sample size that was used by the decoder
+                        scaleDownSampleSize = bounds.x / fullSize.getWidth();
                         mCropBounds.left /= scaleDownSampleSize;
                         mCropBounds.top /= scaleDownSampleSize;
                         mCropBounds.bottom /= scaleDownSampleSize;
                         mCropBounds.right /= scaleDownSampleSize;
                         mCropBounds.roundOut(roundedTrueCrop);
 
+                        // Adjust values to account for issues related to rounding
+                        if (roundedTrueCrop.width() > fullSize.getWidth()) {
+                            // Adjust the width
+                            roundedTrueCrop.right = roundedTrueCrop.left + fullSize.getWidth();
+                        }
+                        if (roundedTrueCrop.right > fullSize.getWidth()) {
+                            // Adjust the left value
+                            int adjustment = roundedTrueCrop.left -
+                                    Math.max(0, roundedTrueCrop.right - roundedTrueCrop.width());
+                            roundedTrueCrop.left -= adjustment;
+                            roundedTrueCrop.right -= adjustment;
+                        }
+                        if (roundedTrueCrop.height() > fullSize.getHeight()) {
+                            // Adjust the height
+                            roundedTrueCrop.bottom = roundedTrueCrop.top + fullSize.getHeight();
+                        }
+                        if (roundedTrueCrop.bottom > fullSize.getHeight()) {
+                            // Adjust the top value
+                            int adjustment = roundedTrueCrop.top -
+                                    Math.max(0, roundedTrueCrop.bottom - roundedTrueCrop.height());
+                            roundedTrueCrop.top -= adjustment;
+                            roundedTrueCrop.bottom -= adjustment;
+                        }
+
                         crop = Bitmap.createBitmap(fullSize, roundedTrueCrop.left,
                                 roundedTrueCrop.top, roundedTrueCrop.width(),
                                 roundedTrueCrop.height());

From 84a465aa0e795619b248047c5e21cd77c82b1ff1 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 11 Nov 2013 18:49:56 +0000
Subject: [PATCH 004/147] Small tweaks to custom content management

-> Never allow the custom content overhang onto the viewport when
   it is not the current page
-> Never fade the custom content screen as a consequence of scrolling

Change-Id: I91a4cfb3f740ee8b429084fce1c96258bac8dd9e
---
 src/com/android/launcher3/PagedView.java | 20 +++++++++++++++++++-
 src/com/android/launcher3/Workspace.java |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 7b56625232..3eecedbccf 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -902,6 +902,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         int verticalPadding = getPaddingTop() + getPaddingBottom();
 
         LayoutParams lp = (LayoutParams) getChildAt(startIndex).getLayoutParams();
+        LayoutParams nextLp;
 
         int childLeft = offsetX + (lp.isFullScreenPage ? 0 : getPaddingLeft());
         if (mPageScrolls == null || getChildCount() != mChildCountOnLastLayout) {
@@ -931,7 +932,24 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
                 int scrollOffsetLeft = lp.isFullScreenPage ? 0 : getPaddingLeft();
                 mPageScrolls[i] = childLeft - scrollOffsetLeft - offsetX;
-                childLeft += childWidth + mPageSpacing;
+
+                int pageGap = mPageSpacing;
+                int next = i + delta;
+                if (next != endIndex) {
+                    nextLp = (LayoutParams) getPageAt(next).getLayoutParams();
+                } else {
+                    nextLp = null;
+                }
+
+                // Prevent full screen pages from showing in the viewport
+                // when they are not the current page.
+                if (lp.isFullScreenPage) {
+                    pageGap = getPaddingLeft();
+                } else if (nextLp != null && nextLp.isFullScreenPage) {
+                    pageGap = getPaddingRight();
+                }
+
+                childLeft += childWidth + pageGap;
             }
         }
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7692ae6d8c..f36c815da5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1481,7 +1481,7 @@ public class Workspace extends SmoothPagedView
                 mState == State.NORMAL &&
                 !mIsSwitchingState &&
                 !isInOverscroll) {
-            for (int i = 0; i < getChildCount(); i++) {
+            for (int i = numCustomPages(); i < getChildCount(); i++) {
                 CellLayout child = (CellLayout) getChildAt(i);
                 if (child != null) {
                     float scrollProgress = getScrollProgress(screenCenter, child, i);

From 8e15fdf60a103391839433ced3c0990d13ba5012 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 11 Nov 2013 15:47:45 -0800
Subject: [PATCH 005/147] Prevent launching Widgets when cycling between
 Overview/Shrink state and Home. (Bug 11439120)

Change-Id: I21173f114228ba43172af9074d2ac1fadeee9886
---
 src/com/android/launcher3/Launcher.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ba334e304c..0c14ed93ce 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1191,7 +1191,9 @@ public class Launcher extends Activity
         widgetButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View arg0) {
-                showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
+                if (!mWorkspace.isSwitchingState()) {
+                    showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
+                }
             }
         });
         widgetButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1200,7 +1202,9 @@ public class Launcher extends Activity
         wallpaperButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View arg0) {
-                startWallpaper();
+                if (!mWorkspace.isSwitchingState()) {
+                    startWallpaper();
+                }
             }
         });
         wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1209,7 +1213,9 @@ public class Launcher extends Activity
         settingsButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View arg0) {
-                startSettings();
+                if (!mWorkspace.isSwitchingState()) {
+                    startSettings();
+                }
             }
         });
         settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());

From f0f2ffaedc39b4657a3b7e24a4a3a90e08ed087f Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 12 Nov 2013 11:44:58 +0000
Subject: [PATCH 006/147] Fix issue where extra page hangs around (issue
 11634172)

Change-Id: Ia0900c9fc07bc587259e36ed17816eaf519b10dc
---
 src/com/android/launcher3/Folder.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index bd61010803..f26d01f5d0 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -758,6 +758,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 }
                 completeDragExit();
             }
+        } else {
+            mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
         }
 
         mDeleteFolderOnDropCompleted = false;

From 1960ea4a7102bd0fa03cad1ea1e3a91f8e1bd9cd Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 12 Nov 2013 11:33:14 +0000
Subject: [PATCH 007/147] Fix CellLayout UNSPECIFIED exception (issue 11627191)

Change-Id: Id2f840a804c51e8c61bb28882796059584e4c8bb
---
 src/com/android/launcher3/Folder.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index bd61010803..714c5abd2e 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -119,6 +119,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     private int DRAG_MODE_REORDER = 1;
     private int mDragMode = DRAG_MODE_NONE;
 
+    // We avoid measuring the scroll view with a 0 width or height, as this
+    // results in CellLayout being measured as UNSPECIFIED, which it does
+    // not support.
+    private static final int MIN_CONTENT_DIMEN = 5;
+
     private boolean mDestroyed;
 
     private AutoScrollHelper mAutoScrollHelper;
@@ -959,8 +964,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         int maxContentAreaHeight = grid.availableHeightPx -
                 workspacePadding.top - workspacePadding.bottom -
                 mFolderNameHeight;
-        return Math.min(maxContentAreaHeight,
+        int height = Math.min(maxContentAreaHeight,
                 mContent.getDesiredHeight());
+        return Math.max(height, MIN_CONTENT_DIMEN);
+    }
+
+    private int getContentAreaWidth() {
+        return Math.max(mContent.getDesiredWidth(), MIN_CONTENT_DIMEN);
     }
 
     private int getFolderHeight() {
@@ -972,11 +982,12 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int width = getPaddingLeft() + getPaddingRight() + mContent.getDesiredWidth();
         int height = getFolderHeight();
-        int contentAreaWidthSpec = MeasureSpec.makeMeasureSpec(mContent.getDesiredWidth(),
+        int contentAreaWidthSpec = MeasureSpec.makeMeasureSpec(getContentAreaWidth(),
                 MeasureSpec.EXACTLY);
         int contentAreaHeightSpec = MeasureSpec.makeMeasureSpec(getContentAreaHeight(),
                 MeasureSpec.EXACTLY);
-        mContent.setFixedSize(mContent.getDesiredWidth(), mContent.getDesiredHeight());
+
+        mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight());
         mScrollView.measure(contentAreaWidthSpec, contentAreaHeightSpec);
         mFolderName.measure(contentAreaWidthSpec,
                 MeasureSpec.makeMeasureSpec(mFolderNameHeight, MeasureSpec.EXACTLY));

From 2f32ad29075bf666199cc49fe20014e00991d1bb Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 13 Nov 2013 11:29:49 +0000
Subject: [PATCH 008/147] Add logging for NPE (issue 11627249)

Change-Id: I75352f9eb1249fa5cc46d05cd7c168a868c6f7b7
---
 src/com/android/launcher3/Workspace.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f36c815da5..6c346c4b76 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2536,6 +2536,13 @@ public class Workspace extends SmoothPagedView
             icon.clearPressedOrFocusedBackground();
         }
 
+        if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) {
+            String msg = "Drag started with a view that has no tag set. This "
+                    + "will cause a crash (issue 11627249) down the line. "
+                    + "View: " + child + "  tag: " + child.getTag();
+            throw new IllegalStateException(msg);
+        }
+
         mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
                 DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale);
 

From a120b8e304f1541529f26ef5af13f8bb5ac655f6 Mon Sep 17 00:00:00 2001
From: Adam Copp <adamcopp@google.com>
Date: Tue, 12 Nov 2013 16:26:04 +0000
Subject: [PATCH 009/147] Hooks for subclasses to react to home presses.

This provides the nessecary hooks for GEL so that it can prevent
scrolling to the home screen when a search is open, instead choosing to
dismiss the search.

Bug: 11128544
Change-Id: I3c1b67bc271c1342db4a0abac364f2923bdeba3a
---
 src/com/android/launcher3/Launcher.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d52ef9f7e4..84173b01b8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1698,7 +1698,7 @@ public class Launcher extends Activity
             // In all these cases, only animate if we're already on home
             mWorkspace.exitWidgetResizeMode();
             if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() &&
-                    openFolder == null) {
+                    openFolder == null && shouldMoveToDefaultScreenOnHomeIntent()) {
                 mWorkspace.moveToDefaultScreen(true);
             }
 
@@ -1724,6 +1724,8 @@ public class Launcher extends Activity
             if (mAppsCustomizeTabHost != null) {
                 mAppsCustomizeTabHost.reset();
             }
+
+            onHomeIntent();
         }
 
         if (DEBUG_RESUME_TIME) {
@@ -1731,6 +1733,21 @@ public class Launcher extends Activity
         }
     }
 
+    /**
+     * Override point for subclasses to prevent movement to the default screen when the home
+     * button is pressed. Used (for example) in GEL, to prevent movement during a search.
+     */
+    protected boolean shouldMoveToDefaultScreenOnHomeIntent() {
+        return true;
+    }
+
+    /**
+     * Override point for subclasses to provide custom behaviour for when a home intent is fired.
+     */
+    protected void onHomeIntent() {
+        // Do nothing
+    }
+
     @Override
     public void onRestoreInstanceState(Bundle state) {
         super.onRestoreInstanceState(state);

From 4346746ef37413168a5cbec46bb6db8f96b0123a Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 14 Nov 2013 12:03:58 +0100
Subject: [PATCH 010/147] Use AsyncTasks instead of creating new threads

Change-Id: If166869dfbeb84d4dee2203f5b98a22b9d20719d
---
 .../android/launcher3/DeleteDropTarget.java   |  8 +++--
 src/com/android/launcher3/Launcher.java       | 30 ++++++++++---------
 .../android/launcher3/PreloadReceiver.java    |  9 +++---
 .../launcher3/WallpaperCropActivity.java      |  7 +++--
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 4023dafb65..e3a154bb13 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -29,6 +29,7 @@ import android.content.res.Resources;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.drawable.TransitionDrawable;
+import android.os.AsyncTask;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -334,11 +335,12 @@ public class DeleteDropTarget extends ButtonDropTarget {
             if (appWidgetHost != null) {
                 // Deleting an app widget ID is a void call but writes to disk before returning
                 // to the caller...
-                new Thread("deleteAppWidgetId") {
-                    public void run() {
+                new AsyncTask<Void, Void, Void>() {
+                    public Void doInBackground(Void ... args) {
                         appWidgetHost.deleteAppWidgetId(launcherAppWidgetInfo.appWidgetId);
+                        return null;
                     }
-                }.start();
+                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
             }
         }
         if (wasWaitingForUninstall && !mWaitingForUninstall) {
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0c14ed93ce..b76379add2 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -579,12 +579,12 @@ public class Launcher extends Activity
             mIconCache.flush();
 
             final LocaleConfiguration localeConfiguration = sLocaleConfiguration;
-            new Thread("WriteLocaleConfiguration") {
-                @Override
-                public void run() {
+            new AsyncTask<Void, Void, Void>() {
+                public Void doInBackground(Void ... args) {
                     writeConfiguration(Launcher.this, localeConfiguration);
+                    return null;
                 }
-            }.start();
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
         }
     }
 
@@ -1453,11 +1453,12 @@ public class Launcher extends Activity
             if (appWidgetId != -1) {
                 // Deleting an app widget ID is a void call but writes to disk before returning
                 // to the caller...
-                new Thread("deleteAppWidgetId") {
-                    public void run() {
+                new AsyncTask<Void, Void, Void>() {
+                    public Void doInBackground(Void ... args) {
                         mAppWidgetHost.deleteAppWidgetId(appWidgetId);
+                        return null;
                     }
-                }.start();
+                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
             }
             showOutOfSpaceMessage(isHotseatLayout(layout));
             return;
@@ -4207,13 +4208,14 @@ public class Launcher extends Activity
                 public void run() {
                     cling.cleanup();
                     // We should update the shared preferences on a background thread
-                    new Thread("dismissClingThread") {
-                        public void run() {
+                    new AsyncTask<Void, Void, Void>() {
+                        public Void doInBackground(Void ... args) {
                             SharedPreferences.Editor editor = mSharedPrefs.edit();
                             editor.putBoolean(flag, true);
                             editor.commit();
+                            return null;
                         }
-                    }.start();
+                    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
                     if (postAnimationCb != null) {
                         postAnimationCb.run();
                     }
@@ -4503,9 +4505,8 @@ public class Launcher extends Activity
 
     public void dumpLogsToLocalData() {
         if (DEBUG_DUMP_LOG) {
-            new Thread("DumpLogsToLocalData") {
-                @Override
-                public void run() {
+            new AsyncTask<Void, Void, Void>() {
+                public Void doInBackground(Void ... args) {
                     boolean success = false;
                     sDateStamp.setTime(sRunStart);
                     String FILENAME = sDateStamp.getMonth() + "-"
@@ -4543,8 +4544,9 @@ public class Launcher extends Activity
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
+                    return null;
                 }
-            }.start();
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
         }
     }
 }
diff --git a/src/com/android/launcher3/PreloadReceiver.java b/src/com/android/launcher3/PreloadReceiver.java
index 75e5c98bc2..ca25746eb5 100644
--- a/src/com/android/launcher3/PreloadReceiver.java
+++ b/src/com/android/launcher3/PreloadReceiver.java
@@ -19,6 +19,7 @@ package com.android.launcher3;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -39,12 +40,12 @@ public class PreloadReceiver extends BroadcastReceiver {
             if (LOGD) {
                 Log.d(TAG, "workspace name: " + name + " id: " + workspaceResId);
             }
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
+            new AsyncTask<Void, Void, Void>() {
+                public Void doInBackground(Void ... args) {
                     provider.loadDefaultFavoritesIfNecessary(workspaceResId);
+                    return null;
                 }
-            }).start();
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
         }
     }
 }
diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
index 65223ad22d..2102599eec 100644
--- a/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/src/com/android/launcher3/WallpaperCropActivity.java
@@ -786,14 +786,15 @@ public class WallpaperCropActivity extends Activity {
             final WallpaperManager wallpaperManager) {
         final Point defaultWallpaperSize = getDefaultWallpaperSize(res, windowManager);
 
-        new Thread("suggestWallpaperDimension") {
-            public void run() {
+        new AsyncTask<Void, Void, Void>() {
+            public Void doInBackground(Void ... args) {
                 // If we have saved a wallpaper width/height, use that instead
                 int savedWidth = sharedPrefs.getInt(WALLPAPER_WIDTH_KEY, defaultWallpaperSize.x);
                 int savedHeight = sharedPrefs.getInt(WALLPAPER_HEIGHT_KEY, defaultWallpaperSize.y);
                 wallpaperManager.suggestDesiredDimensions(savedWidth, savedHeight);
+                return null;
             }
-        }.start();
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
     }
 
     protected static RectF getMaxCropRect(

From c76e1dda0875c13131462d80d0c1721a6149e08d Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 14 Nov 2013 11:09:14 +0000
Subject: [PATCH 011/147] Change the way view ids are assigned (issue 11627801)

Change-Id: I4d9c0542ea3ac581c4a9f4da68824f0b498ea337
---
 src/com/android/launcher3/Launcher.java  | 41 ++++++++++++++++++++++--
 src/com/android/launcher3/Workspace.java |  6 ++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0c14ed93ce..d1cdf5cd7d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -45,7 +45,6 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
@@ -113,6 +112,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Default launcher application.
@@ -181,8 +181,10 @@ public class Launcher extends Activity
     private static final String RUNTIME_STATE_PENDING_ADD_SPAN_Y = "launcher.add_span_y";
     // Type: parcelable
     private static final String RUNTIME_STATE_PENDING_ADD_WIDGET_INFO = "launcher.add_widget_info";
- // Type: parcelable
+    // Type: parcelable
     private static final String RUNTIME_STATE_PENDING_ADD_WIDGET_ID = "launcher.add_widget_id";
+    // Type: int[]
+    private static final String RUNTIME_STATE_VIEW_IDS = "launcher.view_ids";
 
     private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
     private static final String TOOLBAR_SEARCH_ICON_METADATA_NAME =
@@ -207,6 +209,9 @@ public class Launcher extends Activity
     private static final Object sLock = new Object();
     private static int sScreen = DEFAULT_SCREEN;
 
+    private HashMap<Integer, Integer> mItemIdToViewId = new HashMap<Integer, Integer>();
+    private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);
+
     // How long to wait before the new-shortcut animation automatically pans the workspace
     private static int NEW_APPS_PAGE_MOVE_DELAY = 500;
     private static int NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS = 5;
@@ -670,6 +675,34 @@ public class Launcher extends Activity
         }
     }
 
+    /**
+     * Copied from View -- the View version of the method isn't called
+     * anywhere else in our process and only exists for API level 17+,
+     * so it's ok to keep our own version with no API requirement.
+     */
+    public static int generateViewId() {
+        for (;;) {
+            final int result = sNextGeneratedId.get();
+            // aapt-generated IDs have the high byte nonzero; clamp to the range under that.
+            int newValue = result + 1;
+            if (newValue > 0x00FFFFFF) newValue = 1; // Roll over to 1, not 0.
+            if (sNextGeneratedId.compareAndSet(result, newValue)) {
+                return result;
+            }
+        }
+    }
+
+    public int getViewIdForItem(ItemInfo info) {
+        // This cast is safe given the > 2B range for int.
+        int itemId = (int) info.id;
+        if (mItemIdToViewId.containsKey(itemId)) {
+            return mItemIdToViewId.get(itemId);
+        }
+        int viewId = generateViewId();
+        mItemIdToViewId.put(itemId, viewId);
+        return viewId;
+    }
+
     /**
      * Returns whether we should delay spring loaded mode -- for shortcuts and widgets that have
      * a configuration step, this allows the proper animations to run after other transitions.
@@ -1108,6 +1141,7 @@ public class Launcher extends Activity
      *
      * @param savedState The previous state.
      */
+    @SuppressWarnings("unchecked")
     private void restoreState(Bundle savedState) {
         if (savedState == null) {
             return;
@@ -1160,6 +1194,8 @@ public class Launcher extends Activity
             int currentIndex = savedState.getInt("apps_customize_currentIndex");
             mAppsCustomizeContent.restorePageForIndex(currentIndex);
         }
+        mItemIdToViewId = (HashMap<Integer, Integer>)
+                savedState.getSerializable(RUNTIME_STATE_VIEW_IDS);
     }
 
     /**
@@ -1784,6 +1820,7 @@ public class Launcher extends Activity
             int currentIndex = mAppsCustomizeContent.getSaveInstanceStateIndex();
             outState.putInt("apps_customize_currentIndex", currentIndex);
         }
+        outState.putSerializable(RUNTIME_STATE_VIEW_IDS, mItemIdToViewId);
     }
 
     @Override
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6c346c4b76..500f2a911a 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -949,7 +949,9 @@ public class Workspace extends SmoothPagedView
         }
 
         // Get the canonical child id to uniquely represent this view in this screen
-        int childId = LauncherModel.getCellLayoutChildId(container, screenId, x, y, spanX, spanY);
+        ItemInfo info = (ItemInfo) child.getTag();
+        int childId = mLauncher.getViewIdForItem(info);
+
         boolean markCellsAsOccupied = !(child instanceof Folder);
         if (!layout.addViewToCellLayout(child, insert ? 0 : -1, childId, lp, markCellsAsOccupied)) {
             // TODO: This branch occurs when the workspace is adding views
@@ -2890,8 +2892,6 @@ public class Workspace extends SmoothPagedView
                     lp.cellHSpan = item.spanX;
                     lp.cellVSpan = item.spanY;
                     lp.isLockedToGrid = true;
-                    cell.setId(LauncherModel.getCellLayoutChildId(container, mDragInfo.screenId,
-                            mTargetCell[0], mTargetCell[1], mDragInfo.spanX, mDragInfo.spanY));
 
                     if (container != LauncherSettings.Favorites.CONTAINER_HOTSEAT &&
                             cell instanceof LauncherAppWidgetHostView) {

From 76128b6359fc430542811fbb32e4a1d593a9ef07 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 14 Nov 2013 16:43:59 +0000
Subject: [PATCH 012/147] Fix issue where custom content would be invisible
 (issue 11644432)

-> Also making sure to clear the widget frame when moving to custom
   content.

Change-Id: I460c707f1b6ec34bc6d78c9df43a613d9bfced3c
---
 src/com/android/launcher3/Workspace.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 500f2a911a..9b6784c8d5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2110,7 +2110,8 @@ public class Workspace extends SmoothPagedView
             if (stateIsSmall) {
                 finalAlpha = 0f;
             } else if (stateIsNormal && mWorkspaceFadeInAdjacentScreens) {
-                finalAlpha = i == getNextPage() ? 1f : 0f;
+
+                finalAlpha = (i == getNextPage() || i < numCustomPages()) ? 1f : 0f;
             } else {
                 finalAlpha = 1f;
             }
@@ -2351,6 +2352,11 @@ public class Workspace extends SmoothPagedView
                 final CellLayout cl = (CellLayout) getChildAt(i);
                 cl.setShortcutAndWidgetAlpha(1f);
             }
+        } else {
+            for (int i = 0; i < numCustomPages(); i++) {
+                final CellLayout cl = (CellLayout) getChildAt(i);
+                cl.setShortcutAndWidgetAlpha(1f);
+            }
         }
         showCustomContentIfNecessary();
     }
@@ -4568,6 +4574,7 @@ public class Workspace extends SmoothPagedView
                 child.requestFocus();
             }
          }
+        exitWidgetResizeMode();
     }
 
     @Override

From eeb5bbc9409978cc2ae52d48380399fcde3d9f85 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 13 Nov 2013 15:47:05 -0800
Subject: [PATCH 013/147] Use the icon bounds for all calculations.

- Fixes a drag and drop issue when the dynamic
grid scales icons down, due to the drawable bounds
not being equal to their bitmap sizes.

Change-Id: If7c68b51131de7bac3195a2619e22340f7789432
---
 .../launcher3/AppsCustomizePagedView.java     |  7 +++++
 src/com/android/launcher3/DragController.java |  3 +-
 src/com/android/launcher3/DragLayer.java      | 10 +++++--
 src/com/android/launcher3/DragSource.java     |  5 ++++
 src/com/android/launcher3/DragView.java       | 12 ++++++++
 .../android/launcher3/FastBitmapDrawable.java | 28 ++++---------------
 src/com/android/launcher3/Folder.java         |  5 ++++
 src/com/android/launcher3/Workspace.java      |  8 +++++-
 8 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index d9ca1570b8..688ff82aa4 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -915,6 +915,13 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         return true;
     }
 
+    @Override
+    public float getIntrinsicIconScaleFactor() {
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+        return (float) grid.allAppsIconSizePx / grid.iconSizePx;
+    }
+
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index ab4823343e..1bfaa233b3 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -198,7 +198,7 @@ public class DragController {
      * @param dragRegion Coordinates within the bitmap b for the position of item being dragged.
      *          Makes dragging feel more precise, e.g. you can clip out a transparent border
      */
-    public void startDrag(Bitmap b, int dragLayerX, int dragLayerY,
+    public DragView startDrag(Bitmap b, int dragLayerX, int dragLayerY,
             DragSource source, Object dragInfo, int dragAction, Point dragOffset, Rect dragRegion,
             float initialDragViewScale) {
         if (PROFILE_DRAWING_DURING_DRAG) {
@@ -245,6 +245,7 @@ public class DragController {
         mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
         dragView.show(mMotionDownX, mMotionDownY);
         handleMoveEvent(mMotionDownX, mMotionDownY);
+        return dragView;
     }
 
     /**
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java
index 159d7d992a..dc0ba903f5 100644
--- a/src/com/android/launcher3/DragLayer.java
+++ b/src/com/android/launcher3/DragLayer.java
@@ -522,14 +522,18 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
         scale *= childScale;
         int toX = coord[0];
         int toY = coord[1];
+        float toScale = scale;
         if (child instanceof TextView) {
             TextView tv = (TextView) child;
+            // Account for the source scale of the icon (ie. from AllApps to Workspace, in which
+            // the workspace may have smaller icon bounds).
+            toScale = scale / dragView.getIntrinsicIconScaleFactor();
 
             // The child may be scaled (always about the center of the view) so to account for it,
             // we have to offset the position by the scaled size.  Once we do that, we can center
             // the drag view about the scaled child view.
-            toY += Math.round(scale * tv.getPaddingTop());
-            toY -= dragView.getMeasuredHeight() * (1 - scale) / 2;
+            toY += Math.round(toScale * tv.getPaddingTop());
+            toY -= dragView.getMeasuredHeight() * (1 - toScale) / 2;
             toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2;
         } else if (child instanceof FolderIcon) {
             // Account for holographic blur padding on the drag view
@@ -555,7 +559,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
                 }
             }
         };
-        animateViewIntoPosition(dragView, fromX, fromY, toX, toY, 1, 1, 1, scale, scale,
+        animateViewIntoPosition(dragView, fromX, fromY, toX, toY, 1, 1, 1, toScale, toScale,
                 onCompleteRunnable, ANIMATION_END_DISAPPEAR, duration, anchorView);
     }
 
diff --git a/src/com/android/launcher3/DragSource.java b/src/com/android/launcher3/DragSource.java
index 2ef99ae08a..cca9ab1a40 100644
--- a/src/com/android/launcher3/DragSource.java
+++ b/src/com/android/launcher3/DragSource.java
@@ -30,6 +30,11 @@ public interface DragSource {
      */
     boolean supportsFlingToDelete();
 
+    /*
+     * @return the scale of the icons over the workspace icon size
+     */
+    float getIntrinsicIconScaleFactor();
+
     /**
      * A callback specifically made back to the source after an item from this source has been flung
      * to be deleted on a DropTarget.  In such a situation, this method will be called after
diff --git a/src/com/android/launcher3/DragView.java b/src/com/android/launcher3/DragView.java
index 686cf62ff0..b66b55c9dc 100644
--- a/src/com/android/launcher3/DragView.java
+++ b/src/com/android/launcher3/DragView.java
@@ -51,6 +51,9 @@ public class DragView extends View {
     private float mOffsetX = 0.0f;
     private float mOffsetY = 0.0f;
     private float mInitialScale = 1f;
+    // The intrinsic icon scale factor is the scale factor for a drag icon over the workspace
+    // size.  This is ignored for non-icons.
+    private float mIntrinsicIconScale = 1f;
 
     /**
      * Construct the drag view.
@@ -120,6 +123,15 @@ public class DragView extends View {
         mPaint = new Paint(Paint.FILTER_BITMAP_FLAG);
     }
 
+    /** Sets the scale of the view over the normal workspace icon size. */
+    public void setIntrinsicIconScaleFactor(float scale) {
+        mIntrinsicIconScale = scale;
+    }
+
+    public float getIntrinsicIconScaleFactor() {
+        return mIntrinsicIconScale;
+    }
+
     public float getOffsetY() {
         return mOffsetY;
     }
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index bce6707da2..83be143695 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -27,19 +27,11 @@ import android.graphics.drawable.Drawable;
 class FastBitmapDrawable extends Drawable {
     private Bitmap mBitmap;
     private int mAlpha;
-    private int mWidth;
-    private int mHeight;
     private final Paint mPaint = new Paint(Paint.FILTER_BITMAP_FLAG);
 
     FastBitmapDrawable(Bitmap b) {
-	mAlpha = 255;
+        mAlpha = 255;
         mBitmap = b;
-        if (b != null) {
-            mWidth = mBitmap.getWidth();
-            mHeight = mBitmap.getHeight();
-        } else {
-            mWidth = mHeight = 0;
-        }
     }
 
     @Override
@@ -76,32 +68,22 @@ class FastBitmapDrawable extends Drawable {
 
     @Override
     public int getIntrinsicWidth() {
-        return mWidth;
+        return getBounds().width();
     }
 
     @Override
     public int getIntrinsicHeight() {
-        return mHeight;
+        return getBounds().height();
     }
 
     @Override
     public int getMinimumWidth() {
-        return mWidth;
+        return getBounds().width();
     }
 
     @Override
     public int getMinimumHeight() {
-        return mHeight;
-    }
-
-    public void setBitmap(Bitmap b) {
-        mBitmap = b;
-        if (b != null) {
-            mWidth = mBitmap.getWidth();
-            mHeight = mBitmap.getHeight();
-        } else {
-            mWidth = mHeight = 0;
-        }
+        return getBounds().height();
     }
 
     public Bitmap getBitmap() {
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index f26d01f5d0..7fe83c54d2 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -786,6 +786,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         }
     }
 
+    @Override
+    public float getIntrinsicIconScaleFactor() {
+        return 1f;
+    }
+
     @Override
     public boolean supportsFlingToDelete() {
         return true;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f36c815da5..9f4f9d9181 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2536,8 +2536,9 @@ public class Workspace extends SmoothPagedView
             icon.clearPressedOrFocusedBackground();
         }
 
-        mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
+        DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
                 DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale);
+        dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor());
 
         if (child.getParent() instanceof ShortcutAndWidgetContainer) {
             mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent();
@@ -4140,6 +4141,11 @@ public class Workspace extends SmoothPagedView
         }
     }
 
+    @Override
+    public float getIntrinsicIconScaleFactor() {
+        return 1f;
+    }
+
     @Override
     public boolean supportsFlingToDelete() {
         return true;

From fe9d96a39651de99819208e95c7ec7d432a402e0 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 14 Nov 2013 11:30:05 -0800
Subject: [PATCH 014/147] Require valid arrays when adding and binding new
 Apps. (Bug 11627095)

Change-Id: I8f2a4dc70bf376d804885f433ab20064823ebaac
---
 src/com/android/launcher3/InstallShortcutReceiver.java | 2 +-
 src/com/android/launcher3/LauncherModel.java           | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 835c472d47..fb75161fe7 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -294,7 +294,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
             // Add the new apps to the model and bind them
             if (!addShortcuts.isEmpty()) {
                 LauncherAppState app = LauncherAppState.getInstance();
-                app.getModel().addAndBindAddedApps(context, addShortcuts, null);
+                app.getModel().addAndBindAddedApps(context, addShortcuts, new ArrayList<AppInfo>());
             }
         }
     }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index dff1814267..ba1bcdb1ea 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -282,7 +282,10 @@ public class LauncherModel extends BroadcastReceiver {
         addAndBindAddedApps(context, workspaceApps, cb, allAppsApps);
     }
     public void addAndBindAddedApps(final Context context, final ArrayList<ItemInfo> workspaceApps,
-                                    final Callbacks callbacks, final ArrayList<AppInfo> allAppsApps) {
+                                final Callbacks callbacks, final ArrayList<AppInfo> allAppsApps) {
+        if (workspaceApps == null || allAppsApps == null) {
+            throw new RuntimeException("workspaceApps and allAppsApps must not be null");
+        }
         if (workspaceApps.isEmpty() && allAppsApps.isEmpty()) {
             return;
         }
@@ -1508,7 +1511,7 @@ public class LauncherModel extends BroadcastReceiver {
             }
             if (!added.isEmpty()) {
                 Callbacks cb = mCallbacks != null ? mCallbacks.get() : null;
-                addAndBindAddedApps(context, added, cb, null);
+                addAndBindAddedApps(context, added, cb, new ArrayList<AppInfo>());
             }
         }
 

From b38002419dcb456b51f5d320b224737f16a07088 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 24 Oct 2013 11:01:54 -0700
Subject: [PATCH 015/147] Adding method to get the search bar bounds.

Change-Id: Iec2fe0992cc666432ba6b9eac7ee8bf63e49b146
---
 src/com/android/launcher3/DeviceProfile.java  | 717 ++++++++++++++++++
 src/com/android/launcher3/DynamicGrid.java    | 662 +---------------
 .../android/launcher3/LauncherAppState.java   |   2 +-
 3 files changed, 719 insertions(+), 662 deletions(-)
 create mode 100644 src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
new file mode 100644
index 0000000000..626ec42cba
--- /dev/null
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -0,0 +1,717 @@
+/*
+ * Copyright (C) 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
+ *
+ *      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
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.appwidget.AppWidgetHostView;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.graphics.Paint.FontMetrics;
+import android.graphics.Point;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+
+class DeviceProfileQuery {
+    float widthDps;
+    float heightDps;
+    float value;
+    PointF dimens;
+
+    DeviceProfileQuery(float w, float h, float v) {
+        widthDps = w;
+        heightDps = h;
+        value = v;
+        dimens = new PointF(w, h);
+    }
+}
+
+public class DeviceProfile {
+    public static interface DeviceProfileCallbacks {
+        public void onAvailableSizeChanged(DeviceProfile grid);
+    }
+
+    String name;
+    float minWidthDps;
+    float minHeightDps;
+    float numRows;
+    float numColumns;
+    float numHotseatIcons;
+    private float iconSize;
+    private float iconTextSize;
+    private int iconDrawablePaddingOriginalPx;
+    private float hotseatIconSize;
+
+    boolean isLandscape;
+    boolean isTablet;
+    boolean isLargeTablet;
+    boolean transposeLayoutWithOrientation;
+
+    int desiredWorkspaceLeftRightMarginPx;
+    int edgeMarginPx;
+    Rect defaultWidgetPadding;
+
+    int widthPx;
+    int heightPx;
+    int availableWidthPx;
+    int availableHeightPx;
+    int defaultPageSpacingPx;
+
+    int overviewModeMinIconZoneHeightPx;
+    int overviewModeMaxIconZoneHeightPx;
+    int overviewModeMaxBarWidthPx;
+    float overviewModeIconZoneRatio;
+    float overviewModeScaleFactor;
+
+    int iconSizePx;
+    int iconTextSizePx;
+    int iconDrawablePaddingPx;
+    int cellWidthPx;
+    int cellHeightPx;
+    int allAppsIconSizePx;
+    int allAppsIconTextSizePx;
+    int allAppsCellWidthPx;
+    int allAppsCellHeightPx;
+    int allAppsCellPaddingPx;
+    int folderBackgroundOffset;
+    int folderIconSizePx;
+    int folderCellWidthPx;
+    int folderCellHeightPx;
+    int hotseatCellWidthPx;
+    int hotseatCellHeightPx;
+    int hotseatIconSizePx;
+    int hotseatBarHeightPx;
+    int hotseatAllAppsRank;
+    int allAppsNumRows;
+    int allAppsNumCols;
+    int searchBarSpaceWidthPx;
+    int searchBarSpaceMaxWidthPx;
+    int searchBarSpaceHeightPx;
+    int searchBarHeightPx;
+    int pageIndicatorHeightPx;
+
+    private ArrayList<DeviceProfileCallbacks> mCallbacks = new ArrayList<DeviceProfileCallbacks>();
+
+    DeviceProfile(String n, float w, float h, float r, float c,
+                  float is, float its, float hs, float his) {
+        // Ensure that we have an odd number of hotseat items (since we need to place all apps)
+        if (!AppsCustomizePagedView.DISABLE_ALL_APPS && hs % 2 == 0) {
+            throw new RuntimeException("All Device Profiles must have an odd number of hotseat spaces");
+        }
+
+        name = n;
+        minWidthDps = w;
+        minHeightDps = h;
+        numRows = r;
+        numColumns = c;
+        iconSize = is;
+        iconTextSize = its;
+        numHotseatIcons = hs;
+        hotseatIconSize = his;
+    }
+
+    DeviceProfile(Context context,
+                  ArrayList<DeviceProfile> profiles,
+                  float minWidth, float minHeight,
+                  int wPx, int hPx,
+                  int awPx, int ahPx,
+                  Resources res) {
+        DisplayMetrics dm = res.getDisplayMetrics();
+        ArrayList<DeviceProfileQuery> points =
+                new ArrayList<DeviceProfileQuery>();
+        transposeLayoutWithOrientation =
+                res.getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
+        minWidthDps = minWidth;
+        minHeightDps = minHeight;
+
+        ComponentName cn = new ComponentName(context.getPackageName(),
+                this.getClass().getName());
+        defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);
+        edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
+        desiredWorkspaceLeftRightMarginPx = 2 * edgeMarginPx;
+        pageIndicatorHeightPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_page_indicator_height);
+        defaultPageSpacingPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_page_spacing);
+        allAppsCellPaddingPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_all_apps_cell_padding);
+        overviewModeMinIconZoneHeightPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_min_icon_zone_height);
+        overviewModeMaxIconZoneHeightPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_max_icon_zone_height);
+        overviewModeMaxBarWidthPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_bar_max_width);
+        overviewModeIconZoneRatio =
+                res.getInteger(R.integer.config_dynamic_grid_overview_icon_zone_percentage) / 100f;
+        overviewModeScaleFactor =
+                res.getInteger(R.integer.config_dynamic_grid_overview_scale_percentage) / 100f;
+
+        // Interpolate the rows
+        for (DeviceProfile p : profiles) {
+            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.numRows));
+        }
+        numRows = Math.round(invDistWeightedInterpolate(minWidth, minHeight, points));
+        // Interpolate the columns
+        points.clear();
+        for (DeviceProfile p : profiles) {
+            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.numColumns));
+        }
+        numColumns = Math.round(invDistWeightedInterpolate(minWidth, minHeight, points));
+        // Interpolate the hotseat length
+        points.clear();
+        for (DeviceProfile p : profiles) {
+            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.numHotseatIcons));
+        }
+        numHotseatIcons = Math.round(invDistWeightedInterpolate(minWidth, minHeight, points));
+        hotseatAllAppsRank = (int) (numHotseatIcons / 2);
+
+        // Interpolate the icon size
+        points.clear();
+        for (DeviceProfile p : profiles) {
+            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.iconSize));
+        }
+        iconSize = invDistWeightedInterpolate(minWidth, minHeight, points);
+        // AllApps uses the original non-scaled icon size
+        allAppsIconSizePx = DynamicGrid.pxFromDp(iconSize, dm);
+
+        // Interpolate the icon text size
+        points.clear();
+        for (DeviceProfile p : profiles) {
+            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.iconTextSize));
+        }
+        iconTextSize = invDistWeightedInterpolate(minWidth, minHeight, points);
+        iconDrawablePaddingOriginalPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding);
+        // AllApps uses the original non-scaled icon text size
+        allAppsIconTextSizePx = DynamicGrid.pxFromDp(iconTextSize, dm);
+
+        // Interpolate the hotseat icon size
+        points.clear();
+        for (DeviceProfile p : profiles) {
+            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.hotseatIconSize));
+        }
+        // Hotseat
+        hotseatIconSize = invDistWeightedInterpolate(minWidth, minHeight, points);
+
+        // Calculate the remaining vars
+        updateFromConfiguration(context, res, wPx, hPx, awPx, ahPx);
+        updateAvailableDimensions(context);
+    }
+
+    void addCallback(DeviceProfileCallbacks cb) {
+        mCallbacks.add(cb);
+        cb.onAvailableSizeChanged(this);
+    }
+    void removeCallback(DeviceProfileCallbacks cb) {
+        mCallbacks.remove(cb);
+    }
+
+    private int getDeviceOrientation(Context context) {
+        WindowManager windowManager =  (WindowManager)
+                context.getSystemService(Context.WINDOW_SERVICE);
+        Resources resources = context.getResources();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        Configuration config = resources.getConfiguration();
+        int rotation = windowManager.getDefaultDisplay().getRotation();
+
+        boolean isLandscape = (config.orientation == Configuration.ORIENTATION_LANDSCAPE) &&
+                (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180);
+        boolean isRotatedPortrait = (config.orientation == Configuration.ORIENTATION_PORTRAIT) &&
+                (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270);
+        if (isLandscape || isRotatedPortrait) {
+            return CellLayout.LANDSCAPE;
+        } else {
+            return CellLayout.PORTRAIT;
+        }
+    }
+
+    private void updateAvailableDimensions(Context context) {
+        WindowManager windowManager =  (WindowManager)
+                context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        Resources resources = context.getResources();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        Configuration config = resources.getConfiguration();
+
+        // There are three possible configurations that the dynamic grid accounts for, portrait,
+        // landscape with the nav bar at the bottom, and landscape with the nav bar at the side.
+        // To prevent waiting for fitSystemWindows(), we make the observation that in landscape,
+        // the height is the smallest height (either with the nav bar at the bottom or to the
+        // side) and otherwise, the height is simply the largest possible height for a portrait
+        // device.
+        Point size = new Point();
+        Point smallestSize = new Point();
+        Point largestSize = new Point();
+        display.getSize(size);
+        display.getCurrentSizeRange(smallestSize, largestSize);
+        availableWidthPx = size.x;
+        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            availableHeightPx = smallestSize.y;
+        } else {
+            availableHeightPx = largestSize.y;
+        }
+
+        // Check to see if the icons fit in the new available height.  If not, then we need to
+        // shrink the icon size.
+        Rect workspacePadding = getWorkspacePadding();
+        float scale = 1f;
+        int drawablePadding = iconDrawablePaddingOriginalPx;
+        updateIconSize(1f, drawablePadding, resources, dm);
+        float usedHeight = (cellHeightPx * numRows);
+        int maxHeight = (availableHeightPx - workspacePadding.top - workspacePadding.bottom);
+        if (usedHeight > maxHeight) {
+            scale = maxHeight / usedHeight;
+            drawablePadding = 0;
+        }
+        updateIconSize(scale, drawablePadding, resources, dm);
+
+        // Make the callbacks
+        for (DeviceProfileCallbacks cb : mCallbacks) {
+            cb.onAvailableSizeChanged(this);
+        }
+    }
+
+    private void updateIconSize(float scale, int drawablePadding, Resources resources,
+                                DisplayMetrics dm) {
+        iconSizePx = (int) (DynamicGrid.pxFromDp(iconSize, dm) * scale);
+        iconTextSizePx = (int) (DynamicGrid.pxFromSp(iconTextSize, dm) * scale);
+        iconDrawablePaddingPx = drawablePadding;
+        hotseatIconSizePx = (int) (DynamicGrid.pxFromDp(hotseatIconSize, dm) * scale);
+
+        // Search Bar
+        searchBarSpaceMaxWidthPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_max_width);
+        searchBarHeightPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_height);
+        searchBarSpaceWidthPx = Math.min(searchBarSpaceMaxWidthPx, widthPx);
+        searchBarSpaceHeightPx = searchBarHeightPx + 2 * edgeMarginPx;
+
+        // Calculate the actual text height
+        Paint textPaint = new Paint();
+        textPaint.setTextSize(iconTextSizePx);
+        FontMetrics fm = textPaint.getFontMetrics();
+        cellWidthPx = iconSizePx;
+        cellHeightPx = iconSizePx + iconDrawablePaddingPx + (int) Math.ceil(fm.bottom - fm.top);
+
+        // Hotseat
+        hotseatBarHeightPx = iconSizePx + 4 * edgeMarginPx;
+        hotseatCellWidthPx = iconSizePx;
+        hotseatCellHeightPx = iconSizePx;
+
+        // Folder
+        folderCellWidthPx = cellWidthPx + 3 * edgeMarginPx;
+        folderCellHeightPx = cellHeightPx + edgeMarginPx;
+        folderBackgroundOffset = -edgeMarginPx;
+        folderIconSizePx = iconSizePx + 2 * -folderBackgroundOffset;
+
+        // All Apps
+        Rect padding = getWorkspacePadding(isLandscape ?
+                CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
+        int pageIndicatorOffset =
+                resources.getDimensionPixelSize(R.dimen.apps_customize_page_indicator_offset);
+        allAppsCellWidthPx = allAppsIconSizePx;
+        allAppsCellHeightPx = allAppsIconSizePx + drawablePadding + iconTextSizePx;
+        int maxLongEdgeCellCount =
+                resources.getInteger(R.integer.config_dynamic_grid_max_long_edge_cell_count);
+        int maxShortEdgeCellCount =
+                resources.getInteger(R.integer.config_dynamic_grid_max_short_edge_cell_count);
+        int minEdgeCellCount =
+                resources.getInteger(R.integer.config_dynamic_grid_min_edge_cell_count);
+        int maxRows = (isLandscape ? maxShortEdgeCellCount : maxLongEdgeCellCount);
+        int maxCols = (isLandscape ? maxLongEdgeCellCount : maxShortEdgeCellCount);
+
+        allAppsNumRows = (availableHeightPx - pageIndicatorHeightPx) /
+                (allAppsCellHeightPx + allAppsCellPaddingPx);
+        allAppsNumRows = Math.max(minEdgeCellCount, Math.min(maxRows, allAppsNumRows));
+        allAppsNumCols = (availableWidthPx) /
+                (allAppsCellWidthPx + allAppsCellPaddingPx);
+        allAppsNumCols = Math.max(minEdgeCellCount, Math.min(maxCols, allAppsNumCols));
+    }
+
+    void updateFromConfiguration(Context context, Resources resources, int wPx, int hPx,
+                                 int awPx, int ahPx) {
+        isLandscape = (resources.getConfiguration().orientation ==
+                Configuration.ORIENTATION_LANDSCAPE);
+        isTablet = resources.getBoolean(R.bool.is_tablet);
+        isLargeTablet = resources.getBoolean(R.bool.is_large_tablet);
+        widthPx = wPx;
+        heightPx = hPx;
+        availableWidthPx = awPx;
+        availableHeightPx = ahPx;
+
+        updateAvailableDimensions(context);
+    }
+
+    private float dist(PointF p0, PointF p1) {
+        return (float) Math.sqrt((p1.x - p0.x)*(p1.x-p0.x) +
+                (p1.y-p0.y)*(p1.y-p0.y));
+    }
+
+    private float weight(PointF a, PointF b,
+                        float pow) {
+        float d = dist(a, b);
+        if (d == 0f) {
+            return Float.POSITIVE_INFINITY;
+        }
+        return (float) (1f / Math.pow(d, pow));
+    }
+
+    private float invDistWeightedInterpolate(float width, float height,
+                ArrayList<DeviceProfileQuery> points) {
+        float sum = 0;
+        float weights = 0;
+        float pow = 5;
+        float kNearestNeighbors = 3;
+        final PointF xy = new PointF(width, height);
+
+        ArrayList<DeviceProfileQuery> pointsByNearness = points;
+        Collections.sort(pointsByNearness, new Comparator<DeviceProfileQuery>() {
+            public int compare(DeviceProfileQuery a, DeviceProfileQuery b) {
+                return (int) (dist(xy, a.dimens) - dist(xy, b.dimens));
+            }
+        });
+
+        for (int i = 0; i < pointsByNearness.size(); ++i) {
+            DeviceProfileQuery p = pointsByNearness.get(i);
+            if (i < kNearestNeighbors) {
+                float w = weight(xy, p.dimens, pow);
+                if (w == Float.POSITIVE_INFINITY) {
+                    return p.value;
+                }
+                weights += w;
+            }
+        }
+
+        for (int i = 0; i < pointsByNearness.size(); ++i) {
+            DeviceProfileQuery p = pointsByNearness.get(i);
+            if (i < kNearestNeighbors) {
+                float w = weight(xy, p.dimens, pow);
+                sum += w * p.value / weights;
+            }
+        }
+
+        return sum;
+    }
+
+    /** Returns the search bar bounds in the current orientation */
+    Rect getSearchBarBounds() {
+        return getSearchBarBounds(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
+    }
+    /** Returns the search bar bounds in the specified orientation */
+    Rect getSearchBarBounds(int orientation) {
+        Rect bounds = new Rect();
+        if (orientation == CellLayout.LANDSCAPE &&
+                transposeLayoutWithOrientation) {
+            bounds.set(0, edgeMarginPx, searchBarSpaceHeightPx, availableHeightPx - edgeMarginPx);
+        } else {
+            if (isTablet()) {
+                // Pad the left and right of the workspace to ensure consistent spacing
+                // between all icons
+                int width = (orientation == CellLayout.LANDSCAPE)
+                        ? Math.max(widthPx, heightPx)
+                        : Math.min(widthPx, heightPx);
+                // XXX: If the icon size changes across orientations, we will have to take
+                //      that into account here too.
+                int gap = (int) ((width - 2 * edgeMarginPx -
+                        (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
+                bounds.set(edgeMarginPx + gap, 0, availableWidthPx - (edgeMarginPx + gap),
+                        searchBarSpaceHeightPx);
+            } else {
+                bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left, 0,
+                        availableWidthPx - (desiredWorkspaceLeftRightMarginPx -
+                        defaultWidgetPadding.right), searchBarSpaceHeightPx);
+            }
+        }
+        return bounds;
+    }
+
+    /** Returns the workspace padding in the specified orientation */
+    Rect getWorkspacePadding() {
+        return getWorkspacePadding(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
+    }
+    Rect getWorkspacePadding(int orientation) {
+        Rect searchBarBounds = getSearchBarBounds(orientation);
+        Rect padding = new Rect();
+        if (orientation == CellLayout.LANDSCAPE &&
+                transposeLayoutWithOrientation) {
+            // Pad the left and right of the workspace with search/hotseat bar sizes
+            padding.set(searchBarBounds.right, edgeMarginPx,
+                    hotseatBarHeightPx, edgeMarginPx);
+        } else {
+            if (isTablet()) {
+                // Pad the left and right of the workspace to ensure consistent spacing
+                // between all icons
+                int width = (orientation == CellLayout.LANDSCAPE)
+                        ? Math.max(widthPx, heightPx)
+                        : Math.min(widthPx, heightPx);
+                // XXX: If the icon size changes across orientations, we will have to take
+                //      that into account here too.
+                int gap = (int) ((width - 2 * edgeMarginPx -
+                        (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
+                padding.set(edgeMarginPx + gap,
+                        searchBarBounds.bottom,
+                        edgeMarginPx + gap,
+                        hotseatBarHeightPx + pageIndicatorHeightPx);
+            } else {
+                // Pad the top and bottom of the workspace with search/hotseat bar sizes
+                padding.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left,
+                        searchBarBounds.bottom,
+                        desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.right,
+                        hotseatBarHeightPx + pageIndicatorHeightPx);
+            }
+        }
+        return padding;
+    }
+
+    int getWorkspacePageSpacing(int orientation) {
+        if (orientation == CellLayout.LANDSCAPE &&
+                transposeLayoutWithOrientation) {
+            // In landscape mode the page spacing is set to the default.
+            return defaultPageSpacingPx;
+        } else {
+            // In portrait, we want the pages spaced such that there is no
+            // overhang of the previous / next page into the current page viewport.
+            // We assume symmetrical padding in portrait mode.
+            return 2 * getWorkspacePadding().left;
+        }
+    }
+
+    Rect getOverviewModeButtonBarRect() {
+        int zoneHeight = (int) (overviewModeIconZoneRatio * availableHeightPx);
+        zoneHeight = Math.min(overviewModeMaxIconZoneHeightPx,
+                Math.max(overviewModeMinIconZoneHeightPx, zoneHeight));
+        return new Rect(0, availableHeightPx - zoneHeight, 0, availableHeightPx);
+    }
+
+    float getOverviewModeScale() {
+        Rect workspacePadding = getWorkspacePadding();
+        Rect overviewBar = getOverviewModeButtonBarRect();
+        int pageSpace = availableHeightPx - workspacePadding.top - workspacePadding.bottom;
+        return (overviewModeScaleFactor * (pageSpace - overviewBar.height())) / pageSpace;
+    }
+
+    // The rect returned will be extended to below the system ui that covers the workspace
+    Rect getHotseatRect() {
+        if (isVerticalBarLayout()) {
+            return new Rect(availableWidthPx - hotseatBarHeightPx, 0,
+                    Integer.MAX_VALUE, availableHeightPx);
+        } else {
+            return new Rect(0, availableHeightPx - hotseatBarHeightPx,
+                    availableWidthPx, Integer.MAX_VALUE);
+        }
+    }
+
+    int calculateCellWidth(int width, int countX) {
+        return width / countX;
+    }
+    int calculateCellHeight(int height, int countY) {
+        return height / countY;
+    }
+
+    boolean isPhone() {
+        return !isTablet && !isLargeTablet;
+    }
+    boolean isTablet() {
+        return isTablet;
+    }
+    boolean isLargeTablet() {
+        return isLargeTablet;
+    }
+
+    boolean isVerticalBarLayout() {
+        return isLandscape && transposeLayoutWithOrientation;
+    }
+
+    boolean shouldFadeAdjacentWorkspaceScreens() {
+        return isVerticalBarLayout() || isLargeTablet();
+    }
+
+    public void layout(Launcher launcher) {
+        FrameLayout.LayoutParams lp;
+        Resources res = launcher.getResources();
+        boolean hasVerticalBarLayout = isVerticalBarLayout();
+
+        // Layout the search bar space
+        View searchBar = launcher.getSearchBar();
+        lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();
+        if (hasVerticalBarLayout) {
+            // Vertical search bar
+            lp.gravity = Gravity.TOP | Gravity.LEFT;
+            lp.width = searchBarSpaceHeightPx;
+            lp.height = LayoutParams.MATCH_PARENT;
+            searchBar.setPadding(
+                    0, 2 * edgeMarginPx, 0,
+                    2 * edgeMarginPx);
+        } else {
+            // Horizontal search bar
+            lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL;
+            lp.width = searchBarSpaceWidthPx;
+            lp.height = searchBarSpaceHeightPx;
+            searchBar.setPadding(
+                    2 * edgeMarginPx,
+                    2 * edgeMarginPx,
+                    2 * edgeMarginPx, 0);
+        }
+        searchBar.setLayoutParams(lp);
+
+        // Layout the search bar
+        View qsbBar = launcher.getQsbBar();
+        LayoutParams vglp = qsbBar.getLayoutParams();
+        vglp.width = LayoutParams.MATCH_PARENT;
+        vglp.height = LayoutParams.MATCH_PARENT;
+        qsbBar.setLayoutParams(vglp);
+
+        // Layout the voice proxy
+        View voiceButtonProxy = launcher.findViewById(R.id.voice_button_proxy);
+        if (voiceButtonProxy != null) {
+            if (hasVerticalBarLayout) {
+                // TODO: MOVE THIS INTO SEARCH BAR MEASURE
+            } else {
+                lp = (FrameLayout.LayoutParams) voiceButtonProxy.getLayoutParams();
+                lp.gravity = Gravity.TOP | Gravity.END;
+                lp.width = (widthPx - searchBarSpaceWidthPx) / 2 +
+                        2 * iconSizePx;
+                lp.height = searchBarSpaceHeightPx;
+            }
+        }
+
+        // Layout the workspace
+        PagedView workspace = (PagedView) launcher.findViewById(R.id.workspace);
+        lp = (FrameLayout.LayoutParams) workspace.getLayoutParams();
+        lp.gravity = Gravity.CENTER;
+        int orientation = isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT;
+        Rect padding = getWorkspacePadding(orientation);
+        workspace.setLayoutParams(lp);
+        workspace.setPadding(padding.left, padding.top, padding.right, padding.bottom);
+        workspace.setPageSpacing(getWorkspacePageSpacing(orientation));
+
+        // Layout the hotseat
+        View hotseat = launcher.findViewById(R.id.hotseat);
+        lp = (FrameLayout.LayoutParams) hotseat.getLayoutParams();
+        if (hasVerticalBarLayout) {
+            // Vertical hotseat
+            lp.gravity = Gravity.RIGHT;
+            lp.width = hotseatBarHeightPx;
+            lp.height = LayoutParams.MATCH_PARENT;
+            hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx);
+        } else if (isTablet()) {
+            // Pad the hotseat with the grid gap calculated above
+            int gridGap = (int) ((widthPx - 2 * edgeMarginPx -
+                    (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
+            int gridWidth = (int) ((numColumns * cellWidthPx) +
+                    ((numColumns - 1) * gridGap));
+            int hotseatGap = (int) Math.max(0,
+                    (gridWidth - (numHotseatIcons * hotseatCellWidthPx))
+                            / (numHotseatIcons - 1));
+            lp.gravity = Gravity.BOTTOM;
+            lp.width = LayoutParams.MATCH_PARENT;
+            lp.height = hotseatBarHeightPx;
+            hotseat.setPadding(2 * edgeMarginPx + gridGap + hotseatGap, 0,
+                    2 * edgeMarginPx + gridGap + hotseatGap,
+                    2 * edgeMarginPx);
+        } else {
+            // For phones, layout the hotseat without any bottom margin
+            // to ensure that we have space for the folders
+            lp.gravity = Gravity.BOTTOM;
+            lp.width = LayoutParams.MATCH_PARENT;
+            lp.height = hotseatBarHeightPx;
+            hotseat.findViewById(R.id.layout).setPadding(2 * edgeMarginPx, 0,
+                    2 * edgeMarginPx, 0);
+        }
+        hotseat.setLayoutParams(lp);
+
+        // Layout the page indicators
+        View pageIndicator = launcher.findViewById(R.id.page_indicator);
+        if (pageIndicator != null) {
+            if (hasVerticalBarLayout) {
+                // Hide the page indicators when we have vertical search/hotseat
+                pageIndicator.setVisibility(View.GONE);
+            } else {
+                // Put the page indicators above the hotseat
+                lp = (FrameLayout.LayoutParams) pageIndicator.getLayoutParams();
+                lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+                lp.width = LayoutParams.WRAP_CONTENT;
+                lp.height = LayoutParams.WRAP_CONTENT;
+                lp.bottomMargin = hotseatBarHeightPx;
+                pageIndicator.setLayoutParams(lp);
+            }
+        }
+
+        // Layout AllApps
+        AppsCustomizeTabHost host = (AppsCustomizeTabHost)
+                launcher.findViewById(R.id.apps_customize_pane);
+        if (host != null) {
+            // Center the all apps page indicator
+            int pageIndicatorHeight = (int) (pageIndicatorHeightPx * Math.min(1f,
+                    (allAppsIconSizePx / DynamicGrid.DEFAULT_ICON_SIZE_PX)));
+            pageIndicator = host.findViewById(R.id.apps_customize_page_indicator);
+            if (pageIndicator != null) {
+                lp = (FrameLayout.LayoutParams) pageIndicator.getLayoutParams();
+                lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+                lp.width = LayoutParams.WRAP_CONTENT;
+                lp.height = pageIndicatorHeight;
+                pageIndicator.setLayoutParams(lp);
+            }
+
+            AppsCustomizePagedView pagedView = (AppsCustomizePagedView)
+                    host.findViewById(R.id.apps_customize_pane_content);
+            padding = new Rect();
+            if (pagedView != null) {
+                // Constrain the dimensions of all apps so that it does not span the full width
+                int paddingLR = (availableWidthPx - (allAppsCellWidthPx * allAppsNumCols)) /
+                        (2 * (allAppsNumCols + 1));
+                int paddingTB = (availableHeightPx - (allAppsCellHeightPx * allAppsNumRows)) /
+                        (2 * (allAppsNumRows + 1));
+                paddingLR = Math.min(paddingLR, (int)((paddingLR + paddingTB) * 0.75f));
+                paddingTB = Math.min(paddingTB, (int)((paddingLR + paddingTB) * 0.75f));
+                int maxAllAppsWidth = (allAppsNumCols * (allAppsCellWidthPx + 2 * paddingLR));
+                int gridPaddingLR = (availableWidthPx - maxAllAppsWidth) / 2;
+                if (gridPaddingLR > (allAppsCellWidthPx / 4)) {
+                    padding.left = padding.right = gridPaddingLR;
+                }
+                // The icons are centered, so we can't just offset by the page indicator height
+                // because the empty space will actually be pageIndicatorHeight + paddingTB
+                padding.bottom = Math.max(0, pageIndicatorHeight - paddingTB);
+                pagedView.setAllAppsPadding(padding);
+                pagedView.setWidgetsPageIndicatorPadding(pageIndicatorHeight);
+            }
+        }
+
+        // Layout the Overview Mode
+        View overviewMode = launcher.getOverviewPanel();
+        if (overviewMode != null) {
+            Rect r = getOverviewModeButtonBarRect();
+            lp = (FrameLayout.LayoutParams) overviewMode.getLayoutParams();
+            lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+            lp.width = Math.min(availableWidthPx, overviewModeMaxBarWidthPx);
+            lp.height = r.height();
+            overviewMode.setLayoutParams(lp);
+        }
+    }
+}
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 5f8c011f93..42aa20d7df 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -16,674 +16,14 @@
 
 package com.android.launcher3;
 
-import android.appwidget.AppWidgetHostView;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.Paint;
-import android.graphics.Paint.FontMetrics;
-import android.graphics.Point;
-import android.graphics.PointF;
-import android.graphics.Rect;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.Surface;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 
 
-class DeviceProfileQuery {
-    float widthDps;
-    float heightDps;
-    float value;
-    PointF dimens;
-
-    DeviceProfileQuery(float w, float h, float v) {
-        widthDps = w;
-        heightDps = h;
-        value = v;
-        dimens = new PointF(w, h);
-    }
-}
-
-class DeviceProfile {
-    public static interface DeviceProfileCallbacks {
-        public void onAvailableSizeChanged(DeviceProfile grid);
-    }
-
-    String name;
-    float minWidthDps;
-    float minHeightDps;
-    float numRows;
-    float numColumns;
-    float numHotseatIcons;
-    private float iconSize;
-    private float iconTextSize;
-    private int iconDrawablePaddingOriginalPx;
-    private float hotseatIconSize;
-
-    boolean isLandscape;
-    boolean isTablet;
-    boolean isLargeTablet;
-    boolean transposeLayoutWithOrientation;
-
-    int desiredWorkspaceLeftRightMarginPx;
-    int edgeMarginPx;
-    Rect defaultWidgetPadding;
-
-    int widthPx;
-    int heightPx;
-    int availableWidthPx;
-    int availableHeightPx;
-    int defaultPageSpacingPx;
-
-    int overviewModeMinIconZoneHeightPx;
-    int overviewModeMaxIconZoneHeightPx;
-    int overviewModeMaxBarWidthPx;
-    float overviewModeIconZoneRatio;
-    float overviewModeScaleFactor;
-
-    int iconSizePx;
-    int iconTextSizePx;
-    int iconDrawablePaddingPx;
-    int cellWidthPx;
-    int cellHeightPx;
-    int allAppsIconSizePx;
-    int allAppsIconTextSizePx;
-    int allAppsCellWidthPx;
-    int allAppsCellHeightPx;
-    int allAppsCellPaddingPx;
-    int folderBackgroundOffset;
-    int folderIconSizePx;
-    int folderCellWidthPx;
-    int folderCellHeightPx;
-    int hotseatCellWidthPx;
-    int hotseatCellHeightPx;
-    int hotseatIconSizePx;
-    int hotseatBarHeightPx;
-    int hotseatAllAppsRank;
-    int allAppsNumRows;
-    int allAppsNumCols;
-    int searchBarSpaceWidthPx;
-    int searchBarSpaceMaxWidthPx;
-    int searchBarSpaceHeightPx;
-    int searchBarHeightPx;
-    int pageIndicatorHeightPx;
-
-    private ArrayList<DeviceProfileCallbacks> mCallbacks = new ArrayList<DeviceProfileCallbacks>();
-
-    DeviceProfile(String n, float w, float h, float r, float c,
-                  float is, float its, float hs, float his) {
-        // Ensure that we have an odd number of hotseat items (since we need to place all apps)
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS && hs % 2 == 0) {
-            throw new RuntimeException("All Device Profiles must have an odd number of hotseat spaces");
-        }
-
-        name = n;
-        minWidthDps = w;
-        minHeightDps = h;
-        numRows = r;
-        numColumns = c;
-        iconSize = is;
-        iconTextSize = its;
-        numHotseatIcons = hs;
-        hotseatIconSize = his;
-    }
-
-    DeviceProfile(Context context,
-                  ArrayList<DeviceProfile> profiles,
-                  float minWidth, float minHeight,
-                  int wPx, int hPx,
-                  int awPx, int ahPx,
-                  Resources res) {
-        DisplayMetrics dm = res.getDisplayMetrics();
-        ArrayList<DeviceProfileQuery> points =
-                new ArrayList<DeviceProfileQuery>();
-        transposeLayoutWithOrientation =
-                res.getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
-        minWidthDps = minWidth;
-        minHeightDps = minHeight;
-
-        ComponentName cn = new ComponentName(context.getPackageName(),
-                this.getClass().getName());
-        defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);
-        edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
-        desiredWorkspaceLeftRightMarginPx = 2 * edgeMarginPx;
-        pageIndicatorHeightPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_page_indicator_height);
-        defaultPageSpacingPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_page_spacing);
-        allAppsCellPaddingPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_all_apps_cell_padding);
-        overviewModeMinIconZoneHeightPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_min_icon_zone_height);
-        overviewModeMaxIconZoneHeightPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_max_icon_zone_height);
-        overviewModeMaxBarWidthPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_bar_max_width);
-        overviewModeIconZoneRatio =
-                res.getInteger(R.integer.config_dynamic_grid_overview_icon_zone_percentage) / 100f;
-        overviewModeScaleFactor =
-                res.getInteger(R.integer.config_dynamic_grid_overview_scale_percentage) / 100f;
-
-        // Interpolate the rows
-        for (DeviceProfile p : profiles) {
-            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.numRows));
-        }
-        numRows = Math.round(invDistWeightedInterpolate(minWidth, minHeight, points));
-        // Interpolate the columns
-        points.clear();
-        for (DeviceProfile p : profiles) {
-            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.numColumns));
-        }
-        numColumns = Math.round(invDistWeightedInterpolate(minWidth, minHeight, points));
-        // Interpolate the hotseat length
-        points.clear();
-        for (DeviceProfile p : profiles) {
-            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.numHotseatIcons));
-        }
-        numHotseatIcons = Math.round(invDistWeightedInterpolate(minWidth, minHeight, points));
-        hotseatAllAppsRank = (int) (numHotseatIcons / 2);
-
-        // Interpolate the icon size
-        points.clear();
-        for (DeviceProfile p : profiles) {
-            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.iconSize));
-        }
-        iconSize = invDistWeightedInterpolate(minWidth, minHeight, points);
-        // AllApps uses the original non-scaled icon size
-        allAppsIconSizePx = DynamicGrid.pxFromDp(iconSize, dm);
-
-        // Interpolate the icon text size
-        points.clear();
-        for (DeviceProfile p : profiles) {
-            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.iconTextSize));
-        }
-        iconTextSize = invDistWeightedInterpolate(minWidth, minHeight, points);
-        iconDrawablePaddingOriginalPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding);
-        // AllApps uses the original non-scaled icon text size
-        allAppsIconTextSizePx = DynamicGrid.pxFromDp(iconTextSize, dm);
-
-        // Interpolate the hotseat icon size
-        points.clear();
-        for (DeviceProfile p : profiles) {
-            points.add(new DeviceProfileQuery(p.minWidthDps, p.minHeightDps, p.hotseatIconSize));
-        }
-        // Hotseat
-        hotseatIconSize = invDistWeightedInterpolate(minWidth, minHeight, points);
-
-        // Calculate the remaining vars
-        updateFromConfiguration(context, res, wPx, hPx, awPx, ahPx);
-        updateAvailableDimensions(context);
-    }
-
-    void addCallback(DeviceProfileCallbacks cb) {
-        mCallbacks.add(cb);
-        cb.onAvailableSizeChanged(this);
-    }
-    void removeCallback(DeviceProfileCallbacks cb) {
-        mCallbacks.remove(cb);
-    }
-
-    private int getDeviceOrientation(Context context) {
-        WindowManager windowManager =  (WindowManager)
-                context.getSystemService(Context.WINDOW_SERVICE);
-        Resources resources = context.getResources();
-        DisplayMetrics dm = resources.getDisplayMetrics();
-        Configuration config = resources.getConfiguration();
-        int rotation = windowManager.getDefaultDisplay().getRotation();
-
-        boolean isLandscape = (config.orientation == Configuration.ORIENTATION_LANDSCAPE) &&
-                (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180);
-        boolean isRotatedPortrait = (config.orientation == Configuration.ORIENTATION_PORTRAIT) &&
-                (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270);
-        if (isLandscape || isRotatedPortrait) {
-            return CellLayout.LANDSCAPE;
-        } else {
-            return CellLayout.PORTRAIT;
-        }
-    }
-
-    private void updateAvailableDimensions(Context context) {
-        WindowManager windowManager =  (WindowManager)
-                context.getSystemService(Context.WINDOW_SERVICE);
-        Display display = windowManager.getDefaultDisplay();
-        Resources resources = context.getResources();
-        DisplayMetrics dm = resources.getDisplayMetrics();
-        Configuration config = resources.getConfiguration();
-
-        // There are three possible configurations that the dynamic grid accounts for, portrait,
-        // landscape with the nav bar at the bottom, and landscape with the nav bar at the side.
-        // To prevent waiting for fitSystemWindows(), we make the observation that in landscape,
-        // the height is the smallest height (either with the nav bar at the bottom or to the
-        // side) and otherwise, the height is simply the largest possible height for a portrait
-        // device.
-        Point size = new Point();
-        Point smallestSize = new Point();
-        Point largestSize = new Point();
-        display.getSize(size);
-        display.getCurrentSizeRange(smallestSize, largestSize);
-        availableWidthPx = size.x;
-        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            availableHeightPx = smallestSize.y;
-        } else {
-            availableHeightPx = largestSize.y;
-        }
-
-        // Check to see if the icons fit in the new available height.  If not, then we need to
-        // shrink the icon size.
-        Rect workspacePadding = getWorkspacePadding();
-        float scale = 1f;
-        int drawablePadding = iconDrawablePaddingOriginalPx;
-        updateIconSize(1f, drawablePadding, resources, dm);
-        float usedHeight = (cellHeightPx * numRows);
-        int maxHeight = (availableHeightPx - workspacePadding.top - workspacePadding.bottom);
-        if (usedHeight > maxHeight) {
-            scale = maxHeight / usedHeight;
-            drawablePadding = 0;
-        }
-        updateIconSize(scale, drawablePadding, resources, dm);
-
-        // Make the callbacks
-        for (DeviceProfileCallbacks cb : mCallbacks) {
-            cb.onAvailableSizeChanged(this);
-        }
-    }
-
-    private void updateIconSize(float scale, int drawablePadding, Resources resources,
-                                DisplayMetrics dm) {
-        iconSizePx = (int) (DynamicGrid.pxFromDp(iconSize, dm) * scale);
-        iconTextSizePx = (int) (DynamicGrid.pxFromSp(iconTextSize, dm) * scale);
-        iconDrawablePaddingPx = drawablePadding;
-        hotseatIconSizePx = (int) (DynamicGrid.pxFromDp(hotseatIconSize, dm) * scale);
-
-        // Search Bar
-        searchBarSpaceMaxWidthPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_max_width);
-        searchBarHeightPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_height);
-        searchBarSpaceWidthPx = Math.min(searchBarSpaceMaxWidthPx, widthPx);
-        searchBarSpaceHeightPx = searchBarHeightPx + 2 * edgeMarginPx;
-
-        // Calculate the actual text height
-        Paint textPaint = new Paint();
-        textPaint.setTextSize(iconTextSizePx);
-        FontMetrics fm = textPaint.getFontMetrics();
-        cellWidthPx = iconSizePx;
-        cellHeightPx = iconSizePx + iconDrawablePaddingPx + (int) Math.ceil(fm.bottom - fm.top);
-
-        // Hotseat
-        hotseatBarHeightPx = iconSizePx + 4 * edgeMarginPx;
-        hotseatCellWidthPx = iconSizePx;
-        hotseatCellHeightPx = iconSizePx;
-
-        // Folder
-        folderCellWidthPx = cellWidthPx + 3 * edgeMarginPx;
-        folderCellHeightPx = cellHeightPx + edgeMarginPx;
-        folderBackgroundOffset = -edgeMarginPx;
-        folderIconSizePx = iconSizePx + 2 * -folderBackgroundOffset;
-
-        // All Apps
-        Rect padding = getWorkspacePadding(isLandscape ?
-                CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
-        int pageIndicatorOffset =
-                resources.getDimensionPixelSize(R.dimen.apps_customize_page_indicator_offset);
-        allAppsCellWidthPx = allAppsIconSizePx;
-        allAppsCellHeightPx = allAppsIconSizePx + drawablePadding + iconTextSizePx;
-        int maxLongEdgeCellCount =
-                resources.getInteger(R.integer.config_dynamic_grid_max_long_edge_cell_count);
-        int maxShortEdgeCellCount =
-                resources.getInteger(R.integer.config_dynamic_grid_max_short_edge_cell_count);
-        int minEdgeCellCount =
-                resources.getInteger(R.integer.config_dynamic_grid_min_edge_cell_count);
-        int maxRows = (isLandscape ? maxShortEdgeCellCount : maxLongEdgeCellCount);
-        int maxCols = (isLandscape ? maxLongEdgeCellCount : maxShortEdgeCellCount);
-
-        allAppsNumRows = (availableHeightPx - pageIndicatorHeightPx) /
-                (allAppsCellHeightPx + allAppsCellPaddingPx);
-        allAppsNumRows = Math.max(minEdgeCellCount, Math.min(maxRows, allAppsNumRows));
-        allAppsNumCols = (availableWidthPx) /
-                (allAppsCellWidthPx + allAppsCellPaddingPx);
-        allAppsNumCols = Math.max(minEdgeCellCount, Math.min(maxCols, allAppsNumCols));
-    }
-
-    void updateFromConfiguration(Context context, Resources resources, int wPx, int hPx,
-                                 int awPx, int ahPx) {
-        isLandscape = (resources.getConfiguration().orientation ==
-                Configuration.ORIENTATION_LANDSCAPE);
-        isTablet = resources.getBoolean(R.bool.is_tablet);
-        isLargeTablet = resources.getBoolean(R.bool.is_large_tablet);
-        widthPx = wPx;
-        heightPx = hPx;
-        availableWidthPx = awPx;
-        availableHeightPx = ahPx;
-
-        updateAvailableDimensions(context);
-    }
-
-    private float dist(PointF p0, PointF p1) {
-        return (float) Math.sqrt((p1.x - p0.x)*(p1.x-p0.x) +
-                (p1.y-p0.y)*(p1.y-p0.y));
-    }
-
-    private float weight(PointF a, PointF b,
-                        float pow) {
-        float d = dist(a, b);
-        if (d == 0f) {
-            return Float.POSITIVE_INFINITY;
-        }
-        return (float) (1f / Math.pow(d, pow));
-    }
-
-    private float invDistWeightedInterpolate(float width, float height,
-                ArrayList<DeviceProfileQuery> points) {
-        float sum = 0;
-        float weights = 0;
-        float pow = 5;
-        float kNearestNeighbors = 3;
-        final PointF xy = new PointF(width, height);
-
-        ArrayList<DeviceProfileQuery> pointsByNearness = points;
-        Collections.sort(pointsByNearness, new Comparator<DeviceProfileQuery>() {
-            public int compare(DeviceProfileQuery a, DeviceProfileQuery b) {
-                return (int) (dist(xy, a.dimens) - dist(xy, b.dimens));
-            }
-        });
-
-        for (int i = 0; i < pointsByNearness.size(); ++i) {
-            DeviceProfileQuery p = pointsByNearness.get(i);
-            if (i < kNearestNeighbors) {
-                float w = weight(xy, p.dimens, pow);
-                if (w == Float.POSITIVE_INFINITY) {
-                    return p.value;
-                }
-                weights += w;
-            }
-        }
-
-        for (int i = 0; i < pointsByNearness.size(); ++i) {
-            DeviceProfileQuery p = pointsByNearness.get(i);
-            if (i < kNearestNeighbors) {
-                float w = weight(xy, p.dimens, pow);
-                sum += w * p.value / weights;
-            }
-        }
-
-        return sum;
-    }
-
-    Rect getWorkspacePadding() {
-        return getWorkspacePadding(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
-    }
-
-    Rect getWorkspacePadding(int orientation) {
-        Rect padding = new Rect();
-        if (orientation == CellLayout.LANDSCAPE &&
-                transposeLayoutWithOrientation) {
-            // Pad the left and right of the workspace with search/hotseat bar sizes
-            padding.set(searchBarSpaceHeightPx, edgeMarginPx,
-                    hotseatBarHeightPx, edgeMarginPx);
-        } else {
-            if (isTablet()) {
-                // Pad the left and right of the workspace to ensure consistent spacing
-                // between all icons
-                int width = (orientation == CellLayout.LANDSCAPE)
-                        ? Math.max(widthPx, heightPx)
-                        : Math.min(widthPx, heightPx);
-                // XXX: If the icon size changes across orientations, we will have to take
-                //      that into account here too.
-                int gap = (int) ((width - 2 * edgeMarginPx -
-                        (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
-                padding.set(edgeMarginPx + gap,
-                        searchBarSpaceHeightPx,
-                        edgeMarginPx + gap,
-                        hotseatBarHeightPx + pageIndicatorHeightPx);
-            } else {
-                // Pad the top and bottom of the workspace with search/hotseat bar sizes
-                padding.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left,
-                        searchBarSpaceHeightPx,
-                        desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.right,
-                        hotseatBarHeightPx + pageIndicatorHeightPx);
-            }
-        }
-        return padding;
-    }
-
-    int getWorkspacePageSpacing(int orientation) {
-        if (orientation == CellLayout.LANDSCAPE &&
-                transposeLayoutWithOrientation) {
-            // In landscape mode the page spacing is set to the default.
-            return defaultPageSpacingPx;
-        } else {
-            // In portrait, we want the pages spaced such that there is no
-            // overhang of the previous / next page into the current page viewport.
-            // We assume symmetrical padding in portrait mode.
-            return 2 * getWorkspacePadding().left;
-        }
-    }
-
-    Rect getOverviewModeButtonBarRect() {
-        int zoneHeight = (int) (overviewModeIconZoneRatio * availableHeightPx);
-        zoneHeight = Math.min(overviewModeMaxIconZoneHeightPx,
-                Math.max(overviewModeMinIconZoneHeightPx, zoneHeight));
-        return new Rect(0, availableHeightPx - zoneHeight, 0, availableHeightPx);
-    }
-
-    float getOverviewModeScale() {
-        Rect workspacePadding = getWorkspacePadding();
-        Rect overviewBar = getOverviewModeButtonBarRect();
-        int pageSpace = availableHeightPx - workspacePadding.top - workspacePadding.bottom;
-        return (overviewModeScaleFactor * (pageSpace - overviewBar.height())) / pageSpace;
-    }
-
-    // The rect returned will be extended to below the system ui that covers the workspace
-    Rect getHotseatRect() {
-        if (isVerticalBarLayout()) {
-            return new Rect(availableWidthPx - hotseatBarHeightPx, 0,
-                    Integer.MAX_VALUE, availableHeightPx);
-        } else {
-            return new Rect(0, availableHeightPx - hotseatBarHeightPx,
-                    availableWidthPx, Integer.MAX_VALUE);
-        }
-    }
-
-    int calculateCellWidth(int width, int countX) {
-        return width / countX;
-    }
-    int calculateCellHeight(int height, int countY) {
-        return height / countY;
-    }
-
-    boolean isPhone() {
-        return !isTablet && !isLargeTablet;
-    }
-    boolean isTablet() {
-        return isTablet;
-    }
-    boolean isLargeTablet() {
-        return isLargeTablet;
-    }
-
-    boolean isVerticalBarLayout() {
-        return isLandscape && transposeLayoutWithOrientation;
-    }
-
-    boolean shouldFadeAdjacentWorkspaceScreens() {
-        return isVerticalBarLayout() || isLargeTablet();
-    }
-
-    public void layout(Launcher launcher) {
-        FrameLayout.LayoutParams lp;
-        Resources res = launcher.getResources();
-        boolean hasVerticalBarLayout = isVerticalBarLayout();
-
-        // Layout the search bar space
-        View searchBar = launcher.getSearchBar();
-        lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();
-        if (hasVerticalBarLayout) {
-            // Vertical search bar
-            lp.gravity = Gravity.TOP | Gravity.LEFT;
-            lp.width = searchBarSpaceHeightPx;
-            lp.height = LayoutParams.MATCH_PARENT;
-            searchBar.setPadding(
-                    0, 2 * edgeMarginPx, 0,
-                    2 * edgeMarginPx);
-        } else {
-            // Horizontal search bar
-            lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL;
-            lp.width = searchBarSpaceWidthPx;
-            lp.height = searchBarSpaceHeightPx;
-            searchBar.setPadding(
-                    2 * edgeMarginPx,
-                    2 * edgeMarginPx,
-                    2 * edgeMarginPx, 0);
-        }
-        searchBar.setLayoutParams(lp);
-
-        // Layout the search bar
-        View qsbBar = launcher.getQsbBar();
-        LayoutParams vglp = qsbBar.getLayoutParams();
-        vglp.width = LayoutParams.MATCH_PARENT;
-        vglp.height = LayoutParams.MATCH_PARENT;
-        qsbBar.setLayoutParams(vglp);
-
-        // Layout the voice proxy
-        View voiceButtonProxy = launcher.findViewById(R.id.voice_button_proxy);
-        if (voiceButtonProxy != null) {
-            if (hasVerticalBarLayout) {
-                // TODO: MOVE THIS INTO SEARCH BAR MEASURE
-            } else {
-                lp = (FrameLayout.LayoutParams) voiceButtonProxy.getLayoutParams();
-                lp.gravity = Gravity.TOP | Gravity.END;
-                lp.width = (widthPx - searchBarSpaceWidthPx) / 2 +
-                        2 * iconSizePx;
-                lp.height = searchBarSpaceHeightPx;
-            }
-        }
-
-        // Layout the workspace
-        PagedView workspace = (PagedView) launcher.findViewById(R.id.workspace);
-        lp = (FrameLayout.LayoutParams) workspace.getLayoutParams();
-        lp.gravity = Gravity.CENTER;
-        int orientation = isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT;
-        Rect padding = getWorkspacePadding(orientation);
-        workspace.setLayoutParams(lp);
-        workspace.setPadding(padding.left, padding.top, padding.right, padding.bottom);
-        workspace.setPageSpacing(getWorkspacePageSpacing(orientation));
-
-        // Layout the hotseat
-        View hotseat = launcher.findViewById(R.id.hotseat);
-        lp = (FrameLayout.LayoutParams) hotseat.getLayoutParams();
-        if (hasVerticalBarLayout) {
-            // Vertical hotseat
-            lp.gravity = Gravity.RIGHT;
-            lp.width = hotseatBarHeightPx;
-            lp.height = LayoutParams.MATCH_PARENT;
-            hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx);
-        } else if (isTablet()) {
-            // Pad the hotseat with the grid gap calculated above
-            int gridGap = (int) ((widthPx - 2 * edgeMarginPx -
-                    (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
-            int gridWidth = (int) ((numColumns * cellWidthPx) +
-                    ((numColumns - 1) * gridGap));
-            int hotseatGap = (int) Math.max(0,
-                    (gridWidth - (numHotseatIcons * hotseatCellWidthPx))
-                            / (numHotseatIcons - 1));
-            lp.gravity = Gravity.BOTTOM;
-            lp.width = LayoutParams.MATCH_PARENT;
-            lp.height = hotseatBarHeightPx;
-            hotseat.setPadding(2 * edgeMarginPx + gridGap + hotseatGap, 0,
-                    2 * edgeMarginPx + gridGap + hotseatGap,
-                    2 * edgeMarginPx);
-        } else {
-            // For phones, layout the hotseat without any bottom margin
-            // to ensure that we have space for the folders
-            lp.gravity = Gravity.BOTTOM;
-            lp.width = LayoutParams.MATCH_PARENT;
-            lp.height = hotseatBarHeightPx;
-            hotseat.findViewById(R.id.layout).setPadding(2 * edgeMarginPx, 0,
-                    2 * edgeMarginPx, 0);
-        }
-        hotseat.setLayoutParams(lp);
-
-        // Layout the page indicators
-        View pageIndicator = launcher.findViewById(R.id.page_indicator);
-        if (pageIndicator != null) {
-            if (hasVerticalBarLayout) {
-                // Hide the page indicators when we have vertical search/hotseat
-                pageIndicator.setVisibility(View.GONE);
-            } else {
-                // Put the page indicators above the hotseat
-                lp = (FrameLayout.LayoutParams) pageIndicator.getLayoutParams();
-                lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
-                lp.width = LayoutParams.WRAP_CONTENT;
-                lp.height = LayoutParams.WRAP_CONTENT;
-                lp.bottomMargin = hotseatBarHeightPx;
-                pageIndicator.setLayoutParams(lp);
-            }
-        }
-
-        // Layout AllApps
-        AppsCustomizeTabHost host = (AppsCustomizeTabHost)
-                launcher.findViewById(R.id.apps_customize_pane);
-        if (host != null) {
-            // Center the all apps page indicator
-            int pageIndicatorHeight = (int) (pageIndicatorHeightPx * Math.min(1f,
-                    (allAppsIconSizePx / DynamicGrid.DEFAULT_ICON_SIZE_PX)));
-            pageIndicator = host.findViewById(R.id.apps_customize_page_indicator);
-            if (pageIndicator != null) {
-                lp = (FrameLayout.LayoutParams) pageIndicator.getLayoutParams();
-                lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
-                lp.width = LayoutParams.WRAP_CONTENT;
-                lp.height = pageIndicatorHeight;
-                pageIndicator.setLayoutParams(lp);
-            }
-
-            AppsCustomizePagedView pagedView = (AppsCustomizePagedView)
-                    host.findViewById(R.id.apps_customize_pane_content);
-            padding = new Rect();
-            if (pagedView != null) {
-                // Constrain the dimensions of all apps so that it does not span the full width
-                int paddingLR = (availableWidthPx - (allAppsCellWidthPx * allAppsNumCols)) /
-                        (2 * (allAppsNumCols + 1));
-                int paddingTB = (availableHeightPx - (allAppsCellHeightPx * allAppsNumRows)) /
-                        (2 * (allAppsNumRows + 1));
-                paddingLR = Math.min(paddingLR, (int)((paddingLR + paddingTB) * 0.75f));
-                paddingTB = Math.min(paddingTB, (int)((paddingLR + paddingTB) * 0.75f));
-                int maxAllAppsWidth = (allAppsNumCols * (allAppsCellWidthPx + 2 * paddingLR));
-                int gridPaddingLR = (availableWidthPx - maxAllAppsWidth) / 2;
-                if (gridPaddingLR > (allAppsCellWidthPx / 4)) {
-                    padding.left = padding.right = gridPaddingLR;
-                }
-                // The icons are centered, so we can't just offset by the page indicator height
-                // because the empty space will actually be pageIndicatorHeight + paddingTB
-                padding.bottom = Math.max(0, pageIndicatorHeight - paddingTB);
-                pagedView.setAllAppsPadding(padding);
-                pagedView.setWidgetsPageIndicatorPadding(pageIndicatorHeight);
-            }
-        }
-
-        // Layout the Overview Mode
-        View overviewMode = launcher.getOverviewPanel();
-        if (overviewMode != null) {
-            Rect r = getOverviewModeButtonBarRect();
-            lp = (FrameLayout.LayoutParams) overviewMode.getLayoutParams();
-            lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
-            lp.width = Math.min(availableWidthPx, overviewModeMaxBarWidthPx);
-            lp.height = r.height();
-            overviewMode.setLayoutParams(lp);
-        }
-    }
-}
-
 public class DynamicGrid {
     @SuppressWarnings("unused")
     private static final String TAG = "DynamicGrid";
@@ -755,7 +95,7 @@ public class DynamicGrid {
                 resources);
     }
 
-    DeviceProfile getDeviceProfile() {
+    public DeviceProfile getDeviceProfile() {
         return mProfile;
     }
 
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index fe2b43fe4a..9a47eaa32c 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -191,7 +191,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
                 availableWidth, availableHeight);
         return grid;
     }
-    DynamicGrid getDynamicGrid() {
+    public DynamicGrid getDynamicGrid() {
         return mDynamicGrid;
     }
 

From 1774a8a0c67ae225b31dfb37213d6cadc630e48c Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 15 Nov 2013 10:56:16 +0000
Subject: [PATCH 016/147] Fix for transparent CustomContent screen (issue
 11549096)

Change-Id: I8b371e3c556a80b7eb3e145a8d4b78f15421046a
---
 src/com/android/launcher3/Workspace.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9b6784c8d5..558519f07c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2336,7 +2336,9 @@ public class Workspace extends SmoothPagedView
     void hideCustomContentIfNecessary() {
         boolean hide  = mState != Workspace.State.NORMAL;
         if (hide && hasCustomContent()) {
+            disableLayoutTransitions();
             mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
+            enableLayoutTransitions();
         }
     }
 

From 3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 15 Nov 2013 16:51:22 +0000
Subject: [PATCH 017/147] Bit of code cleanup (issue 11648206)

Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
---
 src/com/android/launcher3/Workspace.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7466a19bbe..d5c0c75b27 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -708,7 +708,12 @@ public class Workspace extends SmoothPagedView
                         onComplete, stripEmptyScreens);
             }
             return;
+        } else if (stripEmptyScreens) {
+            // If we're not going to strip the empty screens after removing
+            // the extra empty screen, do it right away.
+            stripEmptyScreens();
         }
+
         if (onComplete != null) {
             onComplete.run();
         }

From a90303bb6fdad59e4a55855edba68c9902192599 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 15 Nov 2013 13:05:06 -0800
Subject: [PATCH 018/147] Adding logs to track down missing workspace screen.
 (Bug 11683562)

Change-Id: I12ef3331ab81004c75229d33afa0a8dd0fa8521c
---
 src/com/android/launcher3/Launcher.java       |  4 +++
 src/com/android/launcher3/LauncherModel.java  | 14 ++++++++++
 .../android/launcher3/LauncherProvider.java   |  6 ++++
 src/com/android/launcher3/Workspace.java      | 28 +++++++++++++++++++
 4 files changed, 52 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0c14ed93ce..310024135e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3657,6 +3657,10 @@ public class Launcher extends Activity
 
     @Override
     public void bindAddScreens(ArrayList<Long> orderedScreenIds) {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - bindAddScreens()", true);
+        Launcher.addDumpLog(TAG, "11683562 -   orderedScreenIds: " +
+                TextUtils.join(", ", orderedScreenIds), true);
         int count = orderedScreenIds.size();
         for (int i = 0; i < count; i++) {
             mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(orderedScreenIds.get(i));
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index dff1814267..b89579e694 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -40,6 +40,7 @@ import android.os.Process;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.provider.BaseColumns;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import com.android.launcher3.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
@@ -955,6 +956,10 @@ public class LauncherModel extends BroadcastReceiver {
      * a list of screen ids in the order that they should appear.
      */
     void updateWorkspaceScreenOrder(Context context, final ArrayList<Long> screens) {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - updateWorkspaceScreenOrder()", true);
+        Launcher.addDumpLog(TAG, "11683562 -   screens: " + TextUtils.join(", ", screens), true);
+
         final ArrayList<Long> screensCopy = new ArrayList<Long>(screens);
         final ContentResolver cr = context.getContentResolver();
         final Uri uri = LauncherSettings.WorkspaceScreens.CONTENT_URI;
@@ -1235,6 +1240,15 @@ public class LauncherModel extends BroadcastReceiver {
         } finally {
             sc.close();
         }
+
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - loadWorkspaceScreensDb()", true);
+        ArrayList<String> orderedScreensPairs= new ArrayList<String>();
+        for (Integer i : orderedScreens.keySet()) {
+            orderedScreensPairs.add("{ " + i + ": " + orderedScreens.get(i) + " }");
+        }
+        Launcher.addDumpLog(TAG, "11683562 -   screens: " +
+                TextUtils.join(", ", orderedScreensPairs), true);
         return orderedScreens;
     }
 
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index e992706de9..b5db3386f8 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -868,10 +868,14 @@ public class LauncherProvider extends ContentProvider {
                 throw new RuntimeException("Error: max screen id was not initialized");
             }
             mMaxScreenId += 1;
+            // Log to disk
+            Launcher.addDumpLog(TAG, "11683562 - generateNewScreenId(): " + mMaxScreenId, true);
             return mMaxScreenId;
         }
 
         public void updateMaxScreenId(long maxScreenId) {
+            // Log to disk
+            Launcher.addDumpLog(TAG, "11683562 - updateMaxScreenId(): " + maxScreenId, true);
             mMaxScreenId = maxScreenId;
         }
 
@@ -892,6 +896,8 @@ public class LauncherProvider extends ContentProvider {
                 throw new RuntimeException("Error: could not query max screen id");
             }
 
+            // Log to disk
+            Launcher.addDumpLog(TAG, "11683562 - initializeMaxScreenId(): " + id, true);
             return id;
         }
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f36c815da5..d517d8b9d3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -534,6 +534,10 @@ public class Workspace extends SmoothPagedView
     }
 
     public long insertNewWorkspaceScreen(long screenId, int insertIndex) {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - insertNewWorkspaceScreen(): " + screenId +
+                " at index: " + insertIndex, true);
+
         if (mWorkspaceScreens.containsKey(screenId)) {
             throw new RuntimeException("Screen id " + screenId + " already exists!");
         }
@@ -627,6 +631,9 @@ public class Workspace extends SmoothPagedView
     }
 
     public void addExtraEmptyScreenOnDrag() {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - addExtraEmptyScreenOnDrag()", true);
+
         boolean lastChildOnScreen = false;
         boolean childOnFinalScreen = false;
 
@@ -653,6 +660,9 @@ public class Workspace extends SmoothPagedView
     }
 
     public boolean addExtraEmptyScreen() {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - addExtraEmptyScreen()", true);
+
         if (!mWorkspaceScreens.containsKey(EXTRA_EMPTY_SCREEN_ID)) {
             insertNewWorkspaceScreen(EXTRA_EMPTY_SCREEN_ID);
             return true;
@@ -661,6 +671,9 @@ public class Workspace extends SmoothPagedView
     }
 
     private void convertFinalScreenToEmptyScreenIfNecessary() {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - convertFinalScreenToEmptyScreenIfNecessary()", true);
+
         if (hasExtraEmptyScreen() || mScreenOrder.size() == 0) return;
         long finalScreenId = mScreenOrder.get(mScreenOrder.size() - 1);
 
@@ -676,6 +689,9 @@ public class Workspace extends SmoothPagedView
             // if this is the last non-custom content screen, convert it to the empty screen
             mWorkspaceScreens.put(EXTRA_EMPTY_SCREEN_ID, finalScreen);
             mScreenOrder.add(EXTRA_EMPTY_SCREEN_ID);
+
+            // XXX: Do we need to update LM workspace screens here?
+            Launcher.addDumpLog(TAG, "11683562 -   extra empty screen: " + finalScreenId, true);
         }
     }
 
@@ -685,6 +701,8 @@ public class Workspace extends SmoothPagedView
 
     public void removeExtraEmptyScreen(final boolean animate, final Runnable onComplete,
             final int delay, final boolean stripEmptyScreens) {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - removeExtraEmptyScreen()", true);
         if (delay > 0) {
             postDelayed(new Runnable() {
                 @Override
@@ -716,6 +734,9 @@ public class Workspace extends SmoothPagedView
 
     private void fadeAndRemoveEmptyScreen(int delay, int duration, final Runnable onComplete,
             final boolean stripEmptyScreens) {
+        // Log to disk
+        // XXX: Do we need to update LM workspace screens below?
+        Launcher.addDumpLog(TAG, "11683562 - fadeAndRemoveEmptyScreen()", true);
         PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 0f);
         PropertyValuesHolder bgAlpha = PropertyValuesHolder.ofFloat("backgroundAlpha", 0f);
 
@@ -759,6 +780,9 @@ public class Workspace extends SmoothPagedView
     }
 
     public long commitExtraEmptyScreen() {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - commitExtraEmptyScreen()", true);
+
         int index = getPageIndexForScreenId(EXTRA_EMPTY_SCREEN_ID);
         CellLayout cl = mWorkspaceScreens.get(EXTRA_EMPTY_SCREEN_ID);
         mWorkspaceScreens.remove(EXTRA_EMPTY_SCREEN_ID);
@@ -811,6 +835,9 @@ public class Workspace extends SmoothPagedView
     }
 
     public void stripEmptyScreens() {
+        // Log to disk
+        Launcher.addDumpLog(TAG, "11683562 - stripEmptyScreens()", true);
+
         if (isPageMoving()) {
             mStripScreensOnPageStopMoving = true;
             return;
@@ -831,6 +858,7 @@ public class Workspace extends SmoothPagedView
 
         int pageShift = 0;
         for (Long id: removeScreens) {
+            Launcher.addDumpLog(TAG, "11683562 -   removing id: " + id, true);
             CellLayout cl = mWorkspaceScreens.get(id);
             mWorkspaceScreens.remove(id);
             mScreenOrder.remove(id);

From 9f9f00bca673ed491e623235314a5c4c22ff28c1 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 15 Nov 2013 13:27:00 -0800
Subject: [PATCH 019/147] Additional logs to track down missing workspace
 screen. (Bug 11683562)

Change-Id: I4f6b3c3ae07e2069bad01940dfce6bdc9cdb0ae0
---
 src/com/android/launcher3/LauncherModel.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b89579e694..0c81de24d4 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1613,6 +1613,9 @@ public class LauncherModel extends BroadcastReceiver {
 
         /** Returns whether this is an upgradge path */
         private boolean loadWorkspace() {
+            // Log to disk
+            Launcher.addDumpLog(TAG, "11683562 - loadWorkspace()", true);
+
             final long t = DEBUG_LOADERS ? SystemClock.uptimeMillis() : 0;
 
             final Context context = mContext;
@@ -1631,6 +1634,8 @@ public class LauncherModel extends BroadcastReceiver {
 
             // Check if we need to do any upgrade-path logic
             boolean loadedOldDb = LauncherAppState.getLauncherProvider().justLoadedOldDb();
+            // Log to disk
+            Launcher.addDumpLog(TAG, "11683562 -   loadedOldDb: " + loadedOldDb, true);
 
             synchronized (sBgLock) {
                 clearSBgDataStructures();
@@ -1947,6 +1952,10 @@ public class LauncherModel extends BroadcastReceiver {
                         }
                     }
                     Collections.sort(sBgWorkspaceScreens);
+                    // Log to disk
+                    Launcher.addDumpLog(TAG, "11683562 -   maxScreenId: " + maxScreenId, true);
+                    Launcher.addDumpLog(TAG, "11683562 -   sBgWorkspaceScreens: " +
+                            TextUtils.join(", ", sBgWorkspaceScreens), true);
 
                     LauncherAppState.getLauncherProvider().updateMaxScreenId(maxScreenId);
                     updateWorkspaceScreenOrder(context, sBgWorkspaceScreens);
@@ -1963,6 +1972,9 @@ public class LauncherModel extends BroadcastReceiver {
                     for (Integer i : orderedScreens.keySet()) {
                         sBgWorkspaceScreens.add(orderedScreens.get(i));
                     }
+                    // Log to disk
+                    Launcher.addDumpLog(TAG, "11683562 -   sBgWorkspaceScreens: " +
+                            TextUtils.join(", ", sBgWorkspaceScreens), true);
 
                     // Remove any empty screens
                     ArrayList<Long> unusedScreens = new ArrayList<Long>(sBgWorkspaceScreens);
@@ -1976,6 +1988,10 @@ public class LauncherModel extends BroadcastReceiver {
 
                     // If there are any empty screens remove them, and update.
                     if (unusedScreens.size() != 0) {
+                        // Log to disk
+                        Launcher.addDumpLog(TAG, "11683562 -   unusedScreens (to be removed): " +
+                                TextUtils.join(", ", unusedScreens), true);
+
                         sBgWorkspaceScreens.removeAll(unusedScreens);
                         updateWorkspaceScreenOrder(context, sBgWorkspaceScreens);
                     }

From 9b9fb967b2305413520dc676d6d3c472b2b6b25e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 15 Nov 2013 15:39:34 -0800
Subject: [PATCH 020/147] Updating LauncherModel filtering to use screen ids.
 (Bug 11685286)

- Fixes the issue with the current page not synchronously binding

Change-Id: I3dfa45cc1777f846c77f3e86059dfb715553e1a3
---
 src/com/android/launcher3/Launcher.java      |  5 +-
 src/com/android/launcher3/LauncherModel.java | 53 +++++++++++---------
 src/com/android/launcher3/PagedView.java     |  3 ++
 src/com/android/launcher3/Workspace.java     |  2 +-
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 89abd9f2a0..7d84a3c88f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -459,7 +459,7 @@ public class Launcher extends Activity
             } else {
                 // We only load the page synchronously if the user rotates (or triggers a
                 // configuration change) while launcher is in the foreground
-                mModel.startLoader(true, mWorkspace.getCurrentPage());
+                mModel.startLoader(true, mWorkspace.getRestorePage());
             }
         }
 
@@ -1801,7 +1801,8 @@ public class Launcher extends Activity
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         if (mWorkspace.getChildCount() > 0) {
-            outState.putInt(RUNTIME_STATE_CURRENT_SCREEN, mWorkspace.getRestorePage());
+            outState.putInt(RUNTIME_STATE_CURRENT_SCREEN,
+                    mWorkspace.getCurrentPageOffsetFromCustomContent());
         }
         super.onSaveInstanceState(outState);
 
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 5a3b1b80fb..c3d4666447 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2026,7 +2026,7 @@ public class LauncherModel extends BroadcastReceiver {
 
         /** Filters the set of items who are directly or indirectly (via another container) on the
          * specified screen. */
-        private void filterCurrentWorkspaceItems(int currentScreen,
+        private void filterCurrentWorkspaceItems(long currentScreenId,
                 ArrayList<ItemInfo> allWorkspaceItems,
                 ArrayList<ItemInfo> currentScreenItems,
                 ArrayList<ItemInfo> otherScreenItems) {
@@ -2041,8 +2041,8 @@ public class LauncherModel extends BroadcastReceiver {
 
             // If we aren't filtering on a screen, then the set of items to load is the full set of
             // items given.
-            if (currentScreen < 0) {
-                currentScreenItems.addAll(allWorkspaceItems);
+            if (currentScreenId < 0) {
+                throw new RuntimeException("Unexpected screen id");
             }
 
             // Order the set of items by their containers first, this allows use to walk through the
@@ -2057,7 +2057,7 @@ public class LauncherModel extends BroadcastReceiver {
             });
             for (ItemInfo info : allWorkspaceItems) {
                 if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
-                    if (info.screenId == currentScreen) {
+                    if (info.screenId == currentScreenId) {
                         currentScreenItems.add(info);
                         itemsOnScreen.add(info.id);
                     } else {
@@ -2078,20 +2078,20 @@ public class LauncherModel extends BroadcastReceiver {
         }
 
         /** Filters the set of widgets which are on the specified screen. */
-        private void filterCurrentAppWidgets(int currentScreen,
+        private void filterCurrentAppWidgets(long currentScreenId,
                 ArrayList<LauncherAppWidgetInfo> appWidgets,
                 ArrayList<LauncherAppWidgetInfo> currentScreenWidgets,
                 ArrayList<LauncherAppWidgetInfo> otherScreenWidgets) {
             // If we aren't filtering on a screen, then the set of items to load is the full set of
             // widgets given.
-            if (currentScreen < 0) {
-                currentScreenWidgets.addAll(appWidgets);
+            if (currentScreenId < 0) {
+                throw new RuntimeException("Unexpected screen id");
             }
 
             for (LauncherAppWidgetInfo widget : appWidgets) {
                 if (widget == null) continue;
                 if (widget.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&
-                        widget.screenId == currentScreen) {
+                        widget.screenId == currentScreenId) {
                     currentScreenWidgets.add(widget);
                 } else {
                     otherScreenWidgets.add(widget);
@@ -2100,15 +2100,15 @@ public class LauncherModel extends BroadcastReceiver {
         }
 
         /** Filters the set of folders which are on the specified screen. */
-        private void filterCurrentFolders(int currentScreen,
+        private void filterCurrentFolders(long currentScreenId,
                 HashMap<Long, ItemInfo> itemsIdMap,
                 HashMap<Long, FolderInfo> folders,
                 HashMap<Long, FolderInfo> currentScreenFolders,
                 HashMap<Long, FolderInfo> otherScreenFolders) {
             // If we aren't filtering on a screen, then the set of items to load is the full set of
             // widgets given.
-            if (currentScreen < 0) {
-                currentScreenFolders.putAll(folders);
+            if (currentScreenId < 0) {
+                throw new RuntimeException("Unexpected screen id");
             }
 
             for (long id : folders.keySet()) {
@@ -2116,7 +2116,7 @@ public class LauncherModel extends BroadcastReceiver {
                 FolderInfo folder = folders.get(id);
                 if (info == null || folder == null) continue;
                 if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&
-                        info.screenId == currentScreen) {
+                        info.screenId == currentScreenId) {
                     currentScreenFolders.put(id, folder);
                 } else {
                     otherScreenFolders.put(id, folder);
@@ -2243,13 +2243,7 @@ public class LauncherModel extends BroadcastReceiver {
                 return;
             }
 
-            final boolean isLoadingSynchronously = (synchronizeBindPage > -1);
-            final int currentScreen = isLoadingSynchronously ? synchronizeBindPage :
-                oldCallbacks.getCurrentWorkspaceScreen();
-
-            // Load all the items that are on the current page first (and in the process, unbind
-            // all the existing workspace items before we call startBinding() below.
-            unbindWorkspaceItemsOnMainThread();
+            // Save a copy of all the bg-thread collections
             ArrayList<ItemInfo> workspaceItems = new ArrayList<ItemInfo>();
             ArrayList<LauncherAppWidgetInfo> appWidgets =
                     new ArrayList<LauncherAppWidgetInfo>();
@@ -2264,6 +2258,20 @@ public class LauncherModel extends BroadcastReceiver {
                 orderedScreenIds.addAll(sBgWorkspaceScreens);
             }
 
+            final boolean isLoadingSynchronously = (synchronizeBindPage > -1);
+            final int currentScreen = isLoadingSynchronously ? synchronizeBindPage :
+                oldCallbacks.getCurrentWorkspaceScreen();
+            if (currentScreen >= orderedScreenIds.size()) {
+                Log.w(TAG, "Invalid screen id to synchronously load");
+                return;
+            }
+            final long currentScreenId = orderedScreenIds.get(currentScreen);
+
+            // Load all the items that are on the current page first (and in the process, unbind
+            // all the existing workspace items before we call startBinding() below.
+            unbindWorkspaceItemsOnMainThread();
+
+            // Separate the items that are on the current screen, and all the other remaining items
             ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<ItemInfo>();
             ArrayList<ItemInfo> otherWorkspaceItems = new ArrayList<ItemInfo>();
             ArrayList<LauncherAppWidgetInfo> currentAppWidgets =
@@ -2273,12 +2281,11 @@ public class LauncherModel extends BroadcastReceiver {
             HashMap<Long, FolderInfo> currentFolders = new HashMap<Long, FolderInfo>();
             HashMap<Long, FolderInfo> otherFolders = new HashMap<Long, FolderInfo>();
 
-            // Separate the items that are on the current screen, and all the other remaining items
-            filterCurrentWorkspaceItems(currentScreen, workspaceItems, currentWorkspaceItems,
+            filterCurrentWorkspaceItems(currentScreenId, workspaceItems, currentWorkspaceItems,
                     otherWorkspaceItems);
-            filterCurrentAppWidgets(currentScreen, appWidgets, currentAppWidgets,
+            filterCurrentAppWidgets(currentScreenId, appWidgets, currentAppWidgets,
                     otherAppWidgets);
-            filterCurrentFolders(currentScreen, itemsIdMap, folders, currentFolders,
+            filterCurrentFolders(currentScreenId, itemsIdMap, folders, currentFolders,
                     otherFolders);
             sortWorkspaceItemsSpatially(currentWorkspaceItems);
             sortWorkspaceItemsSpatially(otherWorkspaceItems);
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 3eecedbccf..e095c15d2b 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -564,6 +564,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
     void setRestorePage(int restorePage) {
         mRestorePage = restorePage;
     }
+    int getRestorePage() {
+        return mRestorePage;
+    }
 
     protected void notifyPageSwitchListener() {
         if (mPageSwitchListener != null) {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9b17fcd9e7..08a6e436a2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3956,7 +3956,7 @@ public class Workspace extends SmoothPagedView
         return mDragInfo;
     }
 
-    public int getRestorePage() {
+    public int getCurrentPageOffsetFromCustomContent() {
         return getNextPage() - numCustomPages();
     }
 

From f9618856d6910ac385ad37762f9f067ae59a8622 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 8 Nov 2013 06:45:03 -0800
Subject: [PATCH 021/147] Syncing up state transition with paging transition

Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e
---
 .../android/launcher3/LauncherScroller.java   | 559 ++++++++++++++++++
 src/com/android/launcher3/PagedView.java      |  58 +-
 src/com/android/launcher3/RampUpScroller.java | 120 ----
 .../android/launcher3/SmoothPagedView.java    |   3 +-
 src/com/android/launcher3/Workspace.java      |  13 +-
 5 files changed, 606 insertions(+), 147 deletions(-)
 create mode 100644 src/com/android/launcher3/LauncherScroller.java
 delete mode 100644 src/com/android/launcher3/RampUpScroller.java

diff --git a/src/com/android/launcher3/LauncherScroller.java b/src/com/android/launcher3/LauncherScroller.java
new file mode 100644
index 0000000000..3bd0a78c47
--- /dev/null
+++ b/src/com/android/launcher3/LauncherScroller.java
@@ -0,0 +1,559 @@
+/*
+ * Copyright (C) 2006 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
+ *
+ *      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
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.animation.TimeInterpolator;
+import android.content.Context;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.FloatMath;
+import android.view.ViewConfiguration;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+
+/**
+ * This class differs from the framework {@link android.widget.Scroller} in that
+ * you can modify the Interpolator post-construction.
+ */
+public class LauncherScroller  {
+    private int mMode;
+
+    private int mStartX;
+    private int mStartY;
+    private int mFinalX;
+    private int mFinalY;
+
+    private int mMinX;
+    private int mMaxX;
+    private int mMinY;
+    private int mMaxY;
+
+    private int mCurrX;
+    private int mCurrY;
+    private long mStartTime;
+    private int mDuration;
+    private float mDurationReciprocal;
+    private float mDeltaX;
+    private float mDeltaY;
+    private boolean mFinished;
+    private TimeInterpolator mInterpolator;
+    private boolean mFlywheel;
+
+    private float mVelocity;
+    private float mCurrVelocity;
+    private int mDistance;
+
+    private float mFlingFriction = ViewConfiguration.getScrollFriction();
+
+    private static final int DEFAULT_DURATION = 250;
+    private static final int SCROLL_MODE = 0;
+    private static final int FLING_MODE = 1;
+
+    private static float DECELERATION_RATE = (float) (Math.log(0.78) / Math.log(0.9));
+    private static final float INFLEXION = 0.35f; // Tension lines cross at (INFLEXION, 1)
+    private static final float START_TENSION = 0.5f;
+    private static final float END_TENSION = 1.0f;
+    private static final float P1 = START_TENSION * INFLEXION;
+    private static final float P2 = 1.0f - END_TENSION * (1.0f - INFLEXION);
+
+    private static final int NB_SAMPLES = 100;
+    private static final float[] SPLINE_POSITION = new float[NB_SAMPLES + 1];
+    private static final float[] SPLINE_TIME = new float[NB_SAMPLES + 1];
+
+    private float mDeceleration;
+    private final float mPpi;
+
+    // A context-specific coefficient adjusted to physical values.
+    private float mPhysicalCoeff;
+
+    static {
+        float x_min = 0.0f;
+        float y_min = 0.0f;
+        for (int i = 0; i < NB_SAMPLES; i++) {
+            final float alpha = (float) i / NB_SAMPLES;
+
+            float x_max = 1.0f;
+            float x, tx, coef;
+            while (true) {
+                x = x_min + (x_max - x_min) / 2.0f;
+                coef = 3.0f * x * (1.0f - x);
+                tx = coef * ((1.0f - x) * P1 + x * P2) + x * x * x;
+                if (Math.abs(tx - alpha) < 1E-5) break;
+                if (tx > alpha) x_max = x;
+                else x_min = x;
+            }
+            SPLINE_POSITION[i] = coef * ((1.0f - x) * START_TENSION + x) + x * x * x;
+
+            float y_max = 1.0f;
+            float y, dy;
+            while (true) {
+                y = y_min + (y_max - y_min) / 2.0f;
+                coef = 3.0f * y * (1.0f - y);
+                dy = coef * ((1.0f - y) * START_TENSION + y) + y * y * y;
+                if (Math.abs(dy - alpha) < 1E-5) break;
+                if (dy > alpha) y_max = y;
+                else y_min = y;
+            }
+            SPLINE_TIME[i] = coef * ((1.0f - y) * P1 + y * P2) + y * y * y;
+        }
+        SPLINE_POSITION[NB_SAMPLES] = SPLINE_TIME[NB_SAMPLES] = 1.0f;
+
+        // This controls the viscous fluid effect (how much of it)
+        sViscousFluidScale = 8.0f;
+        // must be set to 1.0 (used in viscousFluid())
+        sViscousFluidNormalize = 1.0f;
+        sViscousFluidNormalize = 1.0f / viscousFluid(1.0f);
+
+    }
+
+    private static float sViscousFluidScale;
+    private static float sViscousFluidNormalize;
+
+    public void setInterpolator(TimeInterpolator interpolator) {
+        mInterpolator = interpolator;
+    }
+
+    /**
+     * Create a Scroller with the default duration and interpolator.
+     */
+    public LauncherScroller(Context context) {
+        this(context, null);
+    }
+
+    /**
+     * Create a Scroller with the specified interpolator. If the interpolator is
+     * null, the default (viscous) interpolator will be used. "Flywheel" behavior will
+     * be in effect for apps targeting Honeycomb or newer.
+     */
+    public LauncherScroller(Context context, Interpolator interpolator) {
+        this(context, interpolator,
+                context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB);
+    }
+
+    /**
+     * Create a Scroller with the specified interpolator. If the interpolator is
+     * null, the default (viscous) interpolator will be used. Specify whether or
+     * not to support progressive "flywheel" behavior in flinging.
+     */
+    public LauncherScroller(Context context, Interpolator interpolator, boolean flywheel) {
+        mFinished = true;
+        mInterpolator = interpolator;
+        mPpi = context.getResources().getDisplayMetrics().density * 160.0f;
+        mDeceleration = computeDeceleration(ViewConfiguration.getScrollFriction());
+        mFlywheel = flywheel;
+
+        mPhysicalCoeff = computeDeceleration(0.84f); // look and feel tuning
+    }
+
+    /**
+     * The amount of friction applied to flings. The default value
+     * is {@link ViewConfiguration#getScrollFriction}.
+     *
+     * @param friction A scalar dimension-less value representing the coefficient of
+     *         friction.
+     */
+    public final void setFriction(float friction) {
+        mDeceleration = computeDeceleration(friction);
+        mFlingFriction = friction;
+    }
+
+    private float computeDeceleration(float friction) {
+        return SensorManager.GRAVITY_EARTH   // g (m/s^2)
+                      * 39.37f               // inch/meter
+                      * mPpi                 // pixels per inch
+                      * friction;
+    }
+
+    /**
+     *
+     * Returns whether the scroller has finished scrolling.
+     *
+     * @return True if the scroller has finished scrolling, false otherwise.
+     */
+    public final boolean isFinished() {
+        return mFinished;
+    }
+
+    /**
+     * Force the finished field to a particular value.
+     *
+     * @param finished The new finished value.
+     */
+    public final void forceFinished(boolean finished) {
+        mFinished = finished;
+    }
+
+    /**
+     * Returns how long the scroll event will take, in milliseconds.
+     *
+     * @return The duration of the scroll in milliseconds.
+     */
+    public final int getDuration() {
+        return mDuration;
+    }
+
+    /**
+     * Returns the current X offset in the scroll.
+     *
+     * @return The new X offset as an absolute distance from the origin.
+     */
+    public final int getCurrX() {
+        return mCurrX;
+    }
+
+    /**
+     * Returns the current Y offset in the scroll.
+     *
+     * @return The new Y offset as an absolute distance from the origin.
+     */
+    public final int getCurrY() {
+        return mCurrY;
+    }
+
+    /**
+     * Returns the current velocity.
+     *
+     * @return The original velocity less the deceleration. Result may be
+     * negative.
+     */
+    public float getCurrVelocity() {
+        return mMode == FLING_MODE ?
+                mCurrVelocity : mVelocity - mDeceleration * timePassed() / 2000.0f;
+    }
+
+    /**
+     * Returns the start X offset in the scroll.
+     *
+     * @return The start X offset as an absolute distance from the origin.
+     */
+    public final int getStartX() {
+        return mStartX;
+    }
+
+    /**
+     * Returns the start Y offset in the scroll.
+     *
+     * @return The start Y offset as an absolute distance from the origin.
+     */
+    public final int getStartY() {
+        return mStartY;
+    }
+
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     *
+     * @return The final X offset as an absolute distance from the origin.
+     */
+    public final int getFinalX() {
+        return mFinalX;
+    }
+
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     *
+     * @return The final Y offset as an absolute distance from the origin.
+     */
+    public final int getFinalY() {
+        return mFinalY;
+    }
+
+    /**
+     * Call this when you want to know the new location.  If it returns true,
+     * the animation is not yet finished.
+     */
+    public boolean computeScrollOffset() {
+        if (mFinished) {
+            return false;
+        }
+
+        int timePassed = (int)(AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+
+        if (timePassed < mDuration) {
+            switch (mMode) {
+            case SCROLL_MODE:
+                float x = timePassed * mDurationReciprocal;
+
+                if (mInterpolator == null)
+                    x = viscousFluid(x);
+                else
+                    x = mInterpolator.getInterpolation(x);
+
+                mCurrX = mStartX + Math.round(x * mDeltaX);
+                mCurrY = mStartY + Math.round(x * mDeltaY);
+                break;
+            case FLING_MODE:
+                final float t = (float) timePassed / mDuration;
+                final int index = (int) (NB_SAMPLES * t);
+                float distanceCoef = 1.f;
+                float velocityCoef = 0.f;
+                if (index < NB_SAMPLES) {
+                    final float t_inf = (float) index / NB_SAMPLES;
+                    final float t_sup = (float) (index + 1) / NB_SAMPLES;
+                    final float d_inf = SPLINE_POSITION[index];
+                    final float d_sup = SPLINE_POSITION[index + 1];
+                    velocityCoef = (d_sup - d_inf) / (t_sup - t_inf);
+                    distanceCoef = d_inf + (t - t_inf) * velocityCoef;
+                }
+
+                mCurrVelocity = velocityCoef * mDistance / mDuration * 1000.0f;
+
+                mCurrX = mStartX + Math.round(distanceCoef * (mFinalX - mStartX));
+                // Pin to mMinX <= mCurrX <= mMaxX
+                mCurrX = Math.min(mCurrX, mMaxX);
+                mCurrX = Math.max(mCurrX, mMinX);
+
+                mCurrY = mStartY + Math.round(distanceCoef * (mFinalY - mStartY));
+                // Pin to mMinY <= mCurrY <= mMaxY
+                mCurrY = Math.min(mCurrY, mMaxY);
+                mCurrY = Math.max(mCurrY, mMinY);
+
+                if (mCurrX == mFinalX && mCurrY == mFinalY) {
+                    mFinished = true;
+                }
+
+                break;
+            }
+        }
+        else {
+            mCurrX = mFinalX;
+            mCurrY = mFinalY;
+            mFinished = true;
+        }
+        return true;
+    }
+
+    /**
+     * Start scrolling by providing a starting point and the distance to travel.
+     * The scroll will use the default value of 250 milliseconds for the
+     * duration.
+     *
+     * @param startX Starting horizontal scroll offset in pixels. Positive
+     *        numbers will scroll the content to the left.
+     * @param startY Starting vertical scroll offset in pixels. Positive numbers
+     *        will scroll the content up.
+     * @param dx Horizontal distance to travel. Positive numbers will scroll the
+     *        content to the left.
+     * @param dy Vertical distance to travel. Positive numbers will scroll the
+     *        content up.
+     */
+    public void startScroll(int startX, int startY, int dx, int dy) {
+        startScroll(startX, startY, dx, dy, DEFAULT_DURATION);
+    }
+
+    /**
+     * Start scrolling by providing a starting point, the distance to travel,
+     * and the duration of the scroll.
+     *
+     * @param startX Starting horizontal scroll offset in pixels. Positive
+     *        numbers will scroll the content to the left.
+     * @param startY Starting vertical scroll offset in pixels. Positive numbers
+     *        will scroll the content up.
+     * @param dx Horizontal distance to travel. Positive numbers will scroll the
+     *        content to the left.
+     * @param dy Vertical distance to travel. Positive numbers will scroll the
+     *        content up.
+     * @param duration Duration of the scroll in milliseconds.
+     */
+    public void startScroll(int startX, int startY, int dx, int dy, int duration) {
+        mMode = SCROLL_MODE;
+        mFinished = false;
+        mDuration = duration;
+        mStartTime = AnimationUtils.currentAnimationTimeMillis();
+        mStartX = startX;
+        mStartY = startY;
+        mFinalX = startX + dx;
+        mFinalY = startY + dy;
+        mDeltaX = dx;
+        mDeltaY = dy;
+        mDurationReciprocal = 1.0f / (float) mDuration;
+    }
+
+    /**
+     * Start scrolling based on a fling gesture. The distance travelled will
+     * depend on the initial velocity of the fling.
+     *
+     * @param startX Starting point of the scroll (X)
+     * @param startY Starting point of the scroll (Y)
+     * @param velocityX Initial velocity of the fling (X) measured in pixels per
+     *        second.
+     * @param velocityY Initial velocity of the fling (Y) measured in pixels per
+     *        second
+     * @param minX Minimum X value. The scroller will not scroll past this
+     *        point.
+     * @param maxX Maximum X value. The scroller will not scroll past this
+     *        point.
+     * @param minY Minimum Y value. The scroller will not scroll past this
+     *        point.
+     * @param maxY Maximum Y value. The scroller will not scroll past this
+     *        point.
+     */
+    public void fling(int startX, int startY, int velocityX, int velocityY,
+            int minX, int maxX, int minY, int maxY) {
+        // Continue a scroll or fling in progress
+        if (mFlywheel && !mFinished) {
+            float oldVel = getCurrVelocity();
+
+            float dx = (float) (mFinalX - mStartX);
+            float dy = (float) (mFinalY - mStartY);
+            float hyp = FloatMath.sqrt(dx * dx + dy * dy);
+
+            float ndx = dx / hyp;
+            float ndy = dy / hyp;
+
+            float oldVelocityX = ndx * oldVel;
+            float oldVelocityY = ndy * oldVel;
+            if (Math.signum(velocityX) == Math.signum(oldVelocityX) &&
+                    Math.signum(velocityY) == Math.signum(oldVelocityY)) {
+                velocityX += oldVelocityX;
+                velocityY += oldVelocityY;
+            }
+        }
+
+        mMode = FLING_MODE;
+        mFinished = false;
+
+        float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY);
+
+        mVelocity = velocity;
+        mDuration = getSplineFlingDuration(velocity);
+        mStartTime = AnimationUtils.currentAnimationTimeMillis();
+        mStartX = startX;
+        mStartY = startY;
+
+        float coeffX = velocity == 0 ? 1.0f : velocityX / velocity;
+        float coeffY = velocity == 0 ? 1.0f : velocityY / velocity;
+
+        double totalDistance = getSplineFlingDistance(velocity);
+        mDistance = (int) (totalDistance * Math.signum(velocity));
+
+        mMinX = minX;
+        mMaxX = maxX;
+        mMinY = minY;
+        mMaxY = maxY;
+
+        mFinalX = startX + (int) Math.round(totalDistance * coeffX);
+        // Pin to mMinX <= mFinalX <= mMaxX
+        mFinalX = Math.min(mFinalX, mMaxX);
+        mFinalX = Math.max(mFinalX, mMinX);
+
+        mFinalY = startY + (int) Math.round(totalDistance * coeffY);
+        // Pin to mMinY <= mFinalY <= mMaxY
+        mFinalY = Math.min(mFinalY, mMaxY);
+        mFinalY = Math.max(mFinalY, mMinY);
+    }
+
+    private double getSplineDeceleration(float velocity) {
+        return Math.log(INFLEXION * Math.abs(velocity) / (mFlingFriction * mPhysicalCoeff));
+    }
+
+    private int getSplineFlingDuration(float velocity) {
+        final double l = getSplineDeceleration(velocity);
+        final double decelMinusOne = DECELERATION_RATE - 1.0;
+        return (int) (1000.0 * Math.exp(l / decelMinusOne));
+    }
+
+    private double getSplineFlingDistance(float velocity) {
+        final double l = getSplineDeceleration(velocity);
+        final double decelMinusOne = DECELERATION_RATE - 1.0;
+        return mFlingFriction * mPhysicalCoeff * Math.exp(DECELERATION_RATE / decelMinusOne * l);
+    }
+
+    static float viscousFluid(float x)
+    {
+        x *= sViscousFluidScale;
+        if (x < 1.0f) {
+            x -= (1.0f - (float)Math.exp(-x));
+        } else {
+            float start = 0.36787944117f;   // 1/e == exp(-1)
+            x = 1.0f - (float)Math.exp(1.0f - x);
+            x = start + x * (1.0f - start);
+        }
+        x *= sViscousFluidNormalize;
+        return x;
+    }
+
+    /**
+     * Stops the animation. Contrary to {@link #forceFinished(boolean)},
+     * aborting the animating cause the scroller to move to the final x and y
+     * position
+     *
+     * @see #forceFinished(boolean)
+     */
+    public void abortAnimation() {
+        mCurrX = mFinalX;
+        mCurrY = mFinalY;
+        mFinished = true;
+    }
+
+    /**
+     * Extend the scroll animation. This allows a running animation to scroll
+     * further and longer, when used with {@link #setFinalX(int)} or {@link #setFinalY(int)}.
+     *
+     * @param extend Additional time to scroll in milliseconds.
+     * @see #setFinalX(int)
+     * @see #setFinalY(int)
+     */
+    public void extendDuration(int extend) {
+        int passed = timePassed();
+        mDuration = passed + extend;
+        mDurationReciprocal = 1.0f / mDuration;
+        mFinished = false;
+    }
+
+    /**
+     * Returns the time elapsed since the beginning of the scrolling.
+     *
+     * @return The elapsed time in milliseconds.
+     */
+    public int timePassed() {
+        return (int)(AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+    }
+
+    /**
+     * Sets the final position (X) for this scroller.
+     *
+     * @param newX The new X offset as an absolute distance from the origin.
+     * @see #extendDuration(int)
+     * @see #setFinalY(int)
+     */
+    public void setFinalX(int newX) {
+        mFinalX = newX;
+        mDeltaX = mFinalX - mStartX;
+        mFinished = false;
+    }
+
+    /**
+     * Sets the final position (Y) for this scroller.
+     *
+     * @param newY The new Y offset as an absolute distance from the origin.
+     * @see #extendDuration(int)
+     * @see #setFinalX(int)
+     */
+    public void setFinalY(int newY) {
+        mFinalY = newY;
+        mDeltaY = mFinalY - mStartY;
+        mFinished = false;
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isScrollingInDirection(float xvel, float yvel) {
+        return !mFinished && Math.signum(xvel) == Math.signum(mFinalX - mStartX) &&
+                Math.signum(yvel) == Math.signum(mFinalY - mStartY);
+    }
+}
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 3eecedbccf..c854498099 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -122,7 +122,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
     protected int mNextPage = INVALID_PAGE;
     protected int mMaxScrollX;
-    protected Scroller mScroller;
+    protected LauncherScroller mScroller;
+    private Interpolator mDefaultInterpolator;
     private VelocityTracker mVelocityTracker;
     private int mPageSpacing = 0;
 
@@ -310,7 +311,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
     protected void init() {
         mDirtyPageContent = new ArrayList<Boolean>();
         mDirtyPageContent.ensureCapacity(32);
-        mScroller = new Scroller(getContext(), new ScrollInterpolator());
+        mScroller = new LauncherScroller(getContext());
+        setDefaultInterpolator(new ScrollInterpolator());
         mCurrentPage = 0;
         mCenterPagesVertically = true;
 
@@ -330,6 +332,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         setOnHierarchyChangeListener(this);
     }
 
+    protected void setDefaultInterpolator(Interpolator interpolator) {
+        mDefaultInterpolator = interpolator;
+        mScroller.setInterpolator(mDefaultInterpolator);
+    }
+
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
 
@@ -1625,11 +1632,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
     }
 
     protected void enableFreeScroll() {
-        setEnableFreeScroll(true, -1);
+        setEnableFreeScroll(true);
     }
 
-    protected void disableFreeScroll(int snapPage) {
-        setEnableFreeScroll(false, snapPage);
+    protected void disableFreeScroll() {
+        setEnableFreeScroll(false);
     }
 
     void updateFreescrollBounds() {
@@ -1643,16 +1650,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         }
     }
 
-    private void setEnableFreeScroll(boolean freeScroll, int snapPage) {
+    private void setEnableFreeScroll(boolean freeScroll) {
         mFreeScroll = freeScroll;
 
-        if (snapPage == -1) {
-            snapPage = getPageNearestToCenterOfScreen();
-        }
-
-        if (!mFreeScroll) {
-            snapToPage(snapPage);
-        } else {
+        if (mFreeScroll) {
             updateFreescrollBounds();
             getOverviewModePages(mTempVisiblePagesRange);
             if (getCurrentPage() < mTempVisiblePagesRange[0]) {
@@ -1910,6 +1911,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
                     int vX = (int) (-velocityX * scaleX);
                     int initialScrollX = (int) (getScrollX() * scaleX);
 
+                    mScroller.setInterpolator(mDefaultInterpolator);
                     mScroller.fling(initialScrollX,
                             getScrollY(), vX, 0, Integer.MIN_VALUE, Integer.MAX_VALUE, 0, 0);
                     invalidate();
@@ -2176,27 +2178,33 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
     }
 
     protected void snapToPageImmediately(int whichPage) {
-        snapToPage(whichPage, PAGE_SNAP_ANIMATION_DURATION, true);
+        snapToPage(whichPage, PAGE_SNAP_ANIMATION_DURATION, true, null);
     }
 
     protected void snapToPage(int whichPage, int duration) {
-        snapToPage(whichPage, duration, false);
+        snapToPage(whichPage, duration, false, null);
     }
 
-    protected void snapToPage(int whichPage, int duration, boolean immediate) {
+    protected void snapToPage(int whichPage, int duration, TimeInterpolator interpolator) {
+        snapToPage(whichPage, duration, false, interpolator);
+    }
+
+    protected void snapToPage(int whichPage, int duration, boolean immediate,
+            TimeInterpolator interpolator) {
         whichPage = Math.max(0, Math.min(whichPage, getPageCount() - 1));
 
         int newX = getScrollForPage(whichPage);
         final int sX = mUnboundedScrollX;
         final int delta = newX - sX;
-        snapToPage(whichPage, delta, duration, immediate);
+        snapToPage(whichPage, delta, duration, immediate, interpolator);
     }
 
     protected void snapToPage(int whichPage, int delta, int duration) {
-        snapToPage(whichPage, delta, duration, false);
+        snapToPage(whichPage, delta, duration, false, null);
     }
 
-    protected void snapToPage(int whichPage, int delta, int duration, boolean immediate) {
+    protected void snapToPage(int whichPage, int delta, int duration, boolean immediate,
+            TimeInterpolator interpolator) {
         mNextPage = whichPage;
         View focusedChild = getFocusedChild();
         if (focusedChild != null && whichPage != mCurrentPage &&
@@ -2215,8 +2223,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         }
 
         if (!mScroller.isFinished()) {
-            mScroller.abortAnimation();
+            abortScrollerAnimation(false);
         }
+
+        if (interpolator != null) {
+            mScroller.setInterpolator(interpolator);
+        } else {
+            mScroller.setInterpolator(mDefaultInterpolator);
+        }
+
         mScroller.startScroll(mUnboundedScrollX, 0, delta, 0, duration);
 
         notifyPageSwitchListener();
@@ -2472,7 +2487,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
             mDragView = getChildAt(dragViewIndex);
             mDragView.animate().scaleX(1.15f).scaleY(1.15f).setDuration(100).start();
             mDragViewBaselineLeft = mDragView.getLeft();
-            disableFreeScroll(-1);
+            snapToPage(getPageNearestToCenterOfScreen());
+            disableFreeScroll();
             onStartReordering();
             return true;
         }
diff --git a/src/com/android/launcher3/RampUpScroller.java b/src/com/android/launcher3/RampUpScroller.java
deleted file mode 100644
index 89eb5798e6..0000000000
--- a/src/com/android/launcher3/RampUpScroller.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2013 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
- *
- *      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
- * limitations under the License.
- */
-
-package com.android.launcher3;
-
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-
-/**
- * Scroller that gradually reaches a target velocity.
- */
-class RampUpScroller {
-    private final Interpolator mInterpolator;
-    private final long mRampUpTime;
-
-    private long mStartTime;
-    private long mDeltaTime;
-    private float mTargetVelocityX;
-    private float mTargetVelocityY;
-    private int mDeltaX;
-    private int mDeltaY;
-
-    /**
-     * Creates a new ramp-up scroller that reaches full velocity after a
-     * specified duration.
-     *
-     * @param rampUpTime Duration before the scroller reaches target velocity.
-     */
-    public RampUpScroller(long rampUpTime) {
-        mInterpolator = new AccelerateInterpolator();
-        mRampUpTime = rampUpTime;
-    }
-
-    /**
-     * Starts the scroller at the current animation time.
-     */
-    public void start() {
-        mStartTime = AnimationUtils.currentAnimationTimeMillis();
-        mDeltaTime = mStartTime;
-    }
-
-    /**
-     * Computes the current scroll deltas. This usually only be called after
-     * starting the scroller with {@link #start()}.
-     *
-     * @see #getDeltaX()
-     * @see #getDeltaY()
-     */
-    public void computeScrollDelta() {
-        final long currentTime = AnimationUtils.currentAnimationTimeMillis();
-        final long elapsedSinceStart = currentTime - mStartTime;
-        final float scale;
-        if (elapsedSinceStart < mRampUpTime) {
-            scale = mInterpolator.getInterpolation((float) elapsedSinceStart / mRampUpTime);
-        } else {
-            scale = 1f;
-        }
-
-        final long elapsedSinceDelta = currentTime - mDeltaTime;
-        mDeltaTime = currentTime;
-
-        mDeltaX = (int) (elapsedSinceDelta * scale * mTargetVelocityX);
-        mDeltaY = (int) (elapsedSinceDelta * scale * mTargetVelocityY);
-    }
-
-    /**
-     * Sets the target velocity for this scroller.
-     *
-     * @param x The target X velocity in pixels per millisecond.
-     * @param y The target Y velocity in pixels per millisecond.
-     */
-    public void setTargetVelocity(float x, float y) {
-        mTargetVelocityX = x;
-        mTargetVelocityY = y;
-    }
-
-    /**
-     * @return The target X velocity for this scroller.
-     */
-    public float getTargetVelocityX() {
-        return mTargetVelocityX;
-    }
-
-    /**
-     * @return The target Y velocity for this scroller.
-     */
-    public float getTargetVelocityY() {
-        return mTargetVelocityY;
-    }
-
-    /**
-     * The distance traveled in the X-coordinate computed by the last call to
-     * {@link #computeScrollDelta()}.
-     */
-    public int getDeltaX() {
-        return mDeltaX;
-    }
-
-    /**
-     * The distance traveled in the Y-coordinate computed by the last call to
-     * {@link #computeScrollDelta()}.
-     */
-    public int getDeltaY() {
-        return mDeltaY;
-    }
-}
diff --git a/src/com/android/launcher3/SmoothPagedView.java b/src/com/android/launcher3/SmoothPagedView.java
index 64dcb34caa..4e331aa2c8 100644
--- a/src/com/android/launcher3/SmoothPagedView.java
+++ b/src/com/android/launcher3/SmoothPagedView.java
@@ -19,7 +19,6 @@ package com.android.launcher3;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.animation.Interpolator;
-import android.widget.Scroller;
 
 public abstract class SmoothPagedView extends PagedView {
     private static final float SMOOTHING_SPEED = 0.75f;
@@ -100,7 +99,7 @@ public abstract class SmoothPagedView extends PagedView {
             mBaseLineFlingVelocity = 2500.0f;
             mFlingVelocityInfluence = 0.4f;
             mScrollInterpolator = new OvershootInterpolator();
-            mScroller = new Scroller(getContext(), mScrollInterpolator);
+            setDefaultInterpolator(mScrollInterpolator);
         }
     }
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9b17fcd9e7..8602606fe9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2108,11 +2108,12 @@ public class Workspace extends SmoothPagedView
         mNewScale = 1.0f;
 
         if (oldStateIsOverview) {
-            disableFreeScroll(snapPage);
+            disableFreeScroll();
         } else if (stateIsOverview) {
             enableFreeScroll();
         }
 
+
         if (state != State.NORMAL) {
             if (stateIsSpringLoaded) {
                 mNewScale = mSpringLoadedShrinkFactor;
@@ -2135,16 +2136,20 @@ public class Workspace extends SmoothPagedView
             duration = getResources().getInteger(R.integer.config_appsCustomizeWorkspaceShrinkTime);
         }
 
+        if (snapPage == -1) {
+            snapPage = getPageNearestToCenterOfScreen();
+        }
+        snapToPage(snapPage, duration, mZoomInInterpolator);
+
         for (int i = 0; i < getChildCount(); i++) {
             final CellLayout cl = (CellLayout) getChildAt(i);
-            boolean isCurrentPage = (i == getNextPage());
+            boolean isCurrentPage = (i == snapPage);
             float initialAlpha = cl.getShortcutsAndWidgets().getAlpha();
             float finalAlpha;
             if (stateIsSmall) {
                 finalAlpha = 0f;
             } else if (stateIsNormal && mWorkspaceFadeInAdjacentScreens) {
-
-                finalAlpha = (i == getNextPage() || i < numCustomPages()) ? 1f : 0f;
+                finalAlpha = (i == snapPage || i < numCustomPages()) ? 1f : 0f;
             } else {
                 finalAlpha = 1f;
             }

From a765215280ef9e128da3fbab37b3d51a565941e3 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 18 Nov 2013 20:06:55 +0000
Subject: [PATCH 022/147] Allowing ability to pick up items / enter overview
 before full page settle

-> Fixes issue 11701996
-> Fixes issue where if you tried to longpress a widget before the page
   settled, it would instead enter overview

Change-Id: Ic6321805687dd5e8c69506c6cd6941a11d557ed6
---
 src/com/android/launcher3/PagedView.java | 11 +++--------
 src/com/android/launcher3/Workspace.java |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index c854498099..370c629a36 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -153,7 +153,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
     protected int mTouchState = TOUCH_STATE_REST;
     protected boolean mForceScreenScrolled = false;
-    private boolean mScrollAbortedFromIntercept = false;
 
 
     protected OnLongClickListener mLongClickListener;
@@ -1392,13 +1391,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
                  * being flinged.
                  */
                 final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX());
-                final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop);
+                final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop / 3);
 
                 if (finishedScrolling) {
                     mTouchState = TOUCH_STATE_REST;
                     if (!mScroller.isFinished()) {
-                        mScrollAbortedFromIntercept = true;
-                        abortScrollerAnimation(false);
+                        setCurrentPage(getNextPage());
+                        pageEndMoving();
                     }
                 } else {
                     if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) {
@@ -1426,9 +1425,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
-                if (mScrollAbortedFromIntercept) {
-                    snapToDestination();
-                }
                 resetTouchState();
                 break;
 
@@ -1997,7 +1993,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         releaseVelocityTracker();
         endReordering();
         mCancelTap = false;
-        mScrollAbortedFromIntercept = false;
         mTouchState = TOUCH_STATE_REST;
         mActivePointerId = INVALID_POINTER;
     }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8602606fe9..4d72852ea3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2113,7 +2113,6 @@ public class Workspace extends SmoothPagedView
             enableFreeScroll();
         }
 
-
         if (state != State.NORMAL) {
             if (stateIsSpringLoaded) {
                 mNewScale = mSpringLoadedShrinkFactor;

From 268f1c563f4179ee2fb6c87b662679451e23a7c8 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 18 Nov 2013 14:04:41 -0800
Subject: [PATCH 023/147] Initialize FastBitmapDrawable bounds with default
 bitmap dimensions.

Change-Id: Ida9603e35b242a581b9401c6440875cd511725a1
---
 src/com/android/launcher3/FastBitmapDrawable.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 83be143695..85e90202b3 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -32,6 +32,7 @@ class FastBitmapDrawable extends Drawable {
     FastBitmapDrawable(Bitmap b) {
         mAlpha = 255;
         mBitmap = b;
+        setBounds(0, 0, b.getWidth(), b.getHeight());
     }
 
     @Override

From f0716b7a7475fc80a97fd6f95efecab570d186fb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 18 Nov 2013 16:09:54 -0800
Subject: [PATCH 024/147] Update the database when converting the final screen.
 (Bug 11683562, Bug 11034205)

---
 src/com/android/launcher3/Workspace.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6c58a375be..f8db240e04 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -690,7 +690,8 @@ public class Workspace extends SmoothPagedView
             mWorkspaceScreens.put(EXTRA_EMPTY_SCREEN_ID, finalScreen);
             mScreenOrder.add(EXTRA_EMPTY_SCREEN_ID);
 
-            // XXX: Do we need to update LM workspace screens here?
+            // Update the model if we have changed any screens
+            mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
             Launcher.addDumpLog(TAG, "11683562 -   extra empty screen: " + finalScreenId, true);
         }
     }

From f0b8dacf1516e0d901c71109c906dc15ef855fc5 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 19 Nov 2013 12:21:25 -0500
Subject: [PATCH 025/147] Disable importing workspaces from Launcher2.

Bug: 9832552
Bug: 11761032
Change-Id: I4dfd16046e9d6d0d1d864dff4340b0ed13cc8b8f
---
 src/com/android/launcher3/LauncherModel.java  |  2 +
 .../android/launcher3/LauncherProvider.java   | 55 +++++++++++--------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c3d4666447..6a6cb35383 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1636,7 +1636,9 @@ public class LauncherModel extends BroadcastReceiver {
             LauncherAppState.getLauncherProvider().loadDefaultFavoritesIfNecessary(0);
 
             // Check if we need to do any upgrade-path logic
+            // (Includes having just imported default favorites)
             boolean loadedOldDb = LauncherAppState.getLauncherProvider().justLoadedOldDb();
+
             // Log to disk
             Launcher.addDumpLog(TAG, "11683562 -   loadedOldDb: " + loadedOldDb, true);
 
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index b5db3386f8..4eb30e746f 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -71,6 +71,9 @@ public class LauncherProvider extends ContentProvider {
     static final String OLD_AUTHORITY = "com.android.launcher2.settings";
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
+    // Should we attempt to load anything from the com.android.launcher2 provider?
+    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
+
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";
     static final String PARAMETER_NOTIFY = "notify";
@@ -366,32 +369,38 @@ public class LauncherProvider extends ContentProvider {
                 sendAppWidgetResetNotify();
             }
 
-            // Try converting the old database
-            ContentValuesCallback permuteScreensCb = new ContentValuesCallback() {
-                public void onRow(ContentValues values) {
-                    int container = values.getAsInteger(LauncherSettings.Favorites.CONTAINER);
-                    if (container == Favorites.CONTAINER_DESKTOP) {
-                        int screen = values.getAsInteger(LauncherSettings.Favorites.SCREEN);
-                        screen = (int) upgradeLauncherDb_permuteScreens(screen);
-                        values.put(LauncherSettings.Favorites.SCREEN, screen);
+            if (IMPORT_LAUNCHER2_DATABASE) {
+                // Try converting the old database
+                ContentValuesCallback permuteScreensCb = new ContentValuesCallback() {
+                    public void onRow(ContentValues values) {
+                        int container = values.getAsInteger(LauncherSettings.Favorites.CONTAINER);
+                        if (container == Favorites.CONTAINER_DESKTOP) {
+                            int screen = values.getAsInteger(LauncherSettings.Favorites.SCREEN);
+                            screen = (int) upgradeLauncherDb_permuteScreens(screen);
+                            values.put(LauncherSettings.Favorites.SCREEN, screen);
+                        }
+                    }
+                };
+                Uri uri = Uri.parse("content://" + Settings.AUTHORITY +
+                        "/old_favorites?notify=true");
+                if (!convertDatabase(db, uri, permuteScreensCb, true)) {
+                    // Try and upgrade from the Launcher2 db
+                    uri = LauncherSettings.Favorites.OLD_CONTENT_URI;
+                    if (!convertDatabase(db, uri, permuteScreensCb, false)) {
+                        // If we fail, then set a flag to load the default workspace
+                        setFlagEmptyDbCreated();
+                        return;
                     }
                 }
-            };
-            Uri uri = Uri.parse("content://" + Settings.AUTHORITY +
-                    "/old_favorites?notify=true");
-            if (!convertDatabase(db, uri, permuteScreensCb, true)) {
-                // Try and upgrade from the Launcher2 db
-                uri = LauncherSettings.Favorites.OLD_CONTENT_URI;
-                if (!convertDatabase(db, uri, permuteScreensCb, false)) {
-                    // If we fail, then set a flag to load the default workspace
-                    setFlagEmptyDbCreated();
-                    return;
-                }
+                // Right now, in non-default workspace cases, we want to run the final
+                // upgrade code (ie. to fix workspace screen indices -> ids, etc.), so
+                // set that flag too.
+                setFlagJustLoadedOldDb();
+            } else {
+                // Fresh and clean launcher DB.
+                mMaxItemId = initializeMaxItemId(db);
+                setFlagEmptyDbCreated();
             }
-            // Right now, in non-default workspace cases, we want to run the final
-            // upgrade code (ie. to fix workspace screen indices -> ids, etc.), so
-            // set that flag too.
-            setFlagJustLoadedOldDb();
         }
 
         private void addWorkspacesTable(SQLiteDatabase db) {

From 2c130e1f293c67275d78c862e3240a47fea0e2e7 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 19 Nov 2013 15:10:12 -0800
Subject: [PATCH 026/147] Reducing workspace grid for dogfooding.

---
 src/com/android/launcher3/DynamicGrid.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 42aa20d7df..ce7855362a 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -74,10 +74,10 @@ public class DynamicGrid {
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",
-                575, 904,  6, 6,  72, 14.4f,  7, 60));
+                575, 904,  5, 5,  72, 14.4f,  7, 60));
         // Larger tablet profiles always have system bars on the top & bottom
         deviceProfiles.add(new DeviceProfile("Nexus 10",
-                727, 1207,  5, 8,  80, 14.4f,  9, 64));
+                727, 1207,  5, 5,  80, 14.4f,  7, 64));
         /*
         deviceProfiles.add(new DeviceProfile("Nexus 7",
                 600, 960,  5, 5,  72, 14.4f,  5, 60));

From 72fbec17e09a1120971621587d5005f683baafd1 Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Tue, 19 Nov 2013 15:45:07 +0000
Subject: [PATCH 027/147] Add support for initiating a drag from an overlay.

This allows an overlay to create apps and shortcuts on the home screen.

Change-Id: I63ee4ef02db3f4bc89726c394fd55ad26f50452c
---
 src/com/android/launcher3/ItemInfo.java     |  2 +-
 src/com/android/launcher3/Launcher.java     | 20 ++++++++++++++++++++
 src/com/android/launcher3/ShortcutInfo.java |  9 ++++++++-
 src/com/android/launcher3/Utilities.java    |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
index 8c4cefd5f2..36ba6c14f1 100644
--- a/src/com/android/launcher3/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -27,7 +27,7 @@ import java.io.IOException;
 /**
  * Represents an item in the launcher.
  */
-class ItemInfo {
+public class ItemInfo {
     
     static final int NO_ID = -1;
     
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7d84a3c88f..ba3ba93275 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -45,6 +45,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
@@ -4502,6 +4503,25 @@ public class Launcher extends Activity
                 DISMISS_CLING_DURATION, true);
     }
 
+    public ItemInfo createAppDragInfo(Intent appLaunchIntent) {
+        ResolveInfo ri = getPackageManager().resolveActivity(appLaunchIntent, 0);
+        if (ri == null) {
+            return null;
+        }
+        return new AppInfo(getPackageManager(), ri, mIconCache, null);
+    }
+
+    public ItemInfo createShortcutDragInfo(Intent shortcutIntent, CharSequence caption,
+            Bitmap icon) {
+        return new ShortcutInfo(shortcutIntent, caption, icon);
+    }
+
+    public void startDrag(View dragView, ItemInfo dragInfo, DragSource source) {
+        dragView.setTag(dragInfo);
+        mWorkspace.onDragStartedWithItem(dragView);
+        mWorkspace.beginDragShared(dragView, source);
+    }
+
     /**
      * Prints out out state for debugging.
      */
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index dafabb8d90..fc087a897b 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -71,7 +71,14 @@ class ShortcutInfo extends ItemInfo {
     protected Intent getIntent() {
         return intent;
     }
-    
+
+    ShortcutInfo(Intent intent, CharSequence title, Bitmap icon) {
+        this();
+        this.intent = intent;
+        this.title = title;
+        mIcon = icon;
+    }
+
     public ShortcutInfo(Context context, ShortcutInfo info) {
         super(info);
         title = info.title.toString();
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 21c546d04e..9ffd044b49 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -43,7 +43,7 @@ import java.util.ArrayList;
 /**
  * Various utilities shared amongst the Launcher's classes.
  */
-final class Utilities {
+public final class Utilities {
     private static final String TAG = "Launcher.Utilities";
 
     private static int sIconWidth = -1;
@@ -111,7 +111,7 @@ final class Utilities {
     /**
      * Returns a bitmap suitable for the all apps view.
      */
-    static Bitmap createIconBitmap(Drawable icon, Context context) {
+    public static Bitmap createIconBitmap(Drawable icon, Context context) {
         synchronized (sCanvas) { // we share the statics :-(
             if (sIconWidth == -1) {
                 initStatics(context);

From 5b3bdd394e4401d7e91d528ef1d424d1af271d97 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Thu, 21 Nov 2013 08:29:51 -0500
Subject: [PATCH 028/147] Enable Launcher2 workspace import.

Bug: 11800663
Change-Id: I5c8963bde69e667bf726d1f926a913c347294e16
---
 src/com/android/launcher3/LauncherProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 4eb30e746f..dbc1b1ce15 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -72,7 +72,7 @@ public class LauncherProvider extends ContentProvider {
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
     // Should we attempt to load anything from the com.android.launcher2 provider?
-    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
+    static final boolean IMPORT_LAUNCHER2_DATABASE = true;
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";

From 853f5a46ebef0161737f5ddb7f63f43c5d7a99d5 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 25 Nov 2013 14:32:21 +0100
Subject: [PATCH 029/147] Making workspace->overview transition smoother

- Also set interpolator on page indicators
---
 src/com/android/launcher3/Workspace.java | 46 ++++++++++++------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9b17fcd9e7..94cec58946 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -31,7 +31,6 @@ import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -55,10 +54,7 @@ import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.TextView;
@@ -2176,6 +2172,7 @@ public class Workspace extends SmoothPagedView
         final View searchBar = mLauncher.getQsbBar();
         final View overviewPanel = mLauncher.getOverviewPanel();
         final View hotseat = mLauncher.getHotseat();
+        final View pageIndicator = getPageIndicator();
         if (animated) {
             anim.setDuration(duration);
             LauncherViewPropertyAnimator scale = new LauncherViewPropertyAnimator(this);
@@ -2215,31 +2212,36 @@ public class Workspace extends SmoothPagedView
                     }
                 }
             }
-            ObjectAnimator pageIndicatorAlpha = null;
-            if (getPageIndicator() != null) {
-                pageIndicatorAlpha = ObjectAnimator.ofFloat(getPageIndicator(), "alpha",
-                        finalHotseatAndPageIndicatorAlpha);
+            Animator pageIndicatorAlpha = null;
+            if (pageIndicator != null) {
+                pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator)
+                    .alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
+            } else {
+                // create a dummy animation so we don't need to do null checks later
+                pageIndicatorAlpha = ValueAnimator.ofFloat(0, 0);
             }
-            ObjectAnimator hotseatAlpha = ObjectAnimator.ofFloat(hotseat, "alpha",
-                    finalHotseatAndPageIndicatorAlpha);
-            ObjectAnimator searchBarAlpha = ObjectAnimator.ofFloat(searchBar,
-                    "alpha", finalSearchBarAlpha);
-            ObjectAnimator overviewPanelAlpha = ObjectAnimator.ofFloat(overviewPanel,
-                    "alpha", finalOverviewPanelAlpha);
+            Animator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat)
+                .alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
+            Animator searchBarAlpha = new LauncherViewPropertyAnimator(searchBar)
+                .alpha(finalSearchBarAlpha).withLayer();
+            Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel)
+                .alpha(finalOverviewPanelAlpha).withLayer();
 
-            overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel));
+            pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
             hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
             searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
+            overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel));
 
             if (workspaceToOverview) {
+                pageIndicatorAlpha.setInterpolator(new DecelerateInterpolator(2));
                 hotseatAlpha.setInterpolator(new DecelerateInterpolator(2));
+                overviewPanelAlpha.setInterpolator(null);
             } else if (overviewToWorkspace) {
+                pageIndicatorAlpha.setInterpolator(null);
+                hotseatAlpha.setInterpolator(null);
                 overviewPanelAlpha.setInterpolator(new DecelerateInterpolator(2));
             }
-
-            if (getPageIndicator() != null) {
-                pageIndicatorAlpha.addListener(new AlphaUpdateListener(getPageIndicator()));
-            }
+            searchBarAlpha.setInterpolator(null);
 
             anim.play(overviewPanelAlpha);
             anim.play(hotseatAlpha);
@@ -2251,9 +2253,9 @@ public class Workspace extends SmoothPagedView
             AlphaUpdateListener.updateVisibility(overviewPanel);
             hotseat.setAlpha(finalHotseatAndPageIndicatorAlpha);
             AlphaUpdateListener.updateVisibility(hotseat);
-            if (getPageIndicator() != null) {
-                getPageIndicator().setAlpha(finalHotseatAndPageIndicatorAlpha);
-                AlphaUpdateListener.updateVisibility(getPageIndicator());
+            if (pageIndicator != null) {
+                pageIndicator.setAlpha(finalHotseatAndPageIndicatorAlpha);
+                AlphaUpdateListener.updateVisibility(pageIndicator);
             }
             searchBar.setAlpha(finalSearchBarAlpha);
             AlphaUpdateListener.updateVisibility(searchBar);

From a6a296ba1ffba6c5b98e92f05254f0317f28290b Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 26 Nov 2013 12:48:01 -0500
Subject: [PATCH 030/147] Revert "Enable Launcher2 workspace import."

This reverts commit 5b3bdd394e4401d7e91d528ef1d424d1af271d97.

Bug: 11768766
Bug: 9832552
---
 src/com/android/launcher3/LauncherProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index dbc1b1ce15..4eb30e746f 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -72,7 +72,7 @@ public class LauncherProvider extends ContentProvider {
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
     // Should we attempt to load anything from the com.android.launcher2 provider?
-    static final boolean IMPORT_LAUNCHER2_DATABASE = true;
+    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";

From 37c717ffa626c6690ea45ba88e5dfc9bea39ed6e Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 26 Nov 2013 11:50:15 -0800
Subject: [PATCH 031/147] Fix NPE in case where workspace is null because
 Launcher has been destroyed

Bug: 11765964
Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
---
 src/com/android/launcher3/Launcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7d84a3c88f..ce6b20e039 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2663,7 +2663,7 @@ public class Launcher extends Activity
     }
 
     public void closeFolder() {
-        Folder folder = mWorkspace.getOpenFolder();
+        Folder folder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;
         if (folder != null) {
             if (folder.isEditingName()) {
                 folder.dismissEditingName();

From d552dd90f1da32e1be2dd95ffed57c65d40cb651 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 26 Nov 2013 12:13:11 -0800
Subject: [PATCH 032/147] Fix NPE in Launcher onDestroy

Bug: 11765296
Change-Id: I83299656cc90b8a744afb0db4b5ea08675c8db82
---
 src/com/android/launcher3/Launcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ce6b20e039..0a630fe648 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1877,7 +1877,7 @@ public class Launcher extends Activity
 
         mDragLayer.clearAllResizeFrames();
         ((ViewGroup) mWorkspace.getParent()).removeAllViews();
-        mWorkspace.removeAllViews();
+        mWorkspace.removeAllWorkspaceScreens();
         mWorkspace = null;
         mDragController = null;
 

From 166ebd4da5d85195bd1f562572f468726ade548f Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 26 Nov 2013 14:55:45 -0800
Subject: [PATCH 033/147] De-parent custom content view before adding to custom
 content screen

Bug: 11666352
Change-Id: Ief35e6e8a16ec0217e0dd27434723ee7a7d5beef
---
 src/com/android/launcher3/Workspace.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b1b50bf5ea..02949e7dd9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -619,6 +619,12 @@ public class Workspace extends SmoothPagedView
         if (customContent instanceof Insettable) {
             ((Insettable)customContent).setInsets(mInsets);
         }
+
+        // Verify that the child is removed from any existing parent.
+        if (customContent.getParent() instanceof ViewGroup) {
+            ViewGroup parent = (ViewGroup) customContent.getParent();
+            parent.removeView(customContent);
+        }
         customScreen.removeAllViews();
         customScreen.addViewToCellLayout(customContent, 0, 0, lp, true);
         mCustomContentDescription = description;

From 6400b84d5594d7b9244e3b118f107033eb8b87a0 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 26 Nov 2013 15:45:38 -0800
Subject: [PATCH 034/147] Update custom content insets when Workspace insets
 are set

-> Not sure if custom content can be added before insets are set,
   so this is just a speculative fix.

Bug: 11875171
Change-Id: Ia8e07f51f527f464262b7ff99e4db245fe5a7906
---
 src/com/android/launcher3/Workspace.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 02949e7dd9..b8af9ad5b6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -334,6 +334,14 @@ public class Workspace extends SmoothPagedView
     @Override
     public void setInsets(Rect insets) {
         mInsets.set(insets);
+
+        CellLayout customScreen = getScreenWithId(CUSTOM_CONTENT_SCREEN_ID);
+        if (customScreen != null) {
+            View customContent = customScreen.getShortcutsAndWidgets().getChildAt(0);
+            if (customContent instanceof Insettable) {
+                ((Insettable) customContent).setInsets(mInsets);
+            }
+        }
     }
 
     // estimate the size of a widget with spans hSpan, vSpan. return MAX_VALUE for each

From d8dbb46468e0a8860468661a6edfb7969bfdf0a7 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 27 Nov 2013 11:55:48 -0800
Subject: [PATCH 035/147] Fix binding problem with no screens (issue 11768766)

Change-Id: I0a296892d4964913f38bf6d7bd2c2b17e1e0e8e0
---
 src/com/android/launcher3/LauncherModel.java | 28 +++++---------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 6a6cb35383..4d9dff93a4 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2041,12 +2041,6 @@ public class LauncherModel extends BroadcastReceiver {
                 }
             }
 
-            // If we aren't filtering on a screen, then the set of items to load is the full set of
-            // items given.
-            if (currentScreenId < 0) {
-                throw new RuntimeException("Unexpected screen id");
-            }
-
             // Order the set of items by their containers first, this allows use to walk through the
             // list sequentially, build up a list of containers that are in the specified screen,
             // as well as all items in those containers.
@@ -2084,11 +2078,6 @@ public class LauncherModel extends BroadcastReceiver {
                 ArrayList<LauncherAppWidgetInfo> appWidgets,
                 ArrayList<LauncherAppWidgetInfo> currentScreenWidgets,
                 ArrayList<LauncherAppWidgetInfo> otherScreenWidgets) {
-            // If we aren't filtering on a screen, then the set of items to load is the full set of
-            // widgets given.
-            if (currentScreenId < 0) {
-                throw new RuntimeException("Unexpected screen id");
-            }
 
             for (LauncherAppWidgetInfo widget : appWidgets) {
                 if (widget == null) continue;
@@ -2107,11 +2096,6 @@ public class LauncherModel extends BroadcastReceiver {
                 HashMap<Long, FolderInfo> folders,
                 HashMap<Long, FolderInfo> currentScreenFolders,
                 HashMap<Long, FolderInfo> otherScreenFolders) {
-            // If we aren't filtering on a screen, then the set of items to load is the full set of
-            // widgets given.
-            if (currentScreenId < 0) {
-                throw new RuntimeException("Unexpected screen id");
-            }
 
             for (long id : folders.keySet()) {
                 ItemInfo info = itemsIdMap.get(id);
@@ -2261,13 +2245,15 @@ public class LauncherModel extends BroadcastReceiver {
             }
 
             final boolean isLoadingSynchronously = (synchronizeBindPage > -1);
-            final int currentScreen = isLoadingSynchronously ? synchronizeBindPage :
+            int currScreen = isLoadingSynchronously ? synchronizeBindPage :
                 oldCallbacks.getCurrentWorkspaceScreen();
-            if (currentScreen >= orderedScreenIds.size()) {
-                Log.w(TAG, "Invalid screen id to synchronously load");
-                return;
+            if (currScreen >= orderedScreenIds.size()) {
+                // There may be no workspace screens (just hotseat items and an empty page).
+                currScreen = -1;
             }
-            final long currentScreenId = orderedScreenIds.get(currentScreen);
+            final int currentScreen = currScreen;
+            final long currentScreenId =
+                    currentScreen < 0 ? -1 : orderedScreenIds.get(currentScreen);
 
             // Load all the items that are on the current page first (and in the process, unbind
             // all the existing workspace items before we call startBinding() below.

From 1eeb3fc9d874d98dfb43883d17efb4202d83d88a Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Mon, 25 Nov 2013 17:01:34 +0000
Subject: [PATCH 036/147] Generalize support for 'App Info', 'Uninstall' and
 'Delete'

This allows other DragSource's to allow this behaviour, instead of it being
tied to specific source types.

Change-Id: I06b7c39b1b34a0ae141245bcc13b6a0873a4c0fd
---
 src/com/android/launcher3/AppsCustomizePagedView.java | 10 ++++++++++
 src/com/android/launcher3/DeleteDropTarget.java       |  9 ++++++---
 src/com/android/launcher3/DragSource.java             | 11 +++++++++++
 src/com/android/launcher3/Folder.java                 | 10 ++++++++++
 src/com/android/launcher3/InfoDropTarget.java         |  6 +-----
 src/com/android/launcher3/Workspace.java              | 10 ++++++++++
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 688ff82aa4..2865bc5d5c 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -915,6 +915,16 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         return true;
     }
 
+    @Override
+    public boolean supportsAppInfoDropTarget() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsDeleteDropTarget() {
+        return false;
+    }
+
     @Override
     public float getIntrinsicIconScaleFactor() {
         LauncherAppState app = LauncherAppState.getInstance();
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 4023dafb65..7e0e5ebd7a 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -95,7 +95,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
     }
 
     private boolean isAllAppsApplication(DragSource source, Object info) {
-        return (source instanceof AppsCustomizePagedView) && (info instanceof AppInfo);
+        return source.supportsAppInfoDropTarget() && (info instanceof AppInfo);
     }
     private boolean isAllAppsWidget(DragSource source, Object info) {
         if (source instanceof AppsCustomizePagedView) {
@@ -175,6 +175,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
         boolean isVisible = true;
         boolean useUninstallLabel = !AppsCustomizePagedView.DISABLE_ALL_APPS &&
                 isAllAppsApplication(source, info);
+        boolean useDeleteLabel = !useUninstallLabel && source.supportsDeleteDropTarget();
 
         // If we are dragging an application from AppsCustomize, only show the control if we can
         // delete the app (it was downloaded), and rename the string to "uninstall" in such a case.
@@ -185,15 +186,17 @@ public class DeleteDropTarget extends ButtonDropTarget {
 
         if (useUninstallLabel) {
             setCompoundDrawablesRelativeWithIntrinsicBounds(mUninstallDrawable, null, null, null);
-        } else {
+        } else if (useDeleteLabel) {
             setCompoundDrawablesRelativeWithIntrinsicBounds(mRemoveDrawable, null, null, null);
+        } else {
+            isVisible = false;
         }
         mCurrentDrawable = (TransitionDrawable) getCurrentDrawable();
 
         mActive = isVisible;
         resetHoverColor();
         ((ViewGroup) getParent()).setVisibility(isVisible ? View.VISIBLE : View.GONE);
-        if (getText().length() > 0) {
+        if (isVisible && getText().length() > 0) {
             setText(useUninstallLabel ? R.string.delete_target_uninstall_label
                 : R.string.delete_target_label);
         }
diff --git a/src/com/android/launcher3/DragSource.java b/src/com/android/launcher3/DragSource.java
index cca9ab1a40..7369eeac2c 100644
--- a/src/com/android/launcher3/DragSource.java
+++ b/src/com/android/launcher3/DragSource.java
@@ -30,6 +30,17 @@ public interface DragSource {
      */
     boolean supportsFlingToDelete();
 
+    /**
+     * @return whether items dragged from this source supports 'App Info'
+     */
+    boolean supportsAppInfoDropTarget();
+
+    /**
+     * @return whether items dragged from this source supports 'Delete' drop target (e.g. to remove
+     * a shortcut.
+     */
+    boolean supportsDeleteDropTarget();
+
     /*
      * @return the scale of the icons over the workspace icon size
      */
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 1d234ff8a1..50e2000926 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -801,6 +801,16 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         return true;
     }
 
+    @Override
+    public boolean supportsAppInfoDropTarget() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsDeleteDropTarget() {
+        return true;
+    }
+
     public void onFlingToDelete(DragObject d, int x, int y, PointF vec) {
         // Do nothing
     }
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
index 2ad43b6fff..374238c49f 100644
--- a/src/com/android/launcher3/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -62,10 +62,6 @@ public class InfoDropTarget extends ButtonDropTarget {
         }
     }
 
-    private boolean isFromAllApps(DragSource source) {
-        return (source instanceof AppsCustomizePagedView);
-    }
-
     @Override
     public boolean acceptDrop(DragObject d) {
         // acceptDrop is called just before onDrop. We do the work here, rather than
@@ -93,7 +89,7 @@ public class InfoDropTarget extends ButtonDropTarget {
         boolean isVisible = true;
 
         // Hide this button unless we are dragging something from AllApps
-        if (!isFromAllApps(source)) {
+        if (!source.supportsAppInfoDropTarget()) {
             isVisible = false;
         }
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 02949e7dd9..4fd57c1b88 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4212,6 +4212,16 @@ public class Workspace extends SmoothPagedView
         return true;
     }
 
+    @Override
+    public boolean supportsAppInfoDropTarget() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsDeleteDropTarget() {
+        return true;
+    }
+
     @Override
     public void onFlingToDelete(DragObject d, int x, int y, PointF vec) {
         // Do nothing

From 6def4f900c8b92f61256bf33a158aba16d9aceee Mon Sep 17 00:00:00 2001
From: Mac Duy Hai <haim@google.com>
Date: Thu, 28 Nov 2013 16:17:33 +0000
Subject: [PATCH 037/147] Add method to retrieve search box bounds.

Change-Id: I67893f00990053415453490034ea7066d9f0f3b6
---
 src/com/android/launcher3/Launcher.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0a630fe648..82d67cc979 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4023,6 +4023,11 @@ public class Launcher extends Activity
                 getDeviceProfile().isVerticalBarLayout();
     }
 
+    protected Rect getSearchBarBounds() {
+        return LauncherAppState.getInstance().getDynamicGrid().
+                getDeviceProfile().getSearchBarBounds();
+    }
+
     @Override
     public void bindSearchablesChanged() {
         boolean searchVisible = updateGlobalSearchIcon();

From d0e4118f2e87f890fb243c47d87dc47fcdd068ee Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Mon, 2 Dec 2013 15:55:50 -0500
Subject: [PATCH 038/147] Revert "Revert "Enable Launcher2 workspace import.""

This reverts commit a6a296ba1ffba6c5b98e92f05254f0317f28290b.

https://memegen.googleplex.com/5476445807706112

Bug: 9832552
---
 src/com/android/launcher3/LauncherProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 4eb30e746f..dbc1b1ce15 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -72,7 +72,7 @@ public class LauncherProvider extends ContentProvider {
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
     // Should we attempt to load anything from the com.android.launcher2 provider?
-    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
+    static final boolean IMPORT_LAUNCHER2_DATABASE = true;
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";

From 69e04ea5ab08ae923d5c8de079c7a36998e5e46a Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 2 Dec 2013 14:43:44 -0800
Subject: [PATCH 039/147] Modifying Workspace padding to account for Search Bar
 offsets. (Bug 11968598)

Change-Id: I26b8488afd6d75777e1d881f1105b5c1a89021d7
---
 src/com/android/launcher3/DeviceProfile.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 626ec42cba..930188587c 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -310,7 +310,7 @@ public class DeviceProfile {
         searchBarSpaceMaxWidthPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_max_width);
         searchBarHeightPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_height);
         searchBarSpaceWidthPx = Math.min(searchBarSpaceMaxWidthPx, widthPx);
-        searchBarSpaceHeightPx = searchBarHeightPx + 2 * edgeMarginPx;
+        searchBarSpaceHeightPx = searchBarHeightPx + getSearchBarTopOffset();
 
         // Calculate the actual text height
         Paint textPaint = new Paint();
@@ -419,6 +419,15 @@ public class DeviceProfile {
         return sum;
     }
 
+    /** Returns the search bar top offset */
+    int getSearchBarTopOffset() {
+        if (isTablet() && !isVerticalBarLayout()) {
+            return 4 * edgeMarginPx;
+        } else {
+            return 2 * edgeMarginPx;
+        }
+    }
+
     /** Returns the search bar bounds in the current orientation */
     Rect getSearchBarBounds() {
         return getSearchBarBounds(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
@@ -561,7 +570,7 @@ public class DeviceProfile {
         View searchBar = launcher.getSearchBar();
         lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();
         if (hasVerticalBarLayout) {
-            // Vertical search bar
+            // Vertical search bar space
             lp.gravity = Gravity.TOP | Gravity.LEFT;
             lp.width = searchBarSpaceHeightPx;
             lp.height = LayoutParams.MATCH_PARENT;
@@ -569,13 +578,13 @@ public class DeviceProfile {
                     0, 2 * edgeMarginPx, 0,
                     2 * edgeMarginPx);
         } else {
-            // Horizontal search bar
+            // Horizontal search bar space
             lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL;
             lp.width = searchBarSpaceWidthPx;
             lp.height = searchBarSpaceHeightPx;
             searchBar.setPadding(
                     2 * edgeMarginPx,
-                    2 * edgeMarginPx,
+                    getSearchBarTopOffset(),
                     2 * edgeMarginPx, 0);
         }
         searchBar.setLayoutParams(lp);

From 2cb2471e7fbade9a785c523df5941f2855e99041 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 2 Dec 2013 15:00:39 -0800
Subject: [PATCH 040/147] Ensure we pass search bar bounds to GoogleSearch.
 (Bug 11968598)

Change-Id: I10027c2c10bbc5b2f2e63276dc91ceca0bf59a08
---
 src/com/android/launcher3/DeviceProfile.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 930188587c..9e1f1a7b1b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -449,10 +449,12 @@ public class DeviceProfile {
                 //      that into account here too.
                 int gap = (int) ((width - 2 * edgeMarginPx -
                         (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
-                bounds.set(edgeMarginPx + gap, 0, availableWidthPx - (edgeMarginPx + gap),
+                bounds.set(edgeMarginPx + gap, getSearchBarTopOffset(),
+                        availableWidthPx - (edgeMarginPx + gap),
                         searchBarSpaceHeightPx);
             } else {
-                bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left, 0,
+                bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left,
+                        getSearchBarTopOffset(),
                         availableWidthPx - (desiredWorkspaceLeftRightMarginPx -
                         defaultWidgetPadding.right), searchBarSpaceHeightPx);
             }

From 1c00fd0b045179c9e6cc2dfc344cddc1a8d5b383 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 2 Dec 2013 16:11:22 -0800
Subject: [PATCH 041/147] Fix NPE when going to All Apps in landscape

---
 src/com/android/launcher3/Workspace.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b8af9ad5b6..3b7afc7619 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2235,20 +2235,22 @@ public class Workspace extends SmoothPagedView
             if (pageIndicator != null) {
                 pageIndicatorAlpha = new LauncherViewPropertyAnimator(pageIndicator)
                     .alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
+                pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
             } else {
                 // create a dummy animation so we don't need to do null checks later
                 pageIndicatorAlpha = ValueAnimator.ofFloat(0, 0);
             }
+
             Animator hotseatAlpha = new LauncherViewPropertyAnimator(hotseat)
                 .alpha(finalHotseatAndPageIndicatorAlpha).withLayer();
+            hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
+
             Animator searchBarAlpha = new LauncherViewPropertyAnimator(searchBar)
                 .alpha(finalSearchBarAlpha).withLayer();
+            searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
+
             Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel)
                 .alpha(finalOverviewPanelAlpha).withLayer();
-
-            pageIndicatorAlpha.addListener(new AlphaUpdateListener(pageIndicator));
-            hotseatAlpha.addListener(new AlphaUpdateListener(hotseat));
-            searchBarAlpha.addListener(new AlphaUpdateListener(searchBar));
             overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel));
 
             if (workspaceToOverview) {

From 6dbe049431741a9dfa05f7eee144335e9da76281 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 2 Dec 2013 17:00:14 -0800
Subject: [PATCH 042/147] Only import workspaces for non-tablets (where grid
 hasn't changed)

Change-Id: I832b6259477d6325c141fddfe9b50cb05aeff8d2
---
 src/com/android/launcher3/LauncherProvider.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 4eb30e746f..54de63531f 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -290,6 +290,13 @@ public class LauncherProvider extends ContentProvider {
         public void onRow(ContentValues values);
     }
 
+    private static boolean shouldImportLauncher2Database(Context context) {
+        boolean isTablet = context.getResources().getBoolean(R.bool.is_tablet);
+
+        // We don't import the old databse for tablets, as the grid size has changed.
+        return !isTablet && IMPORT_LAUNCHER2_DATABASE;
+    }
+
     private static class DatabaseHelper extends SQLiteOpenHelper {
         private static final String TAG_FAVORITES = "favorites";
         private static final String TAG_FAVORITE = "favorite";
@@ -369,7 +376,7 @@ public class LauncherProvider extends ContentProvider {
                 sendAppWidgetResetNotify();
             }
 
-            if (IMPORT_LAUNCHER2_DATABASE) {
+            if (shouldImportLauncher2Database(mContext)) {
                 // Try converting the old database
                 ContentValuesCallback permuteScreensCb = new ContentValuesCallback() {
                     public void onRow(ContentValues values) {

From b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 3 Dec 2013 10:51:45 -0800
Subject: [PATCH 043/147] Add guards for restoreInstanceState (issue 11982812)

Change-Id: Ic4c632a956130ab28843085490dc1badb39b0e8c
---
 src/com/android/launcher3/LauncherModel.java | 2 +-
 src/com/android/launcher3/Workspace.java     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4d9dff93a4..74f28b3041 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2298,7 +2298,7 @@ public class LauncherModel extends BroadcastReceiver {
                 r = new Runnable() {
                     public void run() {
                         Callbacks callbacks = tryGetCallbacks(oldCallbacks);
-                        if (callbacks != null) {
+                        if (callbacks != null && currentScreen >= 0) {
                             callbacks.onPageBoundSynchronously(currentScreen);
                         }
                     }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3b7afc7619..c6c6e1371d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4254,7 +4254,9 @@ public class Workspace extends SmoothPagedView
         if (mSavedStates != null) {
             mRestoredPages.add(child);
             CellLayout cl = (CellLayout) getChildAt(child);
-            cl.restoreInstanceState(mSavedStates);
+            if (cl != null) {
+                cl.restoreInstanceState(mSavedStates);
+            }
         }
     }
 

From a6a0547fa6df0769fcd107a2e5f7c7d527fa0700 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 13 Nov 2013 17:59:46 +0100
Subject: [PATCH 044/147] Update suggested wallpaper dimensions in onResume

If another launcher runs in between, it might
change the suggested dimensions. This fixes that
case.

Bug: 11667475
---
 AndroidManifest.xml                           |  7 ++
 .../android/launcher3/LauncherAppState.java   | 11 +++
 .../launcher3/WallpaperChangedReceiver.java   | 28 ++++++++
 .../launcher3/WallpaperCropActivity.java      | 67 ++++++++++---------
 src/com/android/launcher3/Workspace.java      | 25 +++++--
 5 files changed, 100 insertions(+), 38 deletions(-)
 create mode 100644 src/com/android/launcher3/WallpaperChangedReceiver.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 901b63838d..1e418ec2f1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -160,6 +160,13 @@
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name="com.android.launcher3.WallpaperChangedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.WALLPAPER_CHANGED" />
+            </intent-filter>
+        </receiver>
+
         <!-- Intent received used to install shortcuts from other applications -->
         <receiver
             android:name="com.android.launcher3.InstallShortcutReceiver"
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 9a47eaa32c..5daa845f34 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -39,6 +39,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
     private boolean mIsScreenLarge;
     private float mScreenDensity;
     private int mLongPressTimeout = 300;
+    private boolean mWallpaperChangedSinceLastCheck;
 
     private static WeakReference<LauncherProvider> sLauncherProvider;
     private static Context sContext;
@@ -217,6 +218,16 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
         return mLongPressTimeout;
     }
 
+    public void onWallpaperChanged() {
+        mWallpaperChangedSinceLastCheck = true;
+    }
+
+    public boolean hasWallpaperChangedSinceLastCheck() {
+        boolean result = mWallpaperChangedSinceLastCheck;
+        mWallpaperChangedSinceLastCheck = false;
+        return result;
+    }
+
     @Override
     public void onAvailableSizeChanged(DeviceProfile grid) {
         Utilities.setIconSize(grid.iconSizePx);
diff --git a/src/com/android/launcher3/WallpaperChangedReceiver.java b/src/com/android/launcher3/WallpaperChangedReceiver.java
new file mode 100644
index 0000000000..28e41d8a5e
--- /dev/null
+++ b/src/com/android/launcher3/WallpaperChangedReceiver.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 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
+ *
+ *      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
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class WallpaperChangedReceiver extends BroadcastReceiver {
+    public void onReceive(Context context, Intent data) {
+        LauncherAppState appState = LauncherAppState.getInstance();
+        appState.onWallpaperChanged();
+    }
+}
diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
index 2102599eec..b3ef073091 100644
--- a/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/src/com/android/launcher3/WallpaperCropActivity.java
@@ -71,6 +71,8 @@ public class WallpaperCropActivity extends Activity {
     public static final int MAX_BMAP_IN_INTENT = 750000;
     private static final float WALLPAPER_SCREENS_SPAN = 2f;
 
+    protected static Point sDefaultWallpaperSize;
+
     protected CropView mCropView;
     protected Uri mUri;
 
@@ -204,32 +206,34 @@ public class WallpaperCropActivity extends Activity {
     }
 
     static protected Point getDefaultWallpaperSize(Resources res, WindowManager windowManager) {
-        Point minDims = new Point();
-        Point maxDims = new Point();
-        windowManager.getDefaultDisplay().getCurrentSizeRange(minDims, maxDims);
+        if (sDefaultWallpaperSize == null) {
+            Point minDims = new Point();
+            Point maxDims = new Point();
+            windowManager.getDefaultDisplay().getCurrentSizeRange(minDims, maxDims);
 
-        int maxDim = Math.max(maxDims.x, maxDims.y);
-        int minDim = Math.max(minDims.x, minDims.y);
+            int maxDim = Math.max(maxDims.x, maxDims.y);
+            int minDim = Math.max(minDims.x, minDims.y);
 
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            Point realSize = new Point();
-            windowManager.getDefaultDisplay().getRealSize(realSize);
-            maxDim = Math.max(realSize.x, realSize.y);
-            minDim = Math.min(realSize.x, realSize.y);
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                Point realSize = new Point();
+                windowManager.getDefaultDisplay().getRealSize(realSize);
+                maxDim = Math.max(realSize.x, realSize.y);
+                minDim = Math.min(realSize.x, realSize.y);
+            }
+
+            // We need to ensure that there is enough extra space in the wallpaper
+            // for the intended parallax effects
+            final int defaultWidth, defaultHeight;
+            if (isScreenLarge(res)) {
+                defaultWidth = (int) (maxDim * wallpaperTravelToScreenWidthRatio(maxDim, minDim));
+                defaultHeight = maxDim;
+            } else {
+                defaultWidth = Math.max((int) (minDim * WALLPAPER_SCREENS_SPAN), maxDim);
+                defaultHeight = maxDim;
+            }
+            sDefaultWallpaperSize = new Point(defaultWidth, defaultHeight);
         }
-
-        // We need to ensure that there is enough extra space in the wallpaper
-        // for the intended
-        // parallax effects
-        final int defaultWidth, defaultHeight;
-        if (isScreenLarge(res)) {
-            defaultWidth = (int) (maxDim * wallpaperTravelToScreenWidthRatio(maxDim, minDim));
-            defaultHeight = maxDim;
-        } else {
-            defaultWidth = Math.max((int) (minDim * WALLPAPER_SCREENS_SPAN), maxDim);
-            defaultHeight = maxDim;
-        }
-        return new Point(defaultWidth, defaultHeight);
+        return sDefaultWallpaperSize;
     }
 
     public static int getRotationFromExif(String path) {
@@ -785,16 +789,13 @@ public class WallpaperCropActivity extends Activity {
             WindowManager windowManager,
             final WallpaperManager wallpaperManager) {
         final Point defaultWallpaperSize = getDefaultWallpaperSize(res, windowManager);
-
-        new AsyncTask<Void, Void, Void>() {
-            public Void doInBackground(Void ... args) {
-                // If we have saved a wallpaper width/height, use that instead
-                int savedWidth = sharedPrefs.getInt(WALLPAPER_WIDTH_KEY, defaultWallpaperSize.x);
-                int savedHeight = sharedPrefs.getInt(WALLPAPER_HEIGHT_KEY, defaultWallpaperSize.y);
-                wallpaperManager.suggestDesiredDimensions(savedWidth, savedHeight);
-                return null;
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+        // If we have saved a wallpaper width/height, use that instead
+        int savedWidth = sharedPrefs.getInt(WALLPAPER_WIDTH_KEY, defaultWallpaperSize.x);
+        int savedHeight = sharedPrefs.getInt(WALLPAPER_HEIGHT_KEY, defaultWallpaperSize.y);
+        if (savedWidth != wallpaperManager.getDesiredMinimumWidth() ||
+                savedHeight != wallpaperManager.getDesiredMinimumHeight()) {
+            wallpaperManager.suggestDesiredDimensions(savedWidth, savedHeight);
+        }
     }
 
     protected static RectF getMaxCropRect(
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e4ba743beb..936d573bff 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -43,6 +43,7 @@ import android.graphics.Rect;
 import android.graphics.Region.Op;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.IBinder;
 import android.os.Parcelable;
 import android.support.v4.view.ViewCompat;
@@ -437,6 +438,9 @@ public class Workspace extends SmoothPagedView
 
         mMaxDistanceForFolderCreation = (0.55f * grid.iconSizePx);
         mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
+
+        // Set the wallpaper dimensions when Launcher starts up
+        setWallpaperDimension();
     }
 
     private void setupLayoutTransition() {
@@ -1232,10 +1236,16 @@ public class Workspace extends SmoothPagedView
     }
 
     protected void setWallpaperDimension() {
-        String spKey = WallpaperCropActivity.getSharedPreferencesKey();
-        SharedPreferences sp = mLauncher.getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS);
-        WallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
-                sp, mLauncher.getWindowManager(), mWallpaperManager);
+        new AsyncTask<Void, Void, Void>() {
+            public Void doInBackground(Void ... args) {
+                String spKey = WallpaperCropActivity.getSharedPreferencesKey();
+                SharedPreferences sp =
+                        mLauncher.getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS);
+                WallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
+                        sp, mLauncher.getWindowManager(), mWallpaperManager);
+                return null;
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
     }
 
     protected void snapToPage(int whichPage, Runnable r) {
@@ -1693,6 +1703,12 @@ public class Workspace extends SmoothPagedView
         AccessibilityManager am = (AccessibilityManager)
                 getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
         sAccessibilityEnabled = am.isEnabled();
+
+        // Update wallpaper dimensions if they were changed since last onResume
+        // (we also always set the wallpaper dimensions in the constructor)
+        if (LauncherAppState.getInstance().hasWallpaperChangedSinceLastCheck()) {
+            setWallpaperDimension();
+        }
     }
 
     @Override
@@ -4001,7 +4017,6 @@ public class Workspace extends SmoothPagedView
         // hardware layers on children are enabled on startup, but should be disabled until
         // needed
         updateChildrenLayersEnabled(false);
-        setWallpaperDimension();
     }
 
     /**

From 45297f851af715b2a0367459089a7a8f9c39b8fd Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Thu, 17 Oct 2013 15:16:48 -0400
Subject: [PATCH 045/147] backup launcher preferences

Bug: 11267816
Change-Id: I12a32477164fe2205bc8cb02e0a23c561a7f9189
---
 .../launcher3/LauncherBackupAgentHelper.java     | 16 ++++++++++++++++
 .../android/launcher3/LauncherBackupHelper.java  |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java
index 2b5059b72c..83e4a60d45 100644
--- a/src/com/android/launcher3/LauncherBackupAgentHelper.java
+++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java
@@ -18,10 +18,14 @@ package com.android.launcher3;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.BackupManager;
+import android.app.backup.SharedPreferencesBackupHelper;
 import android.content.Context;
+import android.content.SharedPreferences;
 
 public class LauncherBackupAgentHelper extends BackupAgentHelper {
 
+    private static final String TAG = "LauncherBackupAgentHelper";
+
     private static BackupManager sBackupManager;
 
     /**
@@ -38,9 +42,21 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper {
         sBackupManager.dataChanged();
     }
 
+    @Override
+    public void onDestroy() {
+        // There is only one process accessing this preference file, but the restore
+        // modifies the file outside the normal codepaths, so it looks like another
+        // process.  This forces a reload of the file, in case this process persists.
+        String spKey = LauncherAppState.getSharedPreferencesKey();
+        SharedPreferences sp = getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS);
+        super.onDestroy();
+    }
 
     @Override
     public void onCreate() {
+        addHelper(LauncherBackupHelper.LAUNCHER_PREFS_PREFIX,
+                new SharedPreferencesBackupHelper(this,
+                        LauncherAppState.getSharedPreferencesKey()));
         addHelper(LauncherBackupHelper.LAUNCHER_PREFIX, new LauncherBackupHelper(this));
     }
 }
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 8023fcd36a..2a5ed69615 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -82,6 +82,8 @@ public class LauncherBackupHelper implements BackupHelper {
 
     public static final String LAUNCHER_PREFIX = "L";
 
+    public static final String LAUNCHER_PREFS_PREFIX = "LP";
+
     private static final Bitmap.CompressFormat IMAGE_FORMAT =
             android.graphics.Bitmap.CompressFormat.PNG;
 

From 42b3c06849331aa5ba1f07f8c58915190d386aac Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 4 Dec 2013 12:09:59 -0800
Subject: [PATCH 046/147] Restoring Hotseat to the left-aligned in RTL. (Bug
 11451335)

Change-Id: I5451b1281e3f346f51677040775ae7bf76e303d1
---
 src/com/android/launcher3/DeviceProfile.java | 25 +++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 9e1f1a7b1b..b84dbafb2d 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -73,6 +73,7 @@ public class DeviceProfile {
     boolean isLandscape;
     boolean isTablet;
     boolean isLargeTablet;
+    boolean isLayoutRtl;
     boolean transposeLayoutWithOrientation;
 
     int desiredWorkspaceLeftRightMarginPx;
@@ -356,10 +357,11 @@ public class DeviceProfile {
 
     void updateFromConfiguration(Context context, Resources resources, int wPx, int hPx,
                                  int awPx, int ahPx) {
-        isLandscape = (resources.getConfiguration().orientation ==
-                Configuration.ORIENTATION_LANDSCAPE);
+        Configuration configuration = resources.getConfiguration();
+        isLandscape = (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE);
         isTablet = resources.getBoolean(R.bool.is_tablet);
         isLargeTablet = resources.getBoolean(R.bool.is_large_tablet);
+        isLayoutRtl = (configuration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL);
         widthPx = wPx;
         heightPx = hPx;
         availableWidthPx = awPx;
@@ -437,7 +439,13 @@ public class DeviceProfile {
         Rect bounds = new Rect();
         if (orientation == CellLayout.LANDSCAPE &&
                 transposeLayoutWithOrientation) {
-            bounds.set(0, edgeMarginPx, searchBarSpaceHeightPx, availableHeightPx - edgeMarginPx);
+            if (isLayoutRtl) {
+                bounds.set(availableWidthPx - searchBarSpaceHeightPx, edgeMarginPx,
+                        availableWidthPx, availableHeightPx - edgeMarginPx);
+            } else {
+                bounds.set(0, edgeMarginPx, searchBarSpaceHeightPx,
+                        availableHeightPx - edgeMarginPx);
+            }
         } else {
             if (isTablet()) {
                 // Pad the left and right of the workspace to ensure consistent spacing
@@ -472,8 +480,13 @@ public class DeviceProfile {
         if (orientation == CellLayout.LANDSCAPE &&
                 transposeLayoutWithOrientation) {
             // Pad the left and right of the workspace with search/hotseat bar sizes
-            padding.set(searchBarBounds.right, edgeMarginPx,
-                    hotseatBarHeightPx, edgeMarginPx);
+            if (isLayoutRtl) {
+                padding.set(hotseatBarHeightPx, edgeMarginPx,
+                        searchBarBounds.width(), edgeMarginPx);
+            } else {
+                padding.set(searchBarBounds.width(), edgeMarginPx,
+                        hotseatBarHeightPx, edgeMarginPx);
+            }
         } else {
             if (isTablet()) {
                 // Pad the left and right of the workspace to ensure consistent spacing
@@ -627,7 +640,7 @@ public class DeviceProfile {
         lp = (FrameLayout.LayoutParams) hotseat.getLayoutParams();
         if (hasVerticalBarLayout) {
             // Vertical hotseat
-            lp.gravity = Gravity.RIGHT;
+            lp.gravity = Gravity.END;
             lp.width = hotseatBarHeightPx;
             lp.height = LayoutParams.MATCH_PARENT;
             hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx);

From e7e97e65524977ad361811b95e8ee4557841d36a Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 2 Dec 2013 17:02:50 -0800
Subject: [PATCH 047/147] Retain current AllApps page if we never leave
 Launcher. (Bug 11468582)

Change-Id: Id18b14f6fbb2598a8c1f4c714f79d1a4332a7868
---
 src/com/android/launcher3/Launcher.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 12c087f276..e2301ba699 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1765,7 +1765,7 @@ public class Launcher extends Activity
             }
 
             // Reset the apps customize page
-            if (mAppsCustomizeTabHost != null) {
+            if (!alreadyOnHome && mAppsCustomizeTabHost != null) {
                 mAppsCustomizeTabHost.reset();
             }
 
@@ -2375,7 +2375,7 @@ public class Launcher extends Activity
      * @param v The view that was clicked.
      */
     public void onClickAllAppsButton(View v) {
-        showAllApps(true, AppsCustomizePagedView.ContentType.Applications, true);
+        showAllApps(true, AppsCustomizePagedView.ContentType.Applications, false);
     }
 
     public void onTouchDownAllAppsButton(View v) {

From 495f44d5fcd877786ffa5e8eea055e18f28e3d85 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 4 Dec 2013 12:51:53 -0800
Subject: [PATCH 048/147] Limit AllApps insets to certain device
 configurations. (Bug 11451335)

Change-Id: I0b7172bb8c2e8cfb06ef4ff097bdc632d6be0548
---
 src/com/android/launcher3/DeviceProfile.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 9e1f1a7b1b..ec5e81f74e 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -703,7 +703,8 @@ public class DeviceProfile {
                 paddingTB = Math.min(paddingTB, (int)((paddingLR + paddingTB) * 0.75f));
                 int maxAllAppsWidth = (allAppsNumCols * (allAppsCellWidthPx + 2 * paddingLR));
                 int gridPaddingLR = (availableWidthPx - maxAllAppsWidth) / 2;
-                if (gridPaddingLR > (allAppsCellWidthPx / 4)) {
+                // Only adjust the side paddings on landscape phones, or tablets
+                if ((isTablet() || isLandscape) && gridPaddingLR > (allAppsCellWidthPx / 4)) {
                     padding.left = padding.right = gridPaddingLR;
                 }
                 // The icons are centered, so we can't just offset by the page indicator height

From 59b5c79b6ff2de83209cf1425b8924d541e97266 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 4 Dec 2013 16:09:07 -0800
Subject: [PATCH 049/147] Fix page jumping regression in overview mode (issue
 12003672)

Change-Id: I4315d4e97c8df4db25e2d70be759b94a0348d644
---
 src/com/android/launcher3/PagedView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 2c7114bc54..c216f926fd 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1398,7 +1398,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
                 if (finishedScrolling) {
                     mTouchState = TOUCH_STATE_REST;
-                    if (!mScroller.isFinished()) {
+                    if (!mScroller.isFinished() && !mFreeScroll) {
                         setCurrentPage(getNextPage());
                         pageEndMoving();
                     }

From c39c3c4763db748731d7c070165a2bda55ca532b Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 4 Dec 2013 16:15:59 -0800
Subject: [PATCH 050/147] Fixing regression in drop target bar height. (Bug
 11980757)

Change-Id: I67ccc575b5c15a47ab7f41ceebfc86d9a212ddf3
---
 res/values-land/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index ccb5fcb069..d18a57b955 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -27,7 +27,7 @@
     </style>
     <style name="DropTargetButtonContainer">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
     </style>
     <style name="DropTargetButton">
         <item name="android:layout_width">wrap_content</item>

From 5d518fa77c56a65104f02f40269ad8e43f3431b2 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 5 Dec 2013 14:16:23 -0800
Subject: [PATCH 051/147] Decrease delay for closing folder on removal of an
 item (issue 11028310)

Change-Id: Ie5c094af8b0293e56bf016be5b4f4db05e7a9a05
---
 src/com/android/launcher3/Folder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 50e2000926..bbe6af2f67 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -82,7 +82,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     private int mState = STATE_NONE;
     private static final int REORDER_ANIMATION_DURATION = 230;
     private static final int REORDER_DELAY = 250;
-    private static final int ON_EXIT_CLOSE_DELAY = 800;
+    private static final int ON_EXIT_CLOSE_DELAY = 400;
     private boolean mRearrangeOnClose = false;
     private FolderIcon mFolderIcon;
     private int mMaxCountX;

From f4ed1be4ef22c87b002c3bca90d130eb77fe5535 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Fri, 6 Dec 2013 17:56:07 -0800
Subject: [PATCH 052/147] Allow 5 hotseat icons in DISABLE_ALL_APPS mode.

Change-Id: I71510cf079e211bd53e411e6e43f1bc6475f6d35
---
 src/com/android/launcher3/DynamicGrid.java      | 12 ++++++------
 src/com/android/launcher3/LauncherProvider.java | 11 ++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index ce7855362a..dc01c69331 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -60,17 +60,17 @@ public class DynamicGrid {
         DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm);
         // Our phone profiles include the bar sizes in each orientation
         deviceProfiles.add(new DeviceProfile("Super Short Stubby",
-                255, 300,  2, 3,  48, 13, (hasAA ? 5 : 4), 48));
+                255, 300,  2, 3,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Shorter Stubby",
-                255, 400,  3, 3,  48, 13, (hasAA ? 5 : 4), 48));
+                255, 400,  3, 3,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Short Stubby",
-                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 4), 48));
+                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Stubby",
-                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 4), 48));
+                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Nexus S",
-                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 4), 48));
+                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Nexus 4",
-                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 4), 56));
+                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 27b7dae2a3..28efd01487 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -270,7 +270,8 @@ public class LauncherProvider extends ContentProvider {
 
             // Use default workspace resource if none provided
             if (workspaceResId == 0) {
-                workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace);
+                workspaceResId =
+                        sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId());
             }
 
             // Populate favorites table with initial favorites
@@ -286,6 +287,14 @@ public class LauncherProvider extends ContentProvider {
         }
     }
 
+    private static int getDefaultWorkspaceResourceId() {
+        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+            return R.xml.default_workspace_no_all_apps;
+        } else {
+            return R.xml.default_workspace;
+        }
+    }
+
     private static interface ContentValuesCallback {
         public void onRow(ContentValues values);
     }

From d85ee9b994e21cb500c89349ce31ce89e564b513 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Mon, 9 Dec 2013 20:39:28 +0000
Subject: [PATCH 053/147] Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS
 mode."

This reverts commit f4ed1be4ef22c87b002c3bca90d130eb77fe5535.

This broke the build:
packages/apps/Launcher3/src/com/android/launcher3/LauncherProvider.java:292: cannot find symbol
symbol  : variable default_workspace_no_all_apps
location: class com.android.launcher3.R.xml
            return R.xml.default_workspace_no_all_apps;

Change-Id: I40e80494f06f08de3d827c6816075ac4d269ea6a
---
 src/com/android/launcher3/DynamicGrid.java      | 12 ++++++------
 src/com/android/launcher3/LauncherProvider.java | 11 +----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index dc01c69331..ce7855362a 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -60,17 +60,17 @@ public class DynamicGrid {
         DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm);
         // Our phone profiles include the bar sizes in each orientation
         deviceProfiles.add(new DeviceProfile("Super Short Stubby",
-                255, 300,  2, 3,  48, 13, (hasAA ? 5 : 5), 48));
+                255, 300,  2, 3,  48, 13, (hasAA ? 5 : 4), 48));
         deviceProfiles.add(new DeviceProfile("Shorter Stubby",
-                255, 400,  3, 3,  48, 13, (hasAA ? 5 : 5), 48));
+                255, 400,  3, 3,  48, 13, (hasAA ? 5 : 4), 48));
         deviceProfiles.add(new DeviceProfile("Short Stubby",
-                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 5), 48));
+                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 4), 48));
         deviceProfiles.add(new DeviceProfile("Stubby",
-                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 5), 48));
+                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 4), 48));
         deviceProfiles.add(new DeviceProfile("Nexus S",
-                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48));
+                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 4), 48));
         deviceProfiles.add(new DeviceProfile("Nexus 4",
-                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
+                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 4), 56));
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 28efd01487..27b7dae2a3 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -270,8 +270,7 @@ public class LauncherProvider extends ContentProvider {
 
             // Use default workspace resource if none provided
             if (workspaceResId == 0) {
-                workspaceResId =
-                        sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId());
+                workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace);
             }
 
             // Populate favorites table with initial favorites
@@ -287,14 +286,6 @@ public class LauncherProvider extends ContentProvider {
         }
     }
 
-    private static int getDefaultWorkspaceResourceId() {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
-            return R.xml.default_workspace_no_all_apps;
-        } else {
-            return R.xml.default_workspace;
-        }
-    }
-
     private static interface ContentValuesCallback {
         public void onRow(ContentValues values);
     }

From da41ea669890a79a4d2bc57dab9ae03157fd9e75 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Mon, 9 Dec 2013 14:17:49 -0800
Subject: [PATCH 054/147] Allow 5 hotseat icons in DISABLE_ALL_APPS mode.

Added the xml resource in Launcher3 package as well.
This is a dummy resource with just hotseat icons.
Previously reviewed on: http://ag/396580

Change-Id: I31b0d7d4796d028f44f746260c381f2d8226605a
---
 res/xml/default_workspace_no_all_apps.xml     | 56 +++++++++++++++++++
 src/com/android/launcher3/DynamicGrid.java    | 12 ++--
 .../android/launcher3/LauncherProvider.java   | 11 +++-
 3 files changed, 72 insertions(+), 7 deletions(-)
 create mode 100644 res/xml/default_workspace_no_all_apps.xml

diff --git a/res/xml/default_workspace_no_all_apps.xml b/res/xml/default_workspace_no_all_apps.xml
new file mode 100644
index 0000000000..7e1301cef9
--- /dev/null
+++ b/res/xml/default_workspace_no_all_apps.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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
+
+          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
+     limitations under the License.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer Hangouts Maps Chrome Camera -->
+    <favorite
+        launcher:packageName="com.google.android.dialer"
+        launcher:className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.google.android.talk"
+        launcher:className="com.google.android.talk.SigningInActivity"
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.google.android.apps.maps"
+        launcher:className="com.google.android.maps.MapsActivity"
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0"/>
+    <favorite
+        launcher:packageName="com.android.chrome"
+        launcher:className="com.google.android.apps.chrome.Main"
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.google.android.GoogleCamera"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" />
+</favorites>
+
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index ce7855362a..dc01c69331 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -60,17 +60,17 @@ public class DynamicGrid {
         DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm);
         // Our phone profiles include the bar sizes in each orientation
         deviceProfiles.add(new DeviceProfile("Super Short Stubby",
-                255, 300,  2, 3,  48, 13, (hasAA ? 5 : 4), 48));
+                255, 300,  2, 3,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Shorter Stubby",
-                255, 400,  3, 3,  48, 13, (hasAA ? 5 : 4), 48));
+                255, 400,  3, 3,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Short Stubby",
-                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 4), 48));
+                275, 420,  3, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Stubby",
-                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 4), 48));
+                255, 450,  3, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Nexus S",
-                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 4), 48));
+                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Nexus 4",
-                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 4), 56));
+                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 27b7dae2a3..28efd01487 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -270,7 +270,8 @@ public class LauncherProvider extends ContentProvider {
 
             // Use default workspace resource if none provided
             if (workspaceResId == 0) {
-                workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace);
+                workspaceResId =
+                        sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId());
             }
 
             // Populate favorites table with initial favorites
@@ -286,6 +287,14 @@ public class LauncherProvider extends ContentProvider {
         }
     }
 
+    private static int getDefaultWorkspaceResourceId() {
+        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+            return R.xml.default_workspace_no_all_apps;
+        } else {
+            return R.xml.default_workspace;
+        }
+    }
+
     private static interface ContentValuesCallback {
         public void onRow(ContentValues values);
     }

From 68b667848ef7c6f69b24a40d780e4088a5f2a1fb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 9 Dec 2013 16:57:45 -0800
Subject: [PATCH 055/147] Fixing crash in empty folders. (Bug 11627191)

Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52
---
 src/com/android/launcher3/Folder.java        | 15 +++++++++++++--
 src/com/android/launcher3/FolderInfo.java    |  4 ++--
 src/com/android/launcher3/LauncherModel.java |  5 +++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 1d234ff8a1..2fb8f9256f 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -408,6 +408,15 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             mFolderName.setText("");
         }
         updateItemLocationsInDatabase();
+
+        // In case any children didn't come across during loading, clean up the folder accordingly
+        mFolderIcon.post(new Runnable() {
+            public void run() {
+                if (getItemCount() <= 1) {
+                    replaceFolderWithFinalItem();
+                }
+            }
+        });
     }
 
     /**
@@ -816,7 +825,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             View v = list.get(i);
             ItemInfo info = (ItemInfo) v.getTag();
             LauncherModel.moveItemInDatabase(mLauncher, info, mInfo.id, 0,
-                        info.cellX, info.cellY);
+                    info.cellX, info.cellY);
         }
     }
 
@@ -1065,7 +1074,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             public void run() {
                 CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screenId);
 
-               View child = null;
+                View child = null;
                 // Move the item from the folder to the workspace, in the position of the folder
                 if (getItemCount() == 1) {
                     ShortcutInfo finalItem = mInfo.contents.get(0);
@@ -1095,6 +1104,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         View finalChild = getItemAt(0);
         if (finalChild != null) {
             mFolderIcon.performDestroyAnimation(finalChild, onCompleteRunnable);
+        } else {
+            onCompleteRunnable.run();
         }
         mDestroyed = true;
     }
diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index bb5ae8200c..d45e4e47be 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -16,10 +16,10 @@
 
 package com.android.launcher3;
 
-import java.util.ArrayList;
-
 import android.content.ContentValues;
 
+import java.util.ArrayList;
+
 /**
  * Represents a folder containing shortcuts or apps.
  */
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 74f28b3041..a69617ac77 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -584,8 +584,9 @@ public class LauncherModel extends BroadcastReceiver {
             // as in Workspace.onDrop. Here, we just add/remove them from the list of items
             // that are on the desktop, as appropriate
             ItemInfo modelItem = sBgItemsIdMap.get(itemId);
-            if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
-                    modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+            if (modelItem != null &&
+                    (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
+                     modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) {
                 switch (modelItem.itemType) {
                     case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                     case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:

From 72b520c956a4bf11f6dbbac7eb5e18001b7a11cb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 10 Dec 2013 01:17:03 +0000
Subject: [PATCH 056/147] Revert "Fixing crash in empty folders. (Bug
 11627191)"

This reverts commit 68b667848ef7c6f69b24a40d780e4088a5f2a1fb.

Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
---
 src/com/android/launcher3/Folder.java        | 15 ++-------------
 src/com/android/launcher3/FolderInfo.java    |  4 ++--
 src/com/android/launcher3/LauncherModel.java |  5 ++---
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 2fb8f9256f..1d234ff8a1 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -408,15 +408,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             mFolderName.setText("");
         }
         updateItemLocationsInDatabase();
-
-        // In case any children didn't come across during loading, clean up the folder accordingly
-        mFolderIcon.post(new Runnable() {
-            public void run() {
-                if (getItemCount() <= 1) {
-                    replaceFolderWithFinalItem();
-                }
-            }
-        });
     }
 
     /**
@@ -825,7 +816,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             View v = list.get(i);
             ItemInfo info = (ItemInfo) v.getTag();
             LauncherModel.moveItemInDatabase(mLauncher, info, mInfo.id, 0,
-                    info.cellX, info.cellY);
+                        info.cellX, info.cellY);
         }
     }
 
@@ -1074,7 +1065,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             public void run() {
                 CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screenId);
 
-                View child = null;
+               View child = null;
                 // Move the item from the folder to the workspace, in the position of the folder
                 if (getItemCount() == 1) {
                     ShortcutInfo finalItem = mInfo.contents.get(0);
@@ -1104,8 +1095,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         View finalChild = getItemAt(0);
         if (finalChild != null) {
             mFolderIcon.performDestroyAnimation(finalChild, onCompleteRunnable);
-        } else {
-            onCompleteRunnable.run();
         }
         mDestroyed = true;
     }
diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index d45e4e47be..bb5ae8200c 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -16,10 +16,10 @@
 
 package com.android.launcher3;
 
-import android.content.ContentValues;
-
 import java.util.ArrayList;
 
+import android.content.ContentValues;
+
 /**
  * Represents a folder containing shortcuts or apps.
  */
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index a69617ac77..74f28b3041 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -584,9 +584,8 @@ public class LauncherModel extends BroadcastReceiver {
             // as in Workspace.onDrop. Here, we just add/remove them from the list of items
             // that are on the desktop, as appropriate
             ItemInfo modelItem = sBgItemsIdMap.get(itemId);
-            if (modelItem != null &&
-                    (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
-                     modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) {
+            if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
+                    modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
                 switch (modelItem.itemType) {
                     case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                     case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:

From 33231f587e1a6f716af68e6198df774d2847a8e5 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 9 Dec 2013 16:57:45 -0800
Subject: [PATCH 057/147] Fixing crash in empty folders. (Bug 11627191)

Change-Id: I7a0e23e16a7546a9612d3406257e15be758d4c52

Signed-off-by: Winson Chung <winsonc@google.com>
---
 src/com/android/launcher3/Folder.java        | 15 +++++++++++++--
 src/com/android/launcher3/FolderInfo.java    |  4 ++--
 src/com/android/launcher3/LauncherModel.java |  5 +++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index bbe6af2f67..9637bbb48d 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -408,6 +408,15 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             mFolderName.setText("");
         }
         updateItemLocationsInDatabase();
+
+        // In case any children didn't come across during loading, clean up the folder accordingly
+        mFolderIcon.post(new Runnable() {
+            public void run() {
+                if (getItemCount() <= 1) {
+                    replaceFolderWithFinalItem();
+                }
+            }
+        });
     }
 
     /**
@@ -826,7 +835,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             View v = list.get(i);
             ItemInfo info = (ItemInfo) v.getTag();
             LauncherModel.moveItemInDatabase(mLauncher, info, mInfo.id, 0,
-                        info.cellX, info.cellY);
+                    info.cellX, info.cellY);
         }
     }
 
@@ -1075,7 +1084,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             public void run() {
                 CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screenId);
 
-               View child = null;
+                View child = null;
                 // Move the item from the folder to the workspace, in the position of the folder
                 if (getItemCount() == 1) {
                     ShortcutInfo finalItem = mInfo.contents.get(0);
@@ -1105,6 +1114,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         View finalChild = getItemAt(0);
         if (finalChild != null) {
             mFolderIcon.performDestroyAnimation(finalChild, onCompleteRunnable);
+        } else {
+            onCompleteRunnable.run();
         }
         mDestroyed = true;
     }
diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index bb5ae8200c..d45e4e47be 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -16,10 +16,10 @@
 
 package com.android.launcher3;
 
-import java.util.ArrayList;
-
 import android.content.ContentValues;
 
+import java.util.ArrayList;
+
 /**
  * Represents a folder containing shortcuts or apps.
  */
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 74f28b3041..a69617ac77 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -584,8 +584,9 @@ public class LauncherModel extends BroadcastReceiver {
             // as in Workspace.onDrop. Here, we just add/remove them from the list of items
             // that are on the desktop, as appropriate
             ItemInfo modelItem = sBgItemsIdMap.get(itemId);
-            if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
-                    modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+            if (modelItem != null &&
+                    (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
+                     modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) {
                 switch (modelItem.itemType) {
                     case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                     case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:

From fa3c58f647e603760c0bd929166c0edee25675a9 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 6 Dec 2013 16:10:55 -0800
Subject: [PATCH 058/147] Adding reorder hinting, hopefully will help with
 (issue 10654628)

-> Adds instant feedback that reorder _will_ happen, so hopefully will
   improve perceived disambiguation

Change-Id: Icd99e7beeb87e79627a6b9fc78a9132781410379
---
 src/com/android/launcher3/CellLayout.java | 156 ++++++++++++++--------
 src/com/android/launcher3/Workspace.java  |  17 ++-
 2 files changed, 109 insertions(+), 64 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index df16d41947..a05dd90c05 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -133,8 +133,8 @@ public class CellLayout extends ViewGroup {
 
     private HashMap<CellLayout.LayoutParams, Animator> mReorderAnimators = new
             HashMap<CellLayout.LayoutParams, Animator>();
-    private HashMap<View, ReorderHintAnimation>
-            mShakeAnimators = new HashMap<View, ReorderHintAnimation>();
+    private HashMap<View, ReorderPreviewAnimation>
+            mShakeAnimators = new HashMap<View, ReorderPreviewAnimation>();
 
     private boolean mItemPlacementDirty = false;
 
@@ -149,19 +149,20 @@ public class CellLayout extends ViewGroup {
     private boolean mIsHotseat = false;
     private float mHotseatScale = 1f;
 
-    public static final int MODE_DRAG_OVER = 0;
-    public static final int MODE_ON_DROP = 1;
-    public static final int MODE_ON_DROP_EXTERNAL = 2;
-    public static final int MODE_ACCEPT_DROP = 3;
+    public static final int MODE_SHOW_REORDER_HINT = 0;
+    public static final int MODE_DRAG_OVER = 1;
+    public static final int MODE_ON_DROP = 2;
+    public static final int MODE_ON_DROP_EXTERNAL = 3;
+    public static final int MODE_ACCEPT_DROP = 4;
     private static final boolean DESTRUCTIVE_REORDER = false;
     private static final boolean DEBUG_VISUALIZE_OCCUPIED = false;
 
     static final int LANDSCAPE = 0;
     static final int PORTRAIT = 1;
 
-    private static final float REORDER_HINT_MAGNITUDE = 0.12f;
+    private static final float REORDER_PREVIEW_MAGNITUDE = 0.12f;
     private static final int REORDER_ANIMATION_DURATION = 150;
-    private float mReorderHintAnimationMagnitude;
+    private float mReorderPreviewAnimationMagnitude;
 
     private ArrayList<View> mIntersectingViews = new ArrayList<View>();
     private Rect mOccupiedRect = new Rect();
@@ -225,7 +226,7 @@ public class CellLayout extends ViewGroup {
         mForegroundPadding =
                 res.getDimensionPixelSize(R.dimen.workspace_overscroll_drawable_padding);
 
-        mReorderHintAnimationMagnitude = (REORDER_HINT_MAGNITUDE *
+        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE *
                 grid.iconSizePx);
 
         mNormalBackground.setFilterBitmap(true);
@@ -2088,6 +2089,8 @@ public class CellLayout extends ViewGroup {
             }
         }
 
+        solution.intersectingViews = new ArrayList<View>(mIntersectingViews);
+
         // First we try to find a solution which respects the push mechanic. That is,
         // we try to find a solution such that no displaced item travels through another item
         // without also displacing that item.
@@ -2136,8 +2139,9 @@ public class CellLayout extends ViewGroup {
         }
     }
 
-    ItemConfiguration simpleSwap(int pixelX, int pixelY, int minSpanX, int minSpanY, int spanX,
-            int spanY, int[] direction, View dragView, boolean decX, ItemConfiguration solution) {
+    ItemConfiguration findReorderSolution(int pixelX, int pixelY, int minSpanX, int minSpanY,
+            int spanX, int spanY, int[] direction, View dragView, boolean decX,
+            ItemConfiguration solution) {
         // Copy the current state into the solution. This solution will be manipulated as necessary.
         copyCurrentStateToSolution(solution, false);
         // Copy the current occupied array into the temporary occupied array. This array will be
@@ -2159,11 +2163,11 @@ public class CellLayout extends ViewGroup {
             // We try shrinking the widget down to size in an alternating pattern, shrink 1 in
             // x, then 1 in y etc.
             if (spanX > minSpanX && (minSpanY == spanY || decX)) {
-                return simpleSwap(pixelX, pixelY, minSpanX, minSpanY, spanX - 1, spanY, direction,
-                        dragView, false, solution);
+                return findReorderSolution(pixelX, pixelY, minSpanX, minSpanY, spanX - 1, spanY,
+                        direction, dragView, false, solution);
             } else if (spanY > minSpanY) {
-                return simpleSwap(pixelX, pixelY, minSpanX, minSpanY, spanX, spanY - 1, direction,
-                        dragView, true, solution);
+                return findReorderSolution(pixelX, pixelY, minSpanX, minSpanY, spanX, spanY - 1,
+                        direction, dragView, true, solution);
             }
             solution.isSolution = false;
         } else {
@@ -2243,25 +2247,30 @@ public class CellLayout extends ViewGroup {
         }
     }
 
-    // This method starts or changes the reorder hint animations
-    private void beginOrAdjustHintAnimations(ItemConfiguration solution, View dragView, int delay) {
+
+    // This method starts or changes the reorder preview animations
+    private void beginOrAdjustReorderPreviewAnimations(ItemConfiguration solution,
+            View dragView, int delay, int mode) {
         int childCount = mShortcutsAndWidgets.getChildCount();
         for (int i = 0; i < childCount; i++) {
             View child = mShortcutsAndWidgets.getChildAt(i);
             if (child == dragView) continue;
             CellAndSpan c = solution.map.get(child);
+            boolean skip = mode == ReorderPreviewAnimation.MODE_HINT && solution.intersectingViews
+                    != null && !solution.intersectingViews.contains(child);
+
             LayoutParams lp = (LayoutParams) child.getLayoutParams();
-            if (c != null) {
-                ReorderHintAnimation rha = new ReorderHintAnimation(child, lp.cellX, lp.cellY,
-                        c.x, c.y, c.spanX, c.spanY);
+            if (c != null && !skip) {
+                ReorderPreviewAnimation rha = new ReorderPreviewAnimation(child, mode, lp.cellX,
+                        lp.cellY, c.x, c.y, c.spanX, c.spanY);
                 rha.animate();
             }
         }
     }
 
-    // Class which represents the reorder hint animations. These animations show that an item is
+    // Class which represents the reorder preview animations. These animations show that an item is
     // in a temporary state, and hint at where the item will return to.
-    class ReorderHintAnimation {
+    class ReorderPreviewAnimation {
         View child;
         float finalDeltaX;
         float finalDeltaY;
@@ -2269,11 +2278,18 @@ public class CellLayout extends ViewGroup {
         float initDeltaY;
         float finalScale;
         float initScale;
-        private static final int DURATION = 300;
+        int mode;
+        boolean repeating = false;
+        private static final int PREVIEW_DURATION = 300;
+        private static final int HINT_DURATION = Workspace.REORDER_TIMEOUT;
+
+        public static final int MODE_HINT = 0;
+        public static final int MODE_PREVIEW = 1;
+
         Animator a;
 
-        public ReorderHintAnimation(View child, int cellX0, int cellY0, int cellX1, int cellY1,
-                int spanX, int spanY) {
+        public ReorderPreviewAnimation(View child, int mode, int cellX0, int cellY0, int cellX1,
+                int cellY1, int spanX, int spanY) {
             regionToCenterPoint(cellX0, cellY0, spanX, spanY, mTmpPoint);
             final int x0 = mTmpPoint[0];
             final int y0 = mTmpPoint[1];
@@ -2284,20 +2300,22 @@ public class CellLayout extends ViewGroup {
             final int dY = y1 - y0;
             finalDeltaX = 0;
             finalDeltaY = 0;
+            int dir = mode == MODE_HINT ? -1 : 1;
             if (dX == dY && dX == 0) {
             } else {
                 if (dY == 0) {
-                    finalDeltaX = - Math.signum(dX) * mReorderHintAnimationMagnitude;
+                    finalDeltaX = - dir * Math.signum(dX) * mReorderPreviewAnimationMagnitude;
                 } else if (dX == 0) {
-                    finalDeltaY = - Math.signum(dY) * mReorderHintAnimationMagnitude;
+                    finalDeltaY = - dir * Math.signum(dY) * mReorderPreviewAnimationMagnitude;
                 } else {
                     double angle = Math.atan( (float) (dY) / dX);
-                    finalDeltaX = (int) (- Math.signum(dX) *
-                            Math.abs(Math.cos(angle) * mReorderHintAnimationMagnitude));
-                    finalDeltaY = (int) (- Math.signum(dY) *
-                            Math.abs(Math.sin(angle) * mReorderHintAnimationMagnitude));
+                    finalDeltaX = (int) (- dir * Math.signum(dX) *
+                            Math.abs(Math.cos(angle) * mReorderPreviewAnimationMagnitude));
+                    finalDeltaY = (int) (- dir * Math.signum(dY) *
+                            Math.abs(Math.sin(angle) * mReorderPreviewAnimationMagnitude));
                 }
             }
+            this.mode = mode;
             initDeltaX = child.getTranslationX();
             initDeltaY = child.getTranslationY();
             finalScale = getChildrenScale() - 4.0f / child.getWidth();
@@ -2307,7 +2325,7 @@ public class CellLayout extends ViewGroup {
 
         void animate() {
             if (mShakeAnimators.containsKey(child)) {
-                ReorderHintAnimation oldAnimation = mShakeAnimators.get(child);
+                ReorderPreviewAnimation oldAnimation = mShakeAnimators.get(child);
                 oldAnimation.cancel();
                 mShakeAnimators.remove(child);
                 if (finalDeltaX == 0 && finalDeltaY == 0) {
@@ -2322,14 +2340,15 @@ public class CellLayout extends ViewGroup {
             a = va;
             va.setRepeatMode(ValueAnimator.REVERSE);
             va.setRepeatCount(ValueAnimator.INFINITE);
-            va.setDuration(DURATION);
+            va.setDuration(mode == MODE_HINT ? HINT_DURATION : PREVIEW_DURATION);
             va.setStartDelay((int) (Math.random() * 60));
             va.addUpdateListener(new AnimatorUpdateListener() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
                     float r = ((Float) animation.getAnimatedValue()).floatValue();
-                    float x = r * finalDeltaX + (1 - r) * initDeltaX;
-                    float y = r * finalDeltaY + (1 - r) * initDeltaY;
+                    float r1 = (mode == MODE_HINT && repeating) ? 1.0f : r;
+                    float x = r1 * finalDeltaX + (1 - r1) * initDeltaX;
+                    float y = r1 * finalDeltaY + (1 - r1) * initDeltaY;
                     child.setTranslationX(x);
                     child.setTranslationY(y);
                     float s = r * finalScale + (1 - r) * initScale;
@@ -2343,6 +2362,7 @@ public class CellLayout extends ViewGroup {
                     initDeltaX = 0;
                     initDeltaY = 0;
                     initScale = getChildrenScale();
+                    repeating = true;
                 }
             });
             mShakeAnimators.put(child, this);
@@ -2374,8 +2394,8 @@ public class CellLayout extends ViewGroup {
         }
     }
 
-    private void completeAndClearReorderHintAnimations() {
-        for (ReorderHintAnimation a: mShakeAnimators.values()) {
+    private void completeAndClearReorderPreviewAnimations() {
+        for (ReorderPreviewAnimation a: mShakeAnimators.values()) {
             a.completeAnimationImmediately();
         }
         mShakeAnimators.clear();
@@ -2518,20 +2538,21 @@ public class CellLayout extends ViewGroup {
     }
 
     void revertTempState() {
-        if (!isItemPlacementDirty() || DESTRUCTIVE_REORDER) return;
-        final int count = mShortcutsAndWidgets.getChildCount();
-        for (int i = 0; i < count; i++) {
-            View child = mShortcutsAndWidgets.getChildAt(i);
-            LayoutParams lp = (LayoutParams) child.getLayoutParams();
-            if (lp.tmpCellX != lp.cellX || lp.tmpCellY != lp.cellY) {
-                lp.tmpCellX = lp.cellX;
-                lp.tmpCellY = lp.cellY;
-                animateChildToPosition(child, lp.cellX, lp.cellY, REORDER_ANIMATION_DURATION,
-                        0, false, false);
+        completeAndClearReorderPreviewAnimations();
+        if (isItemPlacementDirty() && !DESTRUCTIVE_REORDER) {
+            final int count = mShortcutsAndWidgets.getChildCount();
+            for (int i = 0; i < count; i++) {
+                View child = mShortcutsAndWidgets.getChildAt(i);
+                LayoutParams lp = (LayoutParams) child.getLayoutParams();
+                if (lp.tmpCellX != lp.cellX || lp.tmpCellY != lp.cellY) {
+                    lp.tmpCellX = lp.cellX;
+                    lp.tmpCellY = lp.cellY;
+                    animateChildToPosition(child, lp.cellX, lp.cellY, REORDER_ANIMATION_DURATION,
+                            0, false, false);
+                }
             }
+            setItemPlacementDirty(false);
         }
-        completeAndClearReorderHintAnimations();
-        setItemPlacementDirty(false);
     }
 
     boolean createAreaForResize(int cellX, int cellY, int spanX, int spanY,
@@ -2540,7 +2561,7 @@ public class CellLayout extends ViewGroup {
         regionToCenterPoint(cellX, cellY, spanX, spanY, pixelXY);
 
         // First we determine if things have moved enough to cause a different layout
-        ItemConfiguration swapSolution = simpleSwap(pixelXY[0], pixelXY[1], spanX, spanY,
+        ItemConfiguration swapSolution = findReorderSolution(pixelXY[0], pixelXY[1], spanX, spanY,
                  spanX,  spanY, direction, dragView,  true,  new ItemConfiguration());
 
         setUseTempCoords(true);
@@ -2554,18 +2575,18 @@ public class CellLayout extends ViewGroup {
 
             if (commit) {
                 commitTempPlacement();
-                completeAndClearReorderHintAnimations();
+                completeAndClearReorderPreviewAnimations();
                 setItemPlacementDirty(false);
             } else {
-                beginOrAdjustHintAnimations(swapSolution, dragView,
-                        REORDER_ANIMATION_DURATION);
+                beginOrAdjustReorderPreviewAnimations(swapSolution, dragView,
+                        REORDER_ANIMATION_DURATION, ReorderPreviewAnimation.MODE_PREVIEW);
             }
             mShortcutsAndWidgets.requestLayout();
         }
         return swapSolution.isSolution;
     }
 
-    int[] createArea(int pixelX, int pixelY, int minSpanX, int minSpanY, int spanX, int spanY,
+    int[] performReorder(int pixelX, int pixelY, int minSpanX, int minSpanY, int spanX, int spanY,
             View dragView, int[] result, int resultSpan[], int mode) {
         // First we determine if things have moved enough to cause a different layout
         result = findNearestArea(pixelX, pixelY, spanX, spanY, result);
@@ -2592,7 +2613,8 @@ public class CellLayout extends ViewGroup {
             mPreviousReorderDirection[1] = mDirectionVector[1];
         }
 
-        ItemConfiguration swapSolution = simpleSwap(pixelX, pixelY, minSpanX, minSpanY,
+        // Find a solution involving pushing / displacing any items in the way
+        ItemConfiguration swapSolution = findReorderSolution(pixelX, pixelY, minSpanX, minSpanY,
                  spanX,  spanY, mDirectionVector, dragView,  true,  new ItemConfiguration());
 
         // We attempt the approach which doesn't shuffle views at all
@@ -2600,12 +2622,29 @@ public class CellLayout extends ViewGroup {
                 minSpanY, spanX, spanY, dragView, new ItemConfiguration());
 
         ItemConfiguration finalSolution = null;
+
+        // If the reorder solution requires resizing (shrinking) the item being dropped, we instead
+        // favor a solution in which the item is not resized, but
         if (swapSolution.isSolution && swapSolution.area() >= noShuffleSolution.area()) {
             finalSolution = swapSolution;
         } else if (noShuffleSolution.isSolution) {
             finalSolution = noShuffleSolution;
         }
 
+        if (mode == MODE_SHOW_REORDER_HINT) {
+            beginOrAdjustReorderPreviewAnimations(finalSolution, dragView, 0,
+                    ReorderPreviewAnimation.MODE_HINT);
+            if (finalSolution != null) {
+                result[0] = finalSolution.dragViewX;
+                result[1] = finalSolution.dragViewY;
+                resultSpan[0] = finalSolution.dragViewSpanX;
+                resultSpan[1] = finalSolution.dragViewSpanY;
+            } else {
+                result[0] = result[1] = resultSpan[0] = resultSpan[1] = -1;
+            }
+            return result;
+        }
+
         boolean foundSolution = true;
         if (!DESTRUCTIVE_REORDER) {
             setUseTempCoords(true);
@@ -2630,11 +2669,11 @@ public class CellLayout extends ViewGroup {
                 if (!DESTRUCTIVE_REORDER &&
                         (mode == MODE_ON_DROP || mode == MODE_ON_DROP_EXTERNAL)) {
                     commitTempPlacement();
-                    completeAndClearReorderHintAnimations();
+                    completeAndClearReorderPreviewAnimations();
                     setItemPlacementDirty(false);
                 } else {
-                    beginOrAdjustHintAnimations(finalSolution, dragView,
-                            REORDER_ANIMATION_DURATION);
+                    beginOrAdjustReorderPreviewAnimations(finalSolution, dragView,
+                            REORDER_ANIMATION_DURATION,  ReorderPreviewAnimation.MODE_PREVIEW);
                 }
             }
         } else {
@@ -2661,6 +2700,7 @@ public class CellLayout extends ViewGroup {
         HashMap<View, CellAndSpan> map = new HashMap<View, CellAndSpan>();
         private HashMap<View, CellAndSpan> savedMap = new HashMap<View, CellAndSpan>();
         ArrayList<View> sortedViews = new ArrayList<View>();
+        ArrayList<View> intersectingViews;
         boolean isSolution = false;
         int dragViewX, dragViewY, dragViewSpanX, dragViewSpanY;
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bf4f561e0a..72399e4ece 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -216,7 +216,7 @@ public class Workspace extends SmoothPagedView
 
     // Variables relating to the creation of user folders by hovering shortcuts over shortcuts
     private static final int FOLDER_CREATION_TIMEOUT = 0;
-    private static final int REORDER_TIMEOUT = 250;
+    public static final int REORDER_TIMEOUT = 350;
     private final Alarm mFolderCreationAlarm = new Alarm();
     private final Alarm mReorderAlarm = new Alarm();
     private FolderRingAnimator mDragFolderRingAnimator = null;
@@ -2709,7 +2709,7 @@ public class Workspace extends SmoothPagedView
             }
 
             int[] resultSpan = new int[2];
-            mTargetCell = dropTargetLayout.createArea((int) mDragViewVisualCenter[0],
+            mTargetCell = dropTargetLayout.performReorder((int) mDragViewVisualCenter[0],
                     (int) mDragViewVisualCenter[1], minSpanX, minSpanY, spanX, spanY,
                     null, mTargetCell, resultSpan, CellLayout.MODE_ACCEPT_DROP);
             boolean foundCell = mTargetCell[0] >= 0 && mTargetCell[1] >= 0;
@@ -2935,7 +2935,7 @@ public class Workspace extends SmoothPagedView
                 }
 
                 int[] resultSpan = new int[2];
-                mTargetCell = dropTargetLayout.createArea((int) mDragViewVisualCenter[0],
+                mTargetCell = dropTargetLayout.performReorder((int) mDragViewVisualCenter[0],
                         (int) mDragViewVisualCenter[1], minSpanX, minSpanY, spanX, spanY, cell,
                         mTargetCell, resultSpan, CellLayout.MODE_ON_DROP);
 
@@ -3517,6 +3517,11 @@ public class Workspace extends SmoothPagedView
                     && !mReorderAlarm.alarmPending() && (mLastReorderX != reorderX ||
                     mLastReorderY != reorderY)) {
 
+                int[] resultSpan = new int[2];
+                mDragTargetLayout.performReorder((int) mDragViewVisualCenter[0],
+                        (int) mDragViewVisualCenter[1], minSpanX, minSpanY, item.spanX, item.spanY,
+                        child, mTargetCell, resultSpan, CellLayout.MODE_SHOW_REORDER_HINT);
+
                 // Otherwise, if we aren't adding to or creating a folder and there's no pending
                 // reorder, then we schedule a reorder
                 ReorderAlarmListener listener = new ReorderAlarmListener(mDragViewVisualCenter,
@@ -3621,7 +3626,7 @@ public class Workspace extends SmoothPagedView
             mLastReorderX = mTargetCell[0];
             mLastReorderY = mTargetCell[1];
 
-            mTargetCell = mDragTargetLayout.createArea((int) mDragViewVisualCenter[0],
+            mTargetCell = mDragTargetLayout.performReorder((int) mDragViewVisualCenter[0],
                 (int) mDragViewVisualCenter[1], minSpanX, minSpanY, spanX, spanY,
                 child, mTargetCell, resultSpan, CellLayout.MODE_DRAG_OVER);
 
@@ -3731,7 +3736,7 @@ public class Workspace extends SmoothPagedView
                     minSpanY = item.minSpanY;
                 }
                 int[] resultSpan = new int[2];
-                mTargetCell = cellLayout.createArea((int) mDragViewVisualCenter[0],
+                mTargetCell = cellLayout.performReorder((int) mDragViewVisualCenter[0],
                         (int) mDragViewVisualCenter[1], minSpanX, minSpanY, info.spanX, info.spanY,
                         null, mTargetCell, resultSpan, CellLayout.MODE_ON_DROP_EXTERNAL);
 
@@ -3823,7 +3828,7 @@ public class Workspace extends SmoothPagedView
 
             if (touchXY != null) {
                 // when dragging and dropping, just find the closest free spot
-                mTargetCell = cellLayout.createArea((int) mDragViewVisualCenter[0],
+                mTargetCell = cellLayout.performReorder((int) mDragViewVisualCenter[0],
                         (int) mDragViewVisualCenter[1], 1, 1, 1, 1,
                         null, mTargetCell, null, CellLayout.MODE_ON_DROP_EXTERNAL);
             } else {

From 8e88cb84781907afb7cca80581fea2277264fd2c Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 10 Dec 2013 16:59:20 +0100
Subject: [PATCH 059/147] Move wallpaper picker code to a separate directory

Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392
---
 Android.mk                                    |   4 ++
 CleanSpec.mk                                  |   2 +
 res/values-sw720dp/dimens.xml                 |   4 --
 res/values-sw720dp/styles.xml                 |   6 --
 res/values/colors.xml                         |   1 -
 res/values/dimens.xml                         |   5 --
 res/values/strings.xml                        |  32 -----------
 res/values/styles.xml                         |  17 ------
 .../drawable-hdpi/ic_actionbar_accept.png     | Bin
 .../drawable-hdpi/ic_images.png               | Bin
 .../drawable-hdpi/tile_picker_focused.9.png   | Bin
 .../drawable-hdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-hdpi/tile_picker_selected.9.png  | Bin
 .../drawable-hdpi/tile_shadow_bottom.9.png    | Bin
 .../drawable-hdpi/tile_shadow_top.9.png       | Bin
 .../drawable-mdpi/ic_actionbar_accept.png     | Bin
 .../drawable-mdpi/ic_images.png               | Bin
 .../drawable-mdpi/tile_picker_focused.9.png   | Bin
 .../drawable-mdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-mdpi/tile_picker_selected.9.png  | Bin
 .../drawable-mdpi/tile_shadow_bottom.9.png    | Bin
 .../drawable-mdpi/tile_shadow_top.9.png       | Bin
 .../drawable-xhdpi/ic_actionbar_accept.png    | Bin
 .../drawable-xhdpi/ic_images.png              | Bin
 .../drawable-xhdpi/tile_picker_focused.9.png  | Bin
 .../drawable-xhdpi/tile_picker_pressed.9.png  | Bin
 .../drawable-xhdpi/tile_picker_selected.9.png | Bin
 .../drawable-xhdpi/tile_shadow_bottom.9.png   | Bin
 .../drawable-xhdpi/tile_shadow_top.9.png      | Bin
 .../drawable-xxhdpi/ic_images.png             | Bin
 .../drawable-xxhdpi/tile_picker_focused.9.png | Bin
 .../drawable-xxhdpi/tile_picker_pressed.9.png | Bin
 .../tile_picker_selected.9.png                | Bin
 .../drawable-xxhdpi/tile_shadow_bottom.9.png  | Bin
 .../drawable-xxhdpi/tile_shadow_top.9.png     | Bin
 .../drawable/wallpaper_tile_fg.xml            |   0
 .../layout/actionbar_set_wallpaper.xml        |   0
 .../layout/wallpaper_cropper.xml              |   0
 .../layout/wallpaper_picker.xml               |   0
 .../wallpaper_picker_image_picker_item.xml    |   0
 .../layout/wallpaper_picker_item.xml          |   0
 .../wallpaper_picker_live_wallpaper_item.xml  |   0
 .../wallpaper_picker_third_party_item.xml     |   0
 .../menu/cab_delete_wallpapers.xml            |   0
 .../mipmap-hdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-mdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-xhdpi/ic_launcher_wallpaper.png    | Bin
 .../mipmap-xxhdpi/ic_launcher_wallpaper.png   | Bin
 .../values-nodpi/wallpapers.xml               |   0
 .../values-sw720dp/dimens.xml                 |  28 +++++++++
 .../values-sw720dp/styles.xml                 |  26 +++++++++
 wallpaper_picker_res/values/colors.xml        |  22 ++++++++
 wallpaper_picker_res/values/dimens.xml        |  22 ++++++++
 wallpaper_picker_res/values/strings.xml       |  53 ++++++++++++++++++
 wallpaper_picker_res/values/styles.xml        |  37 ++++++++++++
 .../android/util/Pools.java                   |   0
 .../android/gallery3d/common/BitmapUtils.java |   0
 .../com/android/gallery3d/common/Utils.java   |   0
 .../gallery3d/exif/ByteBufferInputStream.java |   0
 .../exif/CountedDataInputStream.java          |   0
 .../com/android/gallery3d/exif/ExifData.java  |   0
 .../android/gallery3d/exif/ExifInterface.java |   0
 .../exif/ExifInvalidFormatException.java      |   0
 .../android/gallery3d/exif/ExifModifier.java  |   0
 .../gallery3d/exif/ExifOutputStream.java      |   0
 .../android/gallery3d/exif/ExifParser.java    |   0
 .../android/gallery3d/exif/ExifReader.java    |   0
 .../com/android/gallery3d/exif/ExifTag.java   |   0
 .../com/android/gallery3d/exif/IfdData.java   |   0
 .../com/android/gallery3d/exif/IfdId.java     |   0
 .../android/gallery3d/exif/JpegHeader.java    |   0
 .../exif/OrderedDataOutputStream.java         |   0
 .../com/android/gallery3d/exif/Rational.java  |   0
 .../gallery3d/glrenderer/BasicTexture.java    |   0
 .../gallery3d/glrenderer/BitmapTexture.java   |   0
 .../gallery3d/glrenderer/GLCanvas.java        |   0
 .../gallery3d/glrenderer/GLES20Canvas.java    |   0
 .../gallery3d/glrenderer/GLES20IdImpl.java    |   0
 .../android/gallery3d/glrenderer/GLId.java    |   0
 .../android/gallery3d/glrenderer/GLPaint.java |   0
 .../gallery3d/glrenderer/RawTexture.java      |   0
 .../android/gallery3d/glrenderer/Texture.java |   0
 .../gallery3d/glrenderer/UploadedTexture.java |   0
 .../com/android/gallery3d/util/IntArray.java  |   0
 .../com/android/launcher3/CropView.java       |   0
 .../launcher3/WallpaperCropActivity.java      |   0
 .../launcher3/WallpaperPickerActivity.java    |   0
 .../photos/BitmapRegionTileSource.java        |   0
 .../photos/views/BlockingGLTextureView.java   |   0
 .../photos/views/TiledImageRenderer.java      |   0
 .../android/photos/views/TiledImageView.java  |   0
 91 files changed, 194 insertions(+), 65 deletions(-)
 rename {res => wallpaper_picker_res}/drawable-hdpi/ic_actionbar_accept.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/ic_actionbar_accept.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/ic_actionbar_accept.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable/wallpaper_tile_fg.xml (100%)
 rename {res => wallpaper_picker_res}/layout/actionbar_set_wallpaper.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_cropper.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_image_picker_item.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_item.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_live_wallpaper_item.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_third_party_item.xml (100%)
 rename {res => wallpaper_picker_res}/menu/cab_delete_wallpapers.xml (100%)
 rename {res => wallpaper_picker_res}/mipmap-hdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/mipmap-mdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/mipmap-xhdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/mipmap-xxhdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/values-nodpi/wallpapers.xml (100%)
 create mode 100644 wallpaper_picker_res/values-sw720dp/dimens.xml
 create mode 100644 wallpaper_picker_res/values-sw720dp/styles.xml
 create mode 100644 wallpaper_picker_res/values/colors.xml
 create mode 100644 wallpaper_picker_res/values/dimens.xml
 create mode 100644 wallpaper_picker_res/values/strings.xml
 create mode 100644 wallpaper_picker_res/values/styles.xml
 rename {src => wallpaper_picker_src}/android/util/Pools.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/common/BitmapUtils.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/common/Utils.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ByteBufferInputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/CountedDataInputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifData.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifInterface.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifInvalidFormatException.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifModifier.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifOutputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifParser.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifReader.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifTag.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/IfdData.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/IfdId.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/JpegHeader.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/OrderedDataOutputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/Rational.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/BasicTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/BitmapTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLCanvas.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLES20Canvas.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLES20IdImpl.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLId.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLPaint.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/RawTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/Texture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/UploadedTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/util/IntArray.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/CropView.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/WallpaperCropActivity.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/WallpaperPickerActivity.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/BitmapRegionTileSource.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/views/BlockingGLTextureView.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/views/TiledImageRenderer.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/views/TiledImageView.java (100%)

diff --git a/Android.mk b/Android.mk
index 3bd20a7cd1..6059a3f982 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,8 +26,12 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    $(call all-java-files-under, wallpaper_picker_src) \
     $(call all-renderscript-files-under, src) \
     $(call all-proto-files-under, protos)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c1323951be..b2c5266fa2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,6 +50,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 01227e1470..9ae155b3cc 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,10 +21,6 @@
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
-    <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->
-    <dimen name="wallpaper_chooser_grid_width">196dp</dimen>
-    <dimen name="wallpaper_chooser_grid_height">140dp</dimen>
-
     <!-- When dragging items on the workspace, the number of dps by which the position of
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 9738a124b7..e1f9ab45af 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -51,12 +51,6 @@
     </style>
 
 <!-- Workspace -->
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingStart">32dp</item>
         <item name="android:paddingEnd">32dp</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c073903803..ffee05f18e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,6 @@
     <color name="workspace_icon_text_color">#FFF</color>
 
     <color name="apps_customize_icon_text_color">#FFF</color>
-    <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
     <color name="folder_items_glow_color">#FFCCCCCC</color>
     <color name="outline_color">#FFFFFFFF</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c86fe314df..28b6a5bcce 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,11 +27,6 @@
     <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
     <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen>
 
-<!-- Wallpaper picker -->
-    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
-    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
-    <dimen name="wallpaperItemIconSize">32dp</dimen>
-
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
     <dimen name="folderClingMarginTop">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 30f4d8fd33..361be7b3cc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,38 +28,6 @@
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
     <string name="folder_name"></string>
-    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
-    <string name="wallpaper_instructions">Set wallpaper</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper picker cannot load it -->
-    <string name="image_load_fail">Coudn\'t load image</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper cropper cannot load it. The user will
-         usually see this when using another app and trying to set
-         an image as the wallpaper -->
-    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
-    <!-- Shown when wallpapers are selected in Wallpaper picker -->
-    <!-- String indicating how many media item(s) is(are) selected
-            eg. 1 selected [CHAR LIMIT=30] -->
-    <plurals name="number_of_items_selected">
-        <item quantity="zero">%1$d selected</item>
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
-         e.g. "Wallpaper 3 of 10" -->
-    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
-    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
-    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
-
-    <!-- Label on button to delete wallpaper(s) -->
-    <string name="wallpaper_delete">Delete</string>
-    <!-- Label on button in Wallpaper Picker to pick an image -->
-    <string name="pick_image">Pick image</string>
-    <!-- Option in "Select wallpaper from" dialog box -->
-    <string name="pick_wallpaper">Wallpapers</string>
-    <!-- Title of activity for cropping wallpapers -->
-    <string name="crop_wallpaper">Crop wallpaper</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
     <string name="activity_not_found">App isn\'t installed.</string>
     <!--  Labels for the tabs in the customize drawer -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8226915ddf..4aad5ebfaf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,23 +18,6 @@
 -->
 
 <resources>
-    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
-        <item name="android:displayOptions">showCustom</item>
-        <item name="android:background">#88000000</item>
-    </style>
-
-    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
     <style name="ClingButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/res/drawable-hdpi/ic_actionbar_accept.png b/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
similarity index 100%
rename from res/drawable-hdpi/ic_actionbar_accept.png
rename to wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
diff --git a/res/drawable-hdpi/ic_images.png b/wallpaper_picker_res/drawable-hdpi/ic_images.png
similarity index 100%
rename from res/drawable-hdpi/ic_images.png
rename to wallpaper_picker_res/drawable-hdpi/ic_images.png
diff --git a/res/drawable-hdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
diff --git a/res/drawable-hdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-hdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
diff --git a/res/drawable-hdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-hdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
diff --git a/res/drawable-mdpi/ic_actionbar_accept.png b/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
similarity index 100%
rename from res/drawable-mdpi/ic_actionbar_accept.png
rename to wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
diff --git a/res/drawable-mdpi/ic_images.png b/wallpaper_picker_res/drawable-mdpi/ic_images.png
similarity index 100%
rename from res/drawable-mdpi/ic_images.png
rename to wallpaper_picker_res/drawable-mdpi/ic_images.png
diff --git a/res/drawable-mdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
diff --git a/res/drawable-mdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-mdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
diff --git a/res/drawable-mdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-mdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
diff --git a/res/drawable-xhdpi/ic_actionbar_accept.png b/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
similarity index 100%
rename from res/drawable-xhdpi/ic_actionbar_accept.png
rename to wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
diff --git a/res/drawable-xhdpi/ic_images.png b/wallpaper_picker_res/drawable-xhdpi/ic_images.png
similarity index 100%
rename from res/drawable-xhdpi/ic_images.png
rename to wallpaper_picker_res/drawable-xhdpi/ic_images.png
diff --git a/res/drawable-xhdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
diff --git a/res/drawable-xhdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-xhdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
diff --git a/res/drawable-xhdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-xhdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
diff --git a/res/drawable-xxhdpi/ic_images.png b/wallpaper_picker_res/drawable-xxhdpi/ic_images.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_images.png
rename to wallpaper_picker_res/drawable-xxhdpi/ic_images.png
diff --git a/res/drawable-xxhdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
diff --git a/res/drawable-xxhdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-xxhdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
diff --git a/res/drawable-xxhdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-xxhdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
diff --git a/res/drawable/wallpaper_tile_fg.xml b/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
similarity index 100%
rename from res/drawable/wallpaper_tile_fg.xml
rename to wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
diff --git a/res/layout/actionbar_set_wallpaper.xml b/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
similarity index 100%
rename from res/layout/actionbar_set_wallpaper.xml
rename to wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
diff --git a/res/layout/wallpaper_cropper.xml b/wallpaper_picker_res/layout/wallpaper_cropper.xml
similarity index 100%
rename from res/layout/wallpaper_cropper.xml
rename to wallpaper_picker_res/layout/wallpaper_cropper.xml
diff --git a/res/layout/wallpaper_picker.xml b/wallpaper_picker_res/layout/wallpaper_picker.xml
similarity index 100%
rename from res/layout/wallpaper_picker.xml
rename to wallpaper_picker_res/layout/wallpaper_picker.xml
diff --git a/res/layout/wallpaper_picker_image_picker_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_image_picker_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
diff --git a/res/layout/wallpaper_picker_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_item.xml
diff --git a/res/layout/wallpaper_picker_live_wallpaper_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_live_wallpaper_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
diff --git a/res/layout/wallpaper_picker_third_party_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_third_party_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
diff --git a/res/menu/cab_delete_wallpapers.xml b/wallpaper_picker_res/menu/cab_delete_wallpapers.xml
similarity index 100%
rename from res/menu/cab_delete_wallpapers.xml
rename to wallpaper_picker_res/menu/cab_delete_wallpapers.xml
diff --git a/res/mipmap-hdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
diff --git a/res/mipmap-mdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
diff --git a/res/values-nodpi/wallpapers.xml b/wallpaper_picker_res/values-nodpi/wallpapers.xml
similarity index 100%
rename from res/values-nodpi/wallpapers.xml
rename to wallpaper_picker_res/values-nodpi/wallpapers.xml
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/wallpaper_picker_res/values-sw720dp/dimens.xml
new file mode 100644
index 0000000000..9ae155b3cc
--- /dev/null
+++ b/wallpaper_picker_res/values-sw720dp/dimens.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="app_icon_size">72dp</dimen>
+
+<!-- QSB -->
+    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
+
+    <!-- When dragging items on the workspace, the number of dps by which the position of
+     the drag view should be offset from the position of the original view. -->
+    <dimen name="dragViewOffsetX">0dp</dimen>
+    <dimen name="dragViewOffsetY">0dp</dimen>
+</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/wallpaper_picker_res/values-sw720dp/styles.xml
new file mode 100644
index 0000000000..91078517db
--- /dev/null
+++ b/wallpaper_picker_res/values-sw720dp/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+</resources>
diff --git a/wallpaper_picker_res/values/colors.xml b/wallpaper_picker_res/values/colors.xml
new file mode 100644
index 0000000000..adae7cff6f
--- /dev/null
+++ b/wallpaper_picker_res/values/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2013, 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 
+**
+**     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 
+** limitations under the License.
+*/
+-->
+<resources>
+    <color name="wallpaper_picker_translucent_gray">#66000000</color>
+</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/wallpaper_picker_res/values/dimens.xml
new file mode 100644
index 0000000000..0447c6d1f7
--- /dev/null
+++ b/wallpaper_picker_res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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
+  
+          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
+     limitations under the License.
+-->
+
+<resources>
+<!-- Wallpaper picker -->
+    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
+    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
+    <dimen name="wallpaperItemIconSize">32dp</dimen>
+</resources>
diff --git a/wallpaper_picker_res/values/strings.xml b/wallpaper_picker_res/values/strings.xml
new file mode 100644
index 0000000000..1ee3513f90
--- /dev/null
+++ b/wallpaper_picker_res/values/strings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+    <string name="wallpaper_instructions">Set wallpaper</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper picker cannot load it -->
+    <string name="image_load_fail">Coudn\'t load image</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
+    <!-- Shown when wallpapers are selected in Wallpaper picker -->
+    <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+    <plurals name="number_of_items_selected">
+        <item quantity="zero">%1$d selected</item>
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
+         e.g. "Wallpaper 3 of 10" -->
+    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
+    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
+    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
+
+    <!-- Label on button to delete wallpaper(s) -->
+    <string name="wallpaper_delete">Delete</string>
+    <!-- Label on button in Wallpaper Picker to pick an image -->
+    <string name="pick_image">Pick image</string>
+    <!-- Option in "Select wallpaper from" dialog box -->
+    <string name="pick_wallpaper">Wallpapers</string>
+    <!-- Title of activity for cropping wallpapers -->
+    <string name="crop_wallpaper">Crop wallpaper</string>
+</resources>
diff --git a/wallpaper_picker_res/values/styles.xml b/wallpaper_picker_res/values/styles.xml
new file mode 100644
index 0000000000..0e48ddac43
--- /dev/null
+++ b/wallpaper_picker_res/values/styles.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
+    </style>
+
+    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+</resources>
diff --git a/src/android/util/Pools.java b/wallpaper_picker_src/android/util/Pools.java
similarity index 100%
rename from src/android/util/Pools.java
rename to wallpaper_picker_src/android/util/Pools.java
diff --git a/src/com/android/gallery3d/common/BitmapUtils.java b/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
similarity index 100%
rename from src/com/android/gallery3d/common/BitmapUtils.java
rename to wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
diff --git a/src/com/android/gallery3d/common/Utils.java b/wallpaper_picker_src/com/android/gallery3d/common/Utils.java
similarity index 100%
rename from src/com/android/gallery3d/common/Utils.java
rename to wallpaper_picker_src/com/android/gallery3d/common/Utils.java
diff --git a/src/com/android/gallery3d/exif/ByteBufferInputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ByteBufferInputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
diff --git a/src/com/android/gallery3d/exif/CountedDataInputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/CountedDataInputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
diff --git a/src/com/android/gallery3d/exif/ExifData.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifData.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
diff --git a/src/com/android/gallery3d/exif/ExifInterface.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifInterface.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
diff --git a/src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifInvalidFormatException.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
diff --git a/src/com/android/gallery3d/exif/ExifModifier.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifModifier.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
diff --git a/src/com/android/gallery3d/exif/ExifOutputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifOutputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
diff --git a/src/com/android/gallery3d/exif/ExifParser.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifParser.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
diff --git a/src/com/android/gallery3d/exif/ExifReader.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifReader.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
diff --git a/src/com/android/gallery3d/exif/ExifTag.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifTag.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
diff --git a/src/com/android/gallery3d/exif/IfdData.java b/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
similarity index 100%
rename from src/com/android/gallery3d/exif/IfdData.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
diff --git a/src/com/android/gallery3d/exif/IfdId.java b/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
similarity index 100%
rename from src/com/android/gallery3d/exif/IfdId.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
diff --git a/src/com/android/gallery3d/exif/JpegHeader.java b/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
similarity index 100%
rename from src/com/android/gallery3d/exif/JpegHeader.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
diff --git a/src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/OrderedDataOutputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
diff --git a/src/com/android/gallery3d/exif/Rational.java b/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
similarity index 100%
rename from src/com/android/gallery3d/exif/Rational.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
diff --git a/src/com/android/gallery3d/glrenderer/BasicTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/BasicTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
diff --git a/src/com/android/gallery3d/glrenderer/BitmapTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/BitmapTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
diff --git a/src/com/android/gallery3d/glrenderer/GLCanvas.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLCanvas.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
diff --git a/src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLES20Canvas.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
diff --git a/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
diff --git a/src/com/android/gallery3d/glrenderer/GLId.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLId.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
diff --git a/src/com/android/gallery3d/glrenderer/GLPaint.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLPaint.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
diff --git a/src/com/android/gallery3d/glrenderer/RawTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/RawTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
diff --git a/src/com/android/gallery3d/glrenderer/Texture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/Texture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/UploadedTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
diff --git a/src/com/android/gallery3d/util/IntArray.java b/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
similarity index 100%
rename from src/com/android/gallery3d/util/IntArray.java
rename to wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
diff --git a/src/com/android/launcher3/CropView.java b/wallpaper_picker_src/com/android/launcher3/CropView.java
similarity index 100%
rename from src/com/android/launcher3/CropView.java
rename to wallpaper_picker_src/com/android/launcher3/CropView.java
diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
similarity index 100%
rename from src/com/android/launcher3/WallpaperCropActivity.java
rename to wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
similarity index 100%
rename from src/com/android/launcher3/WallpaperPickerActivity.java
rename to wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
diff --git a/src/com/android/photos/BitmapRegionTileSource.java b/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
similarity index 100%
rename from src/com/android/photos/BitmapRegionTileSource.java
rename to wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
diff --git a/src/com/android/photos/views/BlockingGLTextureView.java b/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
similarity index 100%
rename from src/com/android/photos/views/BlockingGLTextureView.java
rename to wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
diff --git a/src/com/android/photos/views/TiledImageRenderer.java b/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
similarity index 100%
rename from src/com/android/photos/views/TiledImageRenderer.java
rename to wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
diff --git a/src/com/android/photos/views/TiledImageView.java b/wallpaper_picker_src/com/android/photos/views/TiledImageView.java
similarity index 100%
rename from src/com/android/photos/views/TiledImageView.java
rename to wallpaper_picker_src/com/android/photos/views/TiledImageView.java

From 7aff399974c756930070d82d7b2df88f125dacd6 Mon Sep 17 00:00:00 2001
From: Derek Prothro <dprothro@google.com>
Date: Tue, 10 Dec 2013 14:00:37 -0500
Subject: [PATCH 060/147] Bind the workspace synchronously if started on -1
 screen.

Previously, LoaderTask would be run asynchronously to bind
the workspace when started on -1 which would cause the user's
wallpaper to briefly flash when rotating the device on -1.

Bug: 11802691
Change-Id: I3a1a7a32fa28a81e041a283a93d808d5a8884133
---
 src/com/android/launcher3/Launcher.java      |  4 ++--
 src/com/android/launcher3/LauncherModel.java | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e2301ba699..9aaee5aaf9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -456,7 +456,7 @@ public class Launcher extends Activity
             if (DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE || sPausedFromUserAction) {
                 // If the user leaves launcher, then we should just load items asynchronously when
                 // they return.
-                mModel.startLoader(true, -1);
+                mModel.startLoader(true, PagedView.INVALID_RESTORE_PAGE);
             } else {
                 // We only load the page synchronously if the user rotates (or triggers a
                 // configuration change) while launcher is in the foreground
@@ -914,7 +914,7 @@ public class Launcher extends Activity
         sPausedFromUserAction = false;
         if (mRestoring || mOnResumeNeedsLoad) {
             mWorkspaceLoading = true;
-            mModel.startLoader(true, -1);
+            mModel.startLoader(true, PagedView.INVALID_RESTORE_PAGE);
             mRestoring = false;
             mOnResumeNeedsLoad = false;
         }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index a69617ac77..03511a4a6d 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -75,6 +75,7 @@ public class LauncherModel extends BroadcastReceiver {
     public static final boolean UPGRADE_USE_MORE_APPS_FOLDER = false;
 
     private static final int ITEMS_CHUNK = 6; // batch size for the workspace icons
+    private static final long INVALID_SCREEN_ID = -1L;
     private final boolean mAppsCanBeOnRemoveableStorage;
 
     private final LauncherAppState mApp;
@@ -1158,7 +1159,7 @@ public class LauncherModel extends BroadcastReceiver {
             }
         }
         if (runLoader) {
-            startLoader(false, -1);
+            startLoader(false, PagedView.INVALID_RESTORE_PAGE);
         }
     }
 
@@ -1192,7 +1193,8 @@ public class LauncherModel extends BroadcastReceiver {
                 // also, don't downgrade isLaunching if we're already running
                 isLaunching = isLaunching || stopLoaderLocked();
                 mLoaderTask = new LoaderTask(mApp.getContext(), isLaunching);
-                if (synchronousBindPage > -1 && mAllAppsLoaded && mWorkspaceLoaded) {
+                if (synchronousBindPage != PagedView.INVALID_RESTORE_PAGE
+                        && mAllAppsLoaded && mWorkspaceLoaded) {
                     mLoaderTask.runBindSynchronousPage(synchronousBindPage);
                 } else {
                     sWorkerThread.setPriority(Thread.NORM_PRIORITY);
@@ -1360,7 +1362,7 @@ public class LauncherModel extends BroadcastReceiver {
         }
 
         void runBindSynchronousPage(int synchronousBindPage) {
-            if (synchronousBindPage < 0) {
+            if (synchronousBindPage == PagedView.INVALID_RESTORE_PAGE) {
                 // Ensure that we have a valid page index to load synchronously
                 throw new RuntimeException("Should not call runBindSynchronousPage() without " +
                         "valid page index");
@@ -2245,16 +2247,17 @@ public class LauncherModel extends BroadcastReceiver {
                 orderedScreenIds.addAll(sBgWorkspaceScreens);
             }
 
-            final boolean isLoadingSynchronously = (synchronizeBindPage > -1);
+            final boolean isLoadingSynchronously =
+                    synchronizeBindPage != PagedView.INVALID_RESTORE_PAGE;
             int currScreen = isLoadingSynchronously ? synchronizeBindPage :
                 oldCallbacks.getCurrentWorkspaceScreen();
             if (currScreen >= orderedScreenIds.size()) {
                 // There may be no workspace screens (just hotseat items and an empty page).
-                currScreen = -1;
+                currScreen = PagedView.INVALID_RESTORE_PAGE;
             }
             final int currentScreen = currScreen;
-            final long currentScreenId =
-                    currentScreen < 0 ? -1 : orderedScreenIds.get(currentScreen);
+            final long currentScreenId = currentScreen < 0
+                    ? INVALID_SCREEN_ID : orderedScreenIds.get(currentScreen);
 
             // Load all the items that are on the current page first (and in the process, unbind
             // all the existing workspace items before we call startBinding() below.
@@ -2299,7 +2302,7 @@ public class LauncherModel extends BroadcastReceiver {
                 r = new Runnable() {
                     public void run() {
                         Callbacks callbacks = tryGetCallbacks(oldCallbacks);
-                        if (callbacks != null && currentScreen >= 0) {
+                        if (callbacks != null && currentScreen != PagedView.INVALID_RESTORE_PAGE) {
                             callbacks.onPageBoundSynchronously(currentScreen);
                         }
                     }

From 295ae18d0fa7c102c50cf95a2ea09e7f2e9b1539 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 10 Dec 2013 16:05:47 -0500
Subject: [PATCH 061/147] Size hotseat data structure appropriately.

Bug: 12070213
Change-Id: I4df2f4bcc71bb4077c62cae91ed844ea8c43d421
---
 src/com/android/launcher3/Launcher.java      | 13 +++++++++--
 src/com/android/launcher3/LauncherModel.java | 24 +++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e2301ba699..fa3a5ced9d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4576,13 +4576,22 @@ public class Launcher extends Activity
     }
 
     public static void addDumpLog(String tag, String log, boolean debugLog) {
+        addDumpLog(tag, log, null, debugLog);
+    }
+
+    public static void addDumpLog(String tag, String log, Exception e, boolean debugLog) {
         if (debugLog) {
-            Log.d(tag, log);
+            if (e != null) {
+                Log.d(tag, log, e);
+            } else {
+                Log.d(tag, log);
+            }
         }
         if (DEBUG_DUMP_LOG) {
             sDateStamp.setTime(System.currentTimeMillis());
             synchronized (sDumpLogs) {
-                sDumpLogs.add(sDateFormat.format(sDateStamp) + ": " + tag + ", " + log);
+                sDumpLogs.add(sDateFormat.format(sDateStamp) + ": " + tag + ", " + log
+                    + (e == null ? "" : (", Exception: " + e)));
             }
         }
     }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index a69617ac77..3e6cf03c8f 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1542,8 +1542,8 @@ public class LauncherModel extends BroadcastReceiver {
                                            AtomicBoolean deleteOnItemOverlap) {
             LauncherAppState app = LauncherAppState.getInstance();
             DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
-            int countX = (int) grid.numColumns;
-            int countY = (int) grid.numRows;
+            final int countX = (int) grid.numColumns;
+            final int countY = (int) grid.numRows;
 
             long containerIndex = item.screenId;
             if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
@@ -1551,21 +1551,29 @@ public class LauncherModel extends BroadcastReceiver {
                 if (mCallbacks == null ||
                         mCallbacks.get().isAllAppsButtonRank((int) item.screenId)) {
                     deleteOnItemOverlap.set(true);
+                    Log.e(TAG, "Error loading shortcut into hotseat " + item
+                            + " into position (" + item.screenId + ":" + item.cellX + ","
+                            + item.cellY + ") occupied by all apps");
                     return false;
                 }
 
-                if (occupied.containsKey(LauncherSettings.Favorites.CONTAINER_HOTSEAT)) {
-                    if (occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT)
-                            [(int) item.screenId][0] != null) {
+                final ItemInfo[][] hotseatItems =
+                        occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT);
+
+                if (hotseatItems != null) {
+                    if (hotseatItems[(int) item.screenId][0] != null) {
                         Log.e(TAG, "Error loading shortcut into hotseat " + item
                                 + " into position (" + item.screenId + ":" + item.cellX + ","
                                 + item.cellY + ") occupied by "
                                 + occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT)
                                 [(int) item.screenId][0]);
                             return false;
+                    } else {
+                        hotseatItems[(int) item.screenId][0] = item;
+                        return true;
                     }
                 } else {
-                    ItemInfo[][] items = new ItemInfo[countX + 1][countY + 1];
+                    final ItemInfo[][] items = new ItemInfo[(int) grid.numHotseatIcons + 1][1];
                     items[(int) item.screenId][0] = item;
                     occupied.put((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT, items);
                     return true;
@@ -1580,7 +1588,7 @@ public class LauncherModel extends BroadcastReceiver {
                 occupied.put(item.screenId, items);
             }
 
-            ItemInfo[][] screens = occupied.get(item.screenId);
+            final ItemInfo[][] screens = occupied.get(item.screenId);
             // Check if any workspace icons overlap with each other
             for (int x = item.cellX; x < (item.cellX+item.spanX); x++) {
                 for (int y = item.cellY; y < (item.cellY+item.spanY); y++) {
@@ -1911,7 +1919,7 @@ public class LauncherModel extends BroadcastReceiver {
                                 break;
                             }
                         } catch (Exception e) {
-                            Launcher.addDumpLog(TAG, "Desktop items loading interrupted: " + e, true);
+                            Launcher.addDumpLog(TAG, "Desktop items loading interrupted", e, true);
                         }
                     }
                 } finally {

From ba2923a3912f266c8fa1691858db29c2ce597928 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Tue, 10 Dec 2013 15:48:47 -0500
Subject: [PATCH 062/147] expose the protoutil for launcher as an executable
 script

Change-Id: Ie990262534d85b118c165589ecee55d64f3a58cc
---
 Android.mk                                  | 24 +++++-
 util/com/android/launcher3/DecoderRing.java |  5 +-
 util/etc/launcher_protoutil                 | 83 +++++++++++++++++++++
 util/etc/manifest.txt                       |  1 +
 4 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 util/etc/launcher_protoutil
 create mode 100644 util/etc/manifest.txt

diff --git a/Android.mk b/Android.mk
index 6059a3f982..840b161c56 100644
--- a/Android.mk
+++ b/Android.mk
@@ -61,6 +61,28 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := protoutil
+LOCAL_MODULE := launcher_protoutil_lib
+LOCAL_IS_HOST_MODULE := true
+LOCAL_JAR_MANIFEST := util/etc/manifest.txt
+LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano
 
 include $(BUILD_HOST_JAVA_LIBRARY)
+
+#
+# Protocol Buffer Debug Utility Wrapper Script
+#
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := launcher_protoutil
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): launcher_protoutil_lib
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
+	@echo "Copy: $(PRIVATE_MODULE) ($@)"
+	$(copy-file-to-new-target)
+	$(hide) chmod 755 $@
+
+INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
diff --git a/util/com/android/launcher3/DecoderRing.java b/util/com/android/launcher3/DecoderRing.java
index 1d9e0defb1..bd0275e5fa 100644
--- a/util/com/android/launcher3/DecoderRing.java
+++ b/util/com/android/launcher3/DecoderRing.java
@@ -49,7 +49,7 @@ class DecoderRing {
     public static void main(String[ ] args)
             throws Exception {
         File source = null;
-        Class type = Key.class;
+        Class type = null;
         int skip = 0;
 
         for (int i = 0; i < args.length; i++) {
@@ -79,6 +79,9 @@ class DecoderRing {
             }
         }
 
+        if (type == null) {
+            usage(args);
+        }
 
         // read in the bytes
         ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
diff --git a/util/etc/launcher_protoutil b/util/etc/launcher_protoutil
new file mode 100644
index 0000000000..833b5835e8
--- /dev/null
+++ b/util/etc/launcher_protoutil
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 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
+#
+#     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
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+    newProg=`/bin/ls -ld "${prog}"`
+    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+    if expr "x${newProg}" : 'x/' >/dev/null; then
+        prog="${newProg}"
+    else
+        progdir=`dirname "${prog}"`
+        prog="${progdir}/${newProg}"
+    fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+jarfile=launcher_protoutil_lib.jar
+libdir="$progdir"
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    # set jar location for the Android tree case
+    libdir=`dirname "$progdir"`/framework
+fi
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    echo `basename "$prog"`": can't find $jarfile"
+    exit 1
+fi
+
+# By default, give decoder a max heap size of 1 gig. This can be overridden
+# by using a "-J" option (see below).
+defaultMx="-Xmx1024M"
+
+# The following will extract any initial parameters of the form
+# "-J<stuff>" from the command line and pass them to the Java
+# invocation (instead of to the decoder). This makes it possible for
+# you to add a command-line parameter such as "-JXmx256M" in your
+# scripts, for example. "java" (with no args) and "java -X" give a
+# summary of available options.
+
+javaOpts=""
+
+while expr "x$1" : 'x-J' >/dev/null; do
+    opt=`expr "x$1" : 'x-J\(.*\)'`
+    javaOpts="${javaOpts} -${opt}"
+    if expr "x${opt}" : "xXmx[0-9]" >/dev/null; then
+        defaultMx="no"
+    fi
+    shift
+done
+
+if [ "${defaultMx}" != "no" ]; then
+    javaOpts="${javaOpts} ${defaultMx}"
+fi
+
+if [ "$OSTYPE" = "cygwin" ]; then
+    # For Cygwin, convert the jarfile path into native Windows style.
+    jarpath=`cygpath -w "$libdir/$jarfile"`
+else
+    jarpath="$libdir/$jarfile"
+fi
+
+exec java $javaOpts -jar "$jarpath" "$@"
diff --git a/util/etc/manifest.txt b/util/etc/manifest.txt
new file mode 100644
index 0000000000..84842ed539
--- /dev/null
+++ b/util/etc/manifest.txt
@@ -0,0 +1 @@
+Main-Class: com.android.launcher3.DecoderRing

From 39de459a8621abfc91382ce7b4cdd37d09aaac12 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 10 Dec 2013 23:47:28 +0100
Subject: [PATCH 063/147] Revert "Move wallpaper picker code to a separate
 directory"

This reverts commit 8e88cb84781907afb7cca80581fea2277264fd2c.
---
 Android.mk                                    |   4 --
 CleanSpec.mk                                  |   2 -
 .../drawable-hdpi/ic_actionbar_accept.png     | Bin
 .../drawable-hdpi/ic_images.png               | Bin
 .../drawable-hdpi/tile_picker_focused.9.png   | Bin
 .../drawable-hdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-hdpi/tile_picker_selected.9.png  | Bin
 .../drawable-hdpi/tile_shadow_bottom.9.png    | Bin
 .../drawable-hdpi/tile_shadow_top.9.png       | Bin
 .../drawable-mdpi/ic_actionbar_accept.png     | Bin
 .../drawable-mdpi/ic_images.png               | Bin
 .../drawable-mdpi/tile_picker_focused.9.png   | Bin
 .../drawable-mdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-mdpi/tile_picker_selected.9.png  | Bin
 .../drawable-mdpi/tile_shadow_bottom.9.png    | Bin
 .../drawable-mdpi/tile_shadow_top.9.png       | Bin
 .../drawable-xhdpi/ic_actionbar_accept.png    | Bin
 .../drawable-xhdpi/ic_images.png              | Bin
 .../drawable-xhdpi/tile_picker_focused.9.png  | Bin
 .../drawable-xhdpi/tile_picker_pressed.9.png  | Bin
 .../drawable-xhdpi/tile_picker_selected.9.png | Bin
 .../drawable-xhdpi/tile_shadow_bottom.9.png   | Bin
 .../drawable-xhdpi/tile_shadow_top.9.png      | Bin
 .../drawable-xxhdpi/ic_images.png             | Bin
 .../drawable-xxhdpi/tile_picker_focused.9.png | Bin
 .../drawable-xxhdpi/tile_picker_pressed.9.png | Bin
 .../tile_picker_selected.9.png                | Bin
 .../drawable-xxhdpi/tile_shadow_bottom.9.png  | Bin
 .../drawable-xxhdpi/tile_shadow_top.9.png     | Bin
 .../drawable/wallpaper_tile_fg.xml            |   0
 .../layout/actionbar_set_wallpaper.xml        |   0
 .../layout/wallpaper_cropper.xml              |   0
 .../layout/wallpaper_picker.xml               |   0
 .../wallpaper_picker_image_picker_item.xml    |   0
 .../layout/wallpaper_picker_item.xml          |   0
 .../wallpaper_picker_live_wallpaper_item.xml  |   0
 .../wallpaper_picker_third_party_item.xml     |   0
 .../menu/cab_delete_wallpapers.xml            |   0
 .../mipmap-hdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-mdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-xhdpi/ic_launcher_wallpaper.png    | Bin
 .../mipmap-xxhdpi/ic_launcher_wallpaper.png   | Bin
 .../values-nodpi/wallpapers.xml               |   0
 res/values-sw720dp/dimens.xml                 |   4 ++
 res/values-sw720dp/styles.xml                 |   6 ++
 res/values/colors.xml                         |   1 +
 res/values/dimens.xml                         |   5 ++
 res/values/strings.xml                        |  32 +++++++++++
 res/values/styles.xml                         |  17 ++++++
 .../android/util/Pools.java                   |   0
 .../android/gallery3d/common/BitmapUtils.java |   0
 .../com/android/gallery3d/common/Utils.java   |   0
 .../gallery3d/exif/ByteBufferInputStream.java |   0
 .../exif/CountedDataInputStream.java          |   0
 .../com/android/gallery3d/exif/ExifData.java  |   0
 .../android/gallery3d/exif/ExifInterface.java |   0
 .../exif/ExifInvalidFormatException.java      |   0
 .../android/gallery3d/exif/ExifModifier.java  |   0
 .../gallery3d/exif/ExifOutputStream.java      |   0
 .../android/gallery3d/exif/ExifParser.java    |   0
 .../android/gallery3d/exif/ExifReader.java    |   0
 .../com/android/gallery3d/exif/ExifTag.java   |   0
 .../com/android/gallery3d/exif/IfdData.java   |   0
 .../com/android/gallery3d/exif/IfdId.java     |   0
 .../android/gallery3d/exif/JpegHeader.java    |   0
 .../exif/OrderedDataOutputStream.java         |   0
 .../com/android/gallery3d/exif/Rational.java  |   0
 .../gallery3d/glrenderer/BasicTexture.java    |   0
 .../gallery3d/glrenderer/BitmapTexture.java   |   0
 .../gallery3d/glrenderer/GLCanvas.java        |   0
 .../gallery3d/glrenderer/GLES20Canvas.java    |   0
 .../gallery3d/glrenderer/GLES20IdImpl.java    |   0
 .../android/gallery3d/glrenderer/GLId.java    |   0
 .../android/gallery3d/glrenderer/GLPaint.java |   0
 .../gallery3d/glrenderer/RawTexture.java      |   0
 .../android/gallery3d/glrenderer/Texture.java |   0
 .../gallery3d/glrenderer/UploadedTexture.java |   0
 .../com/android/gallery3d/util/IntArray.java  |   0
 .../com/android/launcher3/CropView.java       |   0
 .../launcher3/WallpaperCropActivity.java      |   0
 .../launcher3/WallpaperPickerActivity.java    |   0
 .../photos/BitmapRegionTileSource.java        |   0
 .../photos/views/BlockingGLTextureView.java   |   0
 .../photos/views/TiledImageRenderer.java      |   0
 .../android/photos/views/TiledImageView.java  |   0
 .../values-sw720dp/dimens.xml                 |  28 ---------
 .../values-sw720dp/styles.xml                 |  26 ---------
 wallpaper_picker_res/values/colors.xml        |  22 --------
 wallpaper_picker_res/values/dimens.xml        |  22 --------
 wallpaper_picker_res/values/strings.xml       |  53 ------------------
 wallpaper_picker_res/values/styles.xml        |  37 ------------
 91 files changed, 65 insertions(+), 194 deletions(-)
 rename {wallpaper_picker_res => res}/drawable-hdpi/ic_actionbar_accept.png (100%)
 rename {wallpaper_picker_res => res}/drawable-hdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => res}/drawable-hdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-hdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-hdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-hdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-hdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/ic_actionbar_accept.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-mdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/ic_actionbar_accept.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xhdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xxhdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xxhdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xxhdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xxhdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xxhdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable-xxhdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => res}/drawable/wallpaper_tile_fg.xml (100%)
 rename {wallpaper_picker_res => res}/layout/actionbar_set_wallpaper.xml (100%)
 rename {wallpaper_picker_res => res}/layout/wallpaper_cropper.xml (100%)
 rename {wallpaper_picker_res => res}/layout/wallpaper_picker.xml (100%)
 rename {wallpaper_picker_res => res}/layout/wallpaper_picker_image_picker_item.xml (100%)
 rename {wallpaper_picker_res => res}/layout/wallpaper_picker_item.xml (100%)
 rename {wallpaper_picker_res => res}/layout/wallpaper_picker_live_wallpaper_item.xml (100%)
 rename {wallpaper_picker_res => res}/layout/wallpaper_picker_third_party_item.xml (100%)
 rename {wallpaper_picker_res => res}/menu/cab_delete_wallpapers.xml (100%)
 rename {wallpaper_picker_res => res}/mipmap-hdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => res}/mipmap-mdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => res}/mipmap-xhdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => res}/mipmap-xxhdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => res}/values-nodpi/wallpapers.xml (100%)
 rename {wallpaper_picker_src => src}/android/util/Pools.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/common/BitmapUtils.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/common/Utils.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ByteBufferInputStream.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/CountedDataInputStream.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifData.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifInterface.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifInvalidFormatException.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifModifier.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifOutputStream.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifParser.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifReader.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/ExifTag.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/IfdData.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/IfdId.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/JpegHeader.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/OrderedDataOutputStream.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/exif/Rational.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/BasicTexture.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/BitmapTexture.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/GLCanvas.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/GLES20Canvas.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/GLES20IdImpl.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/GLId.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/GLPaint.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/RawTexture.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/Texture.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/glrenderer/UploadedTexture.java (100%)
 rename {wallpaper_picker_src => src}/com/android/gallery3d/util/IntArray.java (100%)
 rename {wallpaper_picker_src => src}/com/android/launcher3/CropView.java (100%)
 rename {wallpaper_picker_src => src}/com/android/launcher3/WallpaperCropActivity.java (100%)
 rename {wallpaper_picker_src => src}/com/android/launcher3/WallpaperPickerActivity.java (100%)
 rename {wallpaper_picker_src => src}/com/android/photos/BitmapRegionTileSource.java (100%)
 rename {wallpaper_picker_src => src}/com/android/photos/views/BlockingGLTextureView.java (100%)
 rename {wallpaper_picker_src => src}/com/android/photos/views/TiledImageRenderer.java (100%)
 rename {wallpaper_picker_src => src}/com/android/photos/views/TiledImageView.java (100%)
 delete mode 100644 wallpaper_picker_res/values-sw720dp/dimens.xml
 delete mode 100644 wallpaper_picker_res/values-sw720dp/styles.xml
 delete mode 100644 wallpaper_picker_res/values/colors.xml
 delete mode 100644 wallpaper_picker_res/values/dimens.xml
 delete mode 100644 wallpaper_picker_res/values/strings.xml
 delete mode 100644 wallpaper_picker_res/values/styles.xml

diff --git a/Android.mk b/Android.mk
index 6059a3f982..3bd20a7cd1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,12 +26,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, wallpaper_picker_src) \
     $(call all-renderscript-files-under, src) \
     $(call all-proto-files-under, protos)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b2c5266fa2..c1323951be 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,8 +50,6 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png b/res/drawable-hdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
rename to res/drawable-hdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_images.png b/res/drawable-hdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/ic_images.png
rename to res/drawable-hdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png b/res/drawable-hdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
rename to res/drawable-hdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png b/res/drawable-hdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
rename to res/drawable-hdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png b/res/drawable-hdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
rename to res/drawable-hdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png b/res/drawable-hdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
rename to res/drawable-hdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png b/res/drawable-hdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
rename to res/drawable-hdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png b/res/drawable-mdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
rename to res/drawable-mdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_images.png b/res/drawable-mdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/ic_images.png
rename to res/drawable-mdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png b/res/drawable-mdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
rename to res/drawable-mdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png b/res/drawable-mdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
rename to res/drawable-mdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png b/res/drawable-mdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
rename to res/drawable-mdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png b/res/drawable-mdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
rename to res/drawable-mdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png b/res/drawable-mdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
rename to res/drawable-mdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png b/res/drawable-xhdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
rename to res/drawable-xhdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_images.png b/res/drawable-xhdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/ic_images.png
rename to res/drawable-xhdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png b/res/drawable-xhdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
rename to res/drawable-xhdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png b/res/drawable-xhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
rename to res/drawable-xhdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png b/res/drawable-xhdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
rename to res/drawable-xhdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png b/res/drawable-xhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
rename to res/drawable-xhdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png b/res/drawable-xhdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
rename to res/drawable-xhdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png b/res/drawable-xxhdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/ic_images.png
rename to res/drawable-xxhdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png b/res/drawable-xxhdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
rename to res/drawable-xxhdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png b/res/drawable-xxhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
rename to res/drawable-xxhdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png b/res/drawable-xxhdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
rename to res/drawable-xxhdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png b/res/drawable-xxhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
rename to res/drawable-xxhdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png b/res/drawable-xxhdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
rename to res/drawable-xxhdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml b/res/drawable/wallpaper_tile_fg.xml
similarity index 100%
rename from wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
rename to res/drawable/wallpaper_tile_fg.xml
diff --git a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml b/res/layout/actionbar_set_wallpaper.xml
similarity index 100%
rename from wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
rename to res/layout/actionbar_set_wallpaper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_cropper.xml
rename to res/layout/wallpaper_cropper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker.xml
rename to res/layout/wallpaper_picker.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml b/res/layout/wallpaper_picker_image_picker_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
rename to res/layout/wallpaper_picker_image_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_item.xml
rename to res/layout/wallpaper_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml b/res/layout/wallpaper_picker_live_wallpaper_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
rename to res/layout/wallpaper_picker_live_wallpaper_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml b/res/layout/wallpaper_picker_third_party_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
rename to res/layout/wallpaper_picker_third_party_item.xml
diff --git a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml b/res/menu/cab_delete_wallpapers.xml
similarity index 100%
rename from wallpaper_picker_res/menu/cab_delete_wallpapers.xml
rename to res/menu/cab_delete_wallpapers.xml
diff --git a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
rename to res/mipmap-hdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
rename to res/mipmap-mdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
rename to res/mipmap-xhdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
rename to res/mipmap-xxhdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/values-nodpi/wallpapers.xml b/res/values-nodpi/wallpapers.xml
similarity index 100%
rename from wallpaper_picker_res/values-nodpi/wallpapers.xml
rename to res/values-nodpi/wallpapers.xml
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 9ae155b3cc..01227e1470 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,6 +21,10 @@
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
+    <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->
+    <dimen name="wallpaper_chooser_grid_width">196dp</dimen>
+    <dimen name="wallpaper_chooser_grid_height">140dp</dimen>
+
     <!-- When dragging items on the workspace, the number of dps by which the position of
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index e1f9ab45af..9738a124b7 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -51,6 +51,12 @@
     </style>
 
 <!-- Workspace -->
+    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingStart">32dp</item>
         <item name="android:paddingEnd">32dp</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ffee05f18e..c073903803 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,6 +32,7 @@
     <color name="workspace_icon_text_color">#FFF</color>
 
     <color name="apps_customize_icon_text_color">#FFF</color>
+    <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
     <color name="folder_items_glow_color">#FFCCCCCC</color>
     <color name="outline_color">#FFFFFFFF</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 28b6a5bcce..c86fe314df 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,6 +27,11 @@
     <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
     <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen>
 
+<!-- Wallpaper picker -->
+    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
+    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
+    <dimen name="wallpaperItemIconSize">32dp</dimen>
+
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
     <dimen name="folderClingMarginTop">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 361be7b3cc..30f4d8fd33 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,6 +28,38 @@
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
     <string name="folder_name"></string>
+    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+    <string name="wallpaper_instructions">Set wallpaper</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper picker cannot load it -->
+    <string name="image_load_fail">Coudn\'t load image</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
+    <!-- Shown when wallpapers are selected in Wallpaper picker -->
+    <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+    <plurals name="number_of_items_selected">
+        <item quantity="zero">%1$d selected</item>
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
+         e.g. "Wallpaper 3 of 10" -->
+    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
+    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
+    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
+
+    <!-- Label on button to delete wallpaper(s) -->
+    <string name="wallpaper_delete">Delete</string>
+    <!-- Label on button in Wallpaper Picker to pick an image -->
+    <string name="pick_image">Pick image</string>
+    <!-- Option in "Select wallpaper from" dialog box -->
+    <string name="pick_wallpaper">Wallpapers</string>
+    <!-- Title of activity for cropping wallpapers -->
+    <string name="crop_wallpaper">Crop wallpaper</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
     <string name="activity_not_found">App isn\'t installed.</string>
     <!--  Labels for the tabs in the customize drawer -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4aad5ebfaf..8226915ddf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,6 +18,23 @@
 -->
 
 <resources>
+    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
+    </style>
+
+    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="ClingButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/wallpaper_picker_src/android/util/Pools.java b/src/android/util/Pools.java
similarity index 100%
rename from wallpaper_picker_src/android/util/Pools.java
rename to src/android/util/Pools.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java b/src/com/android/gallery3d/common/BitmapUtils.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
rename to src/com/android/gallery3d/common/BitmapUtils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java b/src/com/android/gallery3d/common/Utils.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/common/Utils.java
rename to src/com/android/gallery3d/common/Utils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java b/src/com/android/gallery3d/exif/ByteBufferInputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
rename to src/com/android/gallery3d/exif/ByteBufferInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java b/src/com/android/gallery3d/exif/CountedDataInputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
rename to src/com/android/gallery3d/exif/CountedDataInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java b/src/com/android/gallery3d/exif/ExifData.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
rename to src/com/android/gallery3d/exif/ExifData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java b/src/com/android/gallery3d/exif/ExifInterface.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
rename to src/com/android/gallery3d/exif/ExifInterface.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
rename to src/com/android/gallery3d/exif/ExifInvalidFormatException.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java b/src/com/android/gallery3d/exif/ExifModifier.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
rename to src/com/android/gallery3d/exif/ExifModifier.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java b/src/com/android/gallery3d/exif/ExifOutputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
rename to src/com/android/gallery3d/exif/ExifOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java b/src/com/android/gallery3d/exif/ExifParser.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
rename to src/com/android/gallery3d/exif/ExifParser.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java b/src/com/android/gallery3d/exif/ExifReader.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
rename to src/com/android/gallery3d/exif/ExifReader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java b/src/com/android/gallery3d/exif/ExifTag.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
rename to src/com/android/gallery3d/exif/ExifTag.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java b/src/com/android/gallery3d/exif/IfdData.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
rename to src/com/android/gallery3d/exif/IfdData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java b/src/com/android/gallery3d/exif/IfdId.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
rename to src/com/android/gallery3d/exif/IfdId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java b/src/com/android/gallery3d/exif/JpegHeader.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
rename to src/com/android/gallery3d/exif/JpegHeader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
rename to src/com/android/gallery3d/exif/OrderedDataOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java b/src/com/android/gallery3d/exif/Rational.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
rename to src/com/android/gallery3d/exif/Rational.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java b/src/com/android/gallery3d/glrenderer/BasicTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
rename to src/com/android/gallery3d/glrenderer/BasicTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java b/src/com/android/gallery3d/glrenderer/BitmapTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
rename to src/com/android/gallery3d/glrenderer/BitmapTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java b/src/com/android/gallery3d/glrenderer/GLCanvas.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
rename to src/com/android/gallery3d/glrenderer/GLCanvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/src/com/android/gallery3d/glrenderer/GLES20Canvas.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
rename to src/com/android/gallery3d/glrenderer/GLES20Canvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rename to src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java b/src/com/android/gallery3d/glrenderer/GLId.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
rename to src/com/android/gallery3d/glrenderer/GLId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java b/src/com/android/gallery3d/glrenderer/GLPaint.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
rename to src/com/android/gallery3d/glrenderer/GLPaint.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java b/src/com/android/gallery3d/glrenderer/RawTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
rename to src/com/android/gallery3d/glrenderer/RawTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java b/src/com/android/gallery3d/glrenderer/Texture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
rename to src/com/android/gallery3d/glrenderer/Texture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
rename to src/com/android/gallery3d/glrenderer/UploadedTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java b/src/com/android/gallery3d/util/IntArray.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
rename to src/com/android/gallery3d/util/IntArray.java
diff --git a/wallpaper_picker_src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/CropView.java
rename to src/com/android/launcher3/CropView.java
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
rename to src/com/android/launcher3/WallpaperCropActivity.java
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
rename to src/com/android/launcher3/WallpaperPickerActivity.java
diff --git a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java b/src/com/android/photos/BitmapRegionTileSource.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
rename to src/com/android/photos/BitmapRegionTileSource.java
diff --git a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java b/src/com/android/photos/views/BlockingGLTextureView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
rename to src/com/android/photos/views/BlockingGLTextureView.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java b/src/com/android/photos/views/TiledImageRenderer.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
rename to src/com/android/photos/views/TiledImageRenderer.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java b/src/com/android/photos/views/TiledImageView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/TiledImageView.java
rename to src/com/android/photos/views/TiledImageView.java
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/wallpaper_picker_res/values-sw720dp/dimens.xml
deleted file mode 100644
index 9ae155b3cc..0000000000
--- a/wallpaper_picker_res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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
-
-          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
-     limitations under the License.
--->
-
-<resources>
-    <dimen name="app_icon_size">72dp</dimen>
-
-<!-- QSB -->
-    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
-
-    <!-- When dragging items on the workspace, the number of dps by which the position of
-     the drag view should be offset from the position of the original view. -->
-    <dimen name="dragViewOffsetX">0dp</dimen>
-    <dimen name="dragViewOffsetY">0dp</dimen>
-</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/wallpaper_picker_res/values-sw720dp/styles.xml
deleted file mode 100644
index 91078517db..0000000000
--- a/wallpaper_picker_res/values-sw720dp/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2013 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
-*
-*      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
-* limitations under the License.
-*/
--->
-
-<resources>
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>
diff --git a/wallpaper_picker_res/values/colors.xml b/wallpaper_picker_res/values/colors.xml
deleted file mode 100644
index adae7cff6f..0000000000
--- a/wallpaper_picker_res/values/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2013, 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 
-**
-**     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 
-** limitations under the License.
-*/
--->
-<resources>
-    <color name="wallpaper_picker_translucent_gray">#66000000</color>
-</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/wallpaper_picker_res/values/dimens.xml
deleted file mode 100644
index 0447c6d1f7..0000000000
--- a/wallpaper_picker_res/values/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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
-  
-          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
-     limitations under the License.
--->
-
-<resources>
-<!-- Wallpaper picker -->
-    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
-    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
-    <dimen name="wallpaperItemIconSize">32dp</dimen>
-</resources>
diff --git a/wallpaper_picker_res/values/strings.xml b/wallpaper_picker_res/values/strings.xml
deleted file mode 100644
index 1ee3513f90..0000000000
--- a/wallpaper_picker_res/values/strings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2013 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
-*
-*      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
-* limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
-    <string name="wallpaper_instructions">Set wallpaper</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper picker cannot load it -->
-    <string name="image_load_fail">Coudn\'t load image</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper cropper cannot load it. The user will
-         usually see this when using another app and trying to set
-         an image as the wallpaper -->
-    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
-    <!-- Shown when wallpapers are selected in Wallpaper picker -->
-    <!-- String indicating how many media item(s) is(are) selected
-            eg. 1 selected [CHAR LIMIT=30] -->
-    <plurals name="number_of_items_selected">
-        <item quantity="zero">%1$d selected</item>
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
-         e.g. "Wallpaper 3 of 10" -->
-    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
-    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
-    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
-
-    <!-- Label on button to delete wallpaper(s) -->
-    <string name="wallpaper_delete">Delete</string>
-    <!-- Label on button in Wallpaper Picker to pick an image -->
-    <string name="pick_image">Pick image</string>
-    <!-- Option in "Select wallpaper from" dialog box -->
-    <string name="pick_wallpaper">Wallpapers</string>
-    <!-- Title of activity for cropping wallpapers -->
-    <string name="crop_wallpaper">Crop wallpaper</string>
-</resources>
diff --git a/wallpaper_picker_res/values/styles.xml b/wallpaper_picker_res/values/styles.xml
deleted file mode 100644
index 0e48ddac43..0000000000
--- a/wallpaper_picker_res/values/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2013 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
-*
-*      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
-* limitations under the License.
-*/
--->
-
-<resources>
-    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
-        <item name="android:displayOptions">showCustom</item>
-        <item name="android:background">#88000000</item>
-    </style>
-
-    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>

From 59a488ac03aa122b75e9a358db74acf7bb4d2508 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 10 Dec 2013 12:32:14 -0800
Subject: [PATCH 064/147] Adjusting grid for tablets and fixing incorrect
 resources for large tablets.

Change-Id: I4c2a058da934bef14f5be3c53ebda940aeb990ca
---
 res/drawable-sw720dp-hdpi/workspace_bg.9.png  | Bin 0 -> 226 bytes
 res/drawable-sw720dp-mdpi/workspace_bg.9.png  | Bin 0 -> 213 bytes
 res/drawable-sw720dp-xhdpi/workspace_bg.9.png | Bin 0 -> 255 bytes
 .../workspace_bg.9.png                        | Bin 0 -> 1126 bytes
 res/values-land/config.xml                    |   2 -
 res/values-sw340dp-port/config.xml            |   3 --
 res/values-sw720dp/config.xml                 |   2 -
 res/values/config.xml                         |   2 -
 src/com/android/launcher3/CellLayout.java     |   7 ++-
 src/com/android/launcher3/DeviceProfile.java  |  44 +++++++++---------
 src/com/android/launcher3/DynamicGrid.java    |   4 +-
 src/com/android/launcher3/Workspace.java      |  11 +----
 12 files changed, 32 insertions(+), 43 deletions(-)
 create mode 100644 res/drawable-sw720dp-hdpi/workspace_bg.9.png
 create mode 100644 res/drawable-sw720dp-mdpi/workspace_bg.9.png
 create mode 100644 res/drawable-sw720dp-xhdpi/workspace_bg.9.png
 create mode 100644 res/drawable-sw720dp-xxhdpi/workspace_bg.9.png

diff --git a/res/drawable-sw720dp-hdpi/workspace_bg.9.png b/res/drawable-sw720dp-hdpi/workspace_bg.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bbfa4fff6bb6a864d6b897417d5a6fd66b8b86f
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^%nS^SdK_#(mUr%o$3Tju*vT`50|;t3QaXTq&H|6f
zVg?58P7r1^KY4mBP_V_*#WBRA^X_y*z5@z8%<K2;(O<v2q$4CSkcs6)+D%IxMYahn
z3TNgtTvBG4u;%WW&i<X{k1j4gvNf{#WX8vayBBtIDlxQLzl-R&Z1_#A?91N8Yl5Ab
zE$T#a-HMMp&FM4zeoo^So6_3)KIyyLZlBpQVRd=A@@t*X+wR`wVqBbbmG7H!EwgTV
W>v54wa^XPtFnGH9xvX<aXaWEq(o?Mf

literal 0
HcmV?d00001

diff --git a/res/drawable-sw720dp-mdpi/workspace_bg.9.png b/res/drawable-sw720dp-mdpi/workspace_bg.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..2856e09851589aa4112ecb5258b089a7368c7278
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^%s_mKgAGU~od0zgNU;<<d4_NRK@CSr2awNM;1OBO
zz`)%J!i?r8Pp<_EmV3H5hIn+Io#xHgpupoYzoO9p-Hr>aoQ~N)r@T}9yljc4iUOxY
zN-2X^zrca*2ihu+Sgv%Gm40y~Sv&oadhRhcE5-FklwZusEb9tt)D%C)bKqOui}O7f
zKPG%s@;x+bZpE5;H+PpAr#Y$d-gLVE``JM;;qs^Rk8zu^r~RLuc<>s~2@IaDelF{r
G5}E)~15T*`

literal 0
HcmV?d00001

diff --git a/res/drawable-sw720dp-xhdpi/workspace_bg.9.png b/res/drawable-sw720dp-xhdpi/workspace_bg.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..72269f207a5af6e545efb099fa67ddc343be1ff5
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^%nS^SlQ`IbEVb0?w?K-e*vT`50|;t3QaXTq&H|6f
zVg?58P7r1^KY4mBP;jBAi(^Pc>(d#h`Hm>?FfXt9Sy#Dvx~;-j#ciHhvx>TN`WY{J
z8yYh#j+Q@gE8n2u+UebgH|h#11b%sOW8S5iM`YI&U%Yp@_&WE+`6d&^eph{sU#z0M
zaA)q)sS&po4$SRj&1tW@S$T|4)V#`Ar~XSto3?GI<o35+lRD%=zAR<U_~pYGRefrm
zy0!n-c}yndX&=_9R(o%GS*;eFl*`TV_xw@)v(+6F4x3mN0UgWW>FVdQ&MBb@0IkMi
AF8}}l

literal 0
HcmV?d00001

diff --git a/res/drawable-sw720dp-xxhdpi/workspace_bg.9.png b/res/drawable-sw720dp-xxhdpi/workspace_bg.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..efc9b0465881383de73faf2cc77fab87eaa9c00f
GIT binary patch
literal 1126
zcmbVLPiPcZ7@tIFW5o92K~qbH3Fg$@d2eQSW@p%K*qzyl3vP^?#l|$0OlIC@hh*lB
zGjF?-&_j$MRgw18(t~&q6hTBqPaZtwpb)4hOG-&86hu=>BT)<W&zod7^$<Kbm-l^d
zzTfZnec$`O)5Al9ySsb38HU+iI;dCZxr1Rk$GSeC)??}A6?*I=#ZfYXYouugh{@Y{
z60s%MoI(|3+Ox;+p)3W}oa!hUEgw=X>?X}PCK<UtMKerxAo5LX8WDC9O*vkU`}@va
zj&<xD_eHu4%D#r`&cV3=jm!;It+{DSvAKcI*=(dz0v8dJjocY8RHGcX!K+d`zUDc0
zBZN%nxXq+S%fqaO1H`72AYlOsuo6r{F(u3LXRH7q;DNwHApvDo6jT7%*2ht`z^<tk
z-Dqi1FUQph@l~F0Hk-+&n8d*p4;4j;IRqg=BNE}PN6aYUg?()X9fell_{6~;8#9`d
zxIuCp&2+N_*Dsg1h`q4YDB3bUGJPH<0q?qTT^rFMsi6PU*fu(>&iaV2pb$3#i@ry#
zuMMWXd$&*=NV8E72M&D{b4JHj!$lq`={b)6N!pIB8dA|Pw2Y?90+2EgW@Kn&iUqlt
zkpxLe=i40HVMS<Y1yM;UA`l=f!n`7-ijtsc1)(4oL8^@{c_A@93$=9}s@uYf@5HKF
zfJ}meD#kPI2^g+pg2OuYS#2cEmQBm?Vn2SK&1!WNIA0^%2(Zg;^jCGZ(FbA%Kq#j`
zt8N7XMK5T19T-593k9x)wcn>_JWYm=hvThbX<yL^jLoglr_R>$AdhZLKv!e!pWmO;
zwfdo?=d023>QBFQ&x0=Gw*2H}@BLR7&n`SL%DFpTSF<aZ^+Wx&{-<O7$(iYKZ~uw$
z3)v5kJ{xOHeD(9G^K<i`90|^ZYrpI~cPX>HOFi+atbBXZT}s~|{XL88&Yz3>ztMgj
zT$OHp+}Zf|ueyC?{g1JZ|91F&%f~)CFz<bL3GexF?^3T6tuWWW#FzUXYL80u9n6c)
Vk(J)>mtV)5Un&mi*9sF0ZvZedaV-D<

literal 0
HcmV?d00001

diff --git a/res/values-land/config.xml b/res/values-land/config.xml
index 121bb0c146..31115c9cb6 100644
--- a/res/values-land/config.xml
+++ b/res/values-land/config.xml
@@ -18,6 +18,4 @@
 <!-- Workspace -->
     <!-- Whether or not the drop targets drop down as opposed to fade in -->
     <bool name="config_useDropTargetDownTransition">false</bool>
-    <!-- Whether or not to fade the side pages -->
-    <bool name="config_workspaceFadeAdjacentScreens">false</bool>
 </resources>
diff --git a/res/values-sw340dp-port/config.xml b/res/values-sw340dp-port/config.xml
index d31ee59690..5f71077c72 100644
--- a/res/values-sw340dp-port/config.xml
+++ b/res/values-sw340dp-port/config.xml
@@ -15,7 +15,4 @@
 -->
 
 <resources>
-<!-- Workspace -->
-    <!-- Whether or not to fade the side pages -->
-    <bool name="config_workspaceFadeAdjacentScreens">false</bool>
 </resources>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index 4f537a9f40..c00b5943f1 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -9,8 +9,6 @@
 <!-- Workspace -->
     <!-- Whether or not the drop targets drop down as opposed to fade in -->
     <bool name="config_useDropTargetDownTransition">false</bool>
-    <!-- Whether or not to fade the side pages -->
-    <bool name="config_workspaceFadeAdjacentScreens">true</bool>
 
     <!-- Camera distance for the overscroll effect -->
     <integer name="config_cameraDistance">18000</integer>
diff --git a/res/values/config.xml b/res/values/config.xml
index 1538d9fab4..2a08216624 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -52,8 +52,6 @@
 <!-- Workspace -->
     <!-- Whether or not the drop targets drop down as opposed to fade in -->
     <bool name="config_useDropTargetDownTransition">false</bool>
-    <!-- Whether or not to fade the side pages -->
-    <bool name="config_workspaceFadeAdjacentScreens">false</bool>
 
     <!-- The transition duration for the background of the drop targets -->
     <integer name="config_dropTargetBgTransitionDuration">0</integer>
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index df16d41947..c5ad30a51e 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -100,6 +100,7 @@ public class CellLayout extends ViewGroup {
     private int mForegroundAlpha = 0;
     private float mBackgroundAlpha;
     private float mBackgroundAlphaMultiplier = 1.0f;
+    private boolean mDrawBackground = true;
 
     private Drawable mNormalBackground;
     private Drawable mActiveGlowBackground;
@@ -387,6 +388,10 @@ public class CellLayout extends ViewGroup {
         mUseActiveGlowBackground = use;
     }
 
+    void disableBackground() {
+        mDrawBackground = false;
+    }
+
     boolean getIsDragOverlapping() {
         return mIsDragOverlapping;
     }
@@ -415,7 +420,7 @@ public class CellLayout extends ViewGroup {
         // When we're small, we are either drawn normally or in the "accepts drops" state (during
         // a drag). However, we also drag the mini hover background *over* one of those two
         // backgrounds
-        if (mBackgroundAlpha > 0.0f) {
+        if (mDrawBackground && mBackgroundAlpha > 0.0f) {
             Drawable bg;
 
             if (mUseActiveGlowBackground) {
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 511b7182f3..67b0933c9a 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -119,6 +119,8 @@ public class DeviceProfile {
     int searchBarHeightPx;
     int pageIndicatorHeightPx;
 
+    float dragViewScale;
+
     private ArrayList<DeviceProfileCallbacks> mCallbacks = new ArrayList<DeviceProfileCallbacks>();
 
     DeviceProfile(String n, float w, float h, float r, float c,
@@ -282,11 +284,12 @@ public class DeviceProfile {
 
         // Check to see if the icons fit in the new available height.  If not, then we need to
         // shrink the icon size.
-        Rect workspacePadding = getWorkspacePadding();
         float scale = 1f;
         int drawablePadding = iconDrawablePaddingOriginalPx;
         updateIconSize(1f, drawablePadding, resources, dm);
         float usedHeight = (cellHeightPx * numRows);
+
+        Rect workspacePadding = getWorkspacePadding();
         int maxHeight = (availableHeightPx - workspacePadding.top - workspacePadding.bottom);
         if (usedHeight > maxHeight) {
             scale = maxHeight / usedHeight;
@@ -319,6 +322,8 @@ public class DeviceProfile {
         FontMetrics fm = textPaint.getFontMetrics();
         cellWidthPx = iconSizePx;
         cellHeightPx = iconSizePx + iconDrawablePaddingPx + (int) Math.ceil(fm.bottom - fm.top);
+        final float scaleDps = resources.getDimensionPixelSize(R.dimen.dragViewScale);
+        dragViewScale = (iconSizePx + scaleDps) / iconSizePx;
 
         // Hotseat
         hotseatBarHeightPx = iconSizePx + 4 * edgeMarginPx;
@@ -491,17 +496,21 @@ public class DeviceProfile {
             if (isTablet()) {
                 // Pad the left and right of the workspace to ensure consistent spacing
                 // between all icons
+                float gapScale = 1f + (dragViewScale - 1f) / 2f;
                 int width = (orientation == CellLayout.LANDSCAPE)
                         ? Math.max(widthPx, heightPx)
                         : Math.min(widthPx, heightPx);
-                // XXX: If the icon size changes across orientations, we will have to take
-                //      that into account here too.
-                int gap = (int) ((width - 2 * edgeMarginPx -
-                        (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
-                padding.set(edgeMarginPx + gap,
-                        searchBarBounds.bottom,
-                        edgeMarginPx + gap,
-                        hotseatBarHeightPx + pageIndicatorHeightPx);
+                int height = (orientation != CellLayout.LANDSCAPE)
+                        ? Math.max(widthPx, heightPx)
+                        : Math.min(widthPx, heightPx);
+                int paddingTop = searchBarBounds.bottom;
+                int paddingBottom = hotseatBarHeightPx + pageIndicatorHeightPx;
+                int availableWidth = Math.max(0, width - (int) ((numColumns * cellWidthPx) +
+                        (numColumns * gapScale * cellWidthPx)));
+                int availableHeight = Math.max(0, height - paddingTop - paddingBottom
+                        - (int) (2 * numRows * cellHeightPx));
+                padding.set(availableWidth / 2, paddingTop + availableHeight / 2,
+                        availableWidth / 2, paddingBottom + availableHeight / 2);
             } else {
                 // Pad the top and bottom of the workspace with search/hotseat bar sizes
                 padding.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left,
@@ -514,8 +523,8 @@ public class DeviceProfile {
     }
 
     int getWorkspacePageSpacing(int orientation) {
-        if (orientation == CellLayout.LANDSCAPE &&
-                transposeLayoutWithOrientation) {
+        if ((orientation == CellLayout.LANDSCAPE &&
+                transposeLayoutWithOrientation) || isLargeTablet()) {
             // In landscape mode the page spacing is set to the default.
             return defaultPageSpacingPx;
         } else {
@@ -645,19 +654,12 @@ public class DeviceProfile {
             lp.height = LayoutParams.MATCH_PARENT;
             hotseat.findViewById(R.id.layout).setPadding(0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx);
         } else if (isTablet()) {
-            // Pad the hotseat with the grid gap calculated above
-            int gridGap = (int) ((widthPx - 2 * edgeMarginPx -
-                    (numColumns * cellWidthPx)) / (2 * (numColumns + 1)));
-            int gridWidth = (int) ((numColumns * cellWidthPx) +
-                    ((numColumns - 1) * gridGap));
-            int hotseatGap = (int) Math.max(0,
-                    (gridWidth - (numHotseatIcons * hotseatCellWidthPx))
-                            / (numHotseatIcons - 1));
+            // Pad the hotseat with the workspace padding calculated above
             lp.gravity = Gravity.BOTTOM;
             lp.width = LayoutParams.MATCH_PARENT;
             lp.height = hotseatBarHeightPx;
-            hotseat.setPadding(2 * edgeMarginPx + gridGap + hotseatGap, 0,
-                    2 * edgeMarginPx + gridGap + hotseatGap,
+            hotseat.setPadding(edgeMarginPx + padding.left, 0,
+                    edgeMarginPx + padding.right,
                     2 * edgeMarginPx);
         } else {
             // For phones, layout the hotseat without any bottom margin
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index dc01c69331..22928ccf3a 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -74,10 +74,10 @@ public class DynamicGrid {
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",
-                575, 904,  5, 5,  72, 14.4f,  7, 60));
+                575, 904,  5, 6,  72, 14.4f,  7, 60));
         // Larger tablet profiles always have system bars on the top & bottom
         deviceProfiles.add(new DeviceProfile("Nexus 10",
-                727, 1207,  5, 5,  80, 14.4f,  7, 64));
+                727, 1207,  5, 6,  76, 14.4f,  7, 64));
         /*
         deviceProfiles.add(new DeviceProfile("Nexus 7",
                 600, 960,  5, 5,  72, 14.4f,  5, 60));
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bf4f561e0a..3d1564a7a2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -565,6 +565,7 @@ public class Workspace extends SmoothPagedView
     public void createCustomContentPage() {
         CellLayout customScreen = (CellLayout)
                 mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
+        customScreen.disableBackground();
 
         mWorkspaceScreens.put(CUSTOM_CONTENT_SCREEN_ID, customScreen);
         mScreenOrder.add(0, CUSTOM_CONTENT_SCREEN_ID);
@@ -1155,11 +1156,6 @@ public class Workspace extends SmoothPagedView
             }
         }
 
-        // Only show page outlines as we pan if we are on large screen
-        if (LauncherAppState.getInstance().isScreenLarge()) {
-            showOutlines();
-        }
-
         // If we are not fading in adjacent screens, we still need to restore the alpha in case the
         // user scrolls while we are transitioning (should not affect dispatchDraw optimizations)
         if (!mWorkspaceFadeInAdjacentScreens) {
@@ -1184,11 +1180,6 @@ public class Workspace extends SmoothPagedView
                 // is under a new page (to scroll to)
                 mDragController.forceTouchMove();
             }
-        } else {
-            // If we are not mid-dragging, hide the page outlines if we are on a large screen
-            if (LauncherAppState.getInstance().isScreenLarge()) {
-                hideOutlines();
-            }
         }
 
         if (mDelayedResizeRunnable != null) {

From 96749c13218aa1b783709dc82a4e16657ce9753f Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 11 Dec 2013 15:41:28 +0100
Subject: [PATCH 065/147] Revert "Revert "Move wallpaper picker code to a
 separate directory""

This reverts commit 39de459a8621abfc91382ce7b4cdd37d09aaac12.
---
 Android.mk                                    |   4 ++
 CleanSpec.mk                                  |   2 +
 res/values-sw720dp/dimens.xml                 |   4 --
 res/values-sw720dp/styles.xml                 |   6 --
 res/values/colors.xml                         |   1 -
 res/values/dimens.xml                         |   5 --
 res/values/strings.xml                        |  32 -----------
 res/values/styles.xml                         |  17 ------
 .../drawable-hdpi/ic_actionbar_accept.png     | Bin
 .../drawable-hdpi/ic_images.png               | Bin
 .../drawable-hdpi/tile_picker_focused.9.png   | Bin
 .../drawable-hdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-hdpi/tile_picker_selected.9.png  | Bin
 .../drawable-hdpi/tile_shadow_bottom.9.png    | Bin
 .../drawable-hdpi/tile_shadow_top.9.png       | Bin
 .../drawable-mdpi/ic_actionbar_accept.png     | Bin
 .../drawable-mdpi/ic_images.png               | Bin
 .../drawable-mdpi/tile_picker_focused.9.png   | Bin
 .../drawable-mdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-mdpi/tile_picker_selected.9.png  | Bin
 .../drawable-mdpi/tile_shadow_bottom.9.png    | Bin
 .../drawable-mdpi/tile_shadow_top.9.png       | Bin
 .../drawable-xhdpi/ic_actionbar_accept.png    | Bin
 .../drawable-xhdpi/ic_images.png              | Bin
 .../drawable-xhdpi/tile_picker_focused.9.png  | Bin
 .../drawable-xhdpi/tile_picker_pressed.9.png  | Bin
 .../drawable-xhdpi/tile_picker_selected.9.png | Bin
 .../drawable-xhdpi/tile_shadow_bottom.9.png   | Bin
 .../drawable-xhdpi/tile_shadow_top.9.png      | Bin
 .../drawable-xxhdpi/ic_images.png             | Bin
 .../drawable-xxhdpi/tile_picker_focused.9.png | Bin
 .../drawable-xxhdpi/tile_picker_pressed.9.png | Bin
 .../tile_picker_selected.9.png                | Bin
 .../drawable-xxhdpi/tile_shadow_bottom.9.png  | Bin
 .../drawable-xxhdpi/tile_shadow_top.9.png     | Bin
 .../drawable/wallpaper_tile_fg.xml            |   0
 .../layout/actionbar_set_wallpaper.xml        |   0
 .../layout/wallpaper_cropper.xml              |   0
 .../layout/wallpaper_picker.xml               |   0
 .../wallpaper_picker_image_picker_item.xml    |   0
 .../layout/wallpaper_picker_item.xml          |   0
 .../wallpaper_picker_live_wallpaper_item.xml  |   0
 .../wallpaper_picker_third_party_item.xml     |   0
 .../menu/cab_delete_wallpapers.xml            |   0
 .../mipmap-hdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-mdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-xhdpi/ic_launcher_wallpaper.png    | Bin
 .../mipmap-xxhdpi/ic_launcher_wallpaper.png   | Bin
 .../values-nodpi/wallpapers.xml               |   0
 .../values-sw720dp/dimens.xml                 |  28 +++++++++
 .../values-sw720dp/styles.xml                 |  26 +++++++++
 wallpaper_picker_res/values/colors.xml        |  22 ++++++++
 wallpaper_picker_res/values/dimens.xml        |  22 ++++++++
 wallpaper_picker_res/values/strings.xml       |  53 ++++++++++++++++++
 wallpaper_picker_res/values/styles.xml        |  37 ++++++++++++
 .../android/util/Pools.java                   |   0
 .../android/gallery3d/common/BitmapUtils.java |   0
 .../com/android/gallery3d/common/Utils.java   |   0
 .../gallery3d/exif/ByteBufferInputStream.java |   0
 .../exif/CountedDataInputStream.java          |   0
 .../com/android/gallery3d/exif/ExifData.java  |   0
 .../android/gallery3d/exif/ExifInterface.java |   0
 .../exif/ExifInvalidFormatException.java      |   0
 .../android/gallery3d/exif/ExifModifier.java  |   0
 .../gallery3d/exif/ExifOutputStream.java      |   0
 .../android/gallery3d/exif/ExifParser.java    |   0
 .../android/gallery3d/exif/ExifReader.java    |   0
 .../com/android/gallery3d/exif/ExifTag.java   |   0
 .../com/android/gallery3d/exif/IfdData.java   |   0
 .../com/android/gallery3d/exif/IfdId.java     |   0
 .../android/gallery3d/exif/JpegHeader.java    |   0
 .../exif/OrderedDataOutputStream.java         |   0
 .../com/android/gallery3d/exif/Rational.java  |   0
 .../gallery3d/glrenderer/BasicTexture.java    |   0
 .../gallery3d/glrenderer/BitmapTexture.java   |   0
 .../gallery3d/glrenderer/GLCanvas.java        |   0
 .../gallery3d/glrenderer/GLES20Canvas.java    |   0
 .../gallery3d/glrenderer/GLES20IdImpl.java    |   0
 .../android/gallery3d/glrenderer/GLId.java    |   0
 .../android/gallery3d/glrenderer/GLPaint.java |   0
 .../gallery3d/glrenderer/RawTexture.java      |   0
 .../android/gallery3d/glrenderer/Texture.java |   0
 .../gallery3d/glrenderer/UploadedTexture.java |   0
 .../com/android/gallery3d/util/IntArray.java  |   0
 .../com/android/launcher3/CropView.java       |   0
 .../launcher3/WallpaperCropActivity.java      |   0
 .../launcher3/WallpaperPickerActivity.java    |   0
 .../photos/BitmapRegionTileSource.java        |   0
 .../photos/views/BlockingGLTextureView.java   |   0
 .../photos/views/TiledImageRenderer.java      |   0
 .../android/photos/views/TiledImageView.java  |   0
 91 files changed, 194 insertions(+), 65 deletions(-)
 rename {res => wallpaper_picker_res}/drawable-hdpi/ic_actionbar_accept.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-hdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/ic_actionbar_accept.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-mdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/ic_actionbar_accept.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xhdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/ic_images.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_picker_focused.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_picker_pressed.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_picker_selected.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_shadow_bottom.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable-xxhdpi/tile_shadow_top.9.png (100%)
 rename {res => wallpaper_picker_res}/drawable/wallpaper_tile_fg.xml (100%)
 rename {res => wallpaper_picker_res}/layout/actionbar_set_wallpaper.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_cropper.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_image_picker_item.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_item.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_live_wallpaper_item.xml (100%)
 rename {res => wallpaper_picker_res}/layout/wallpaper_picker_third_party_item.xml (100%)
 rename {res => wallpaper_picker_res}/menu/cab_delete_wallpapers.xml (100%)
 rename {res => wallpaper_picker_res}/mipmap-hdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/mipmap-mdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/mipmap-xhdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/mipmap-xxhdpi/ic_launcher_wallpaper.png (100%)
 rename {res => wallpaper_picker_res}/values-nodpi/wallpapers.xml (100%)
 create mode 100644 wallpaper_picker_res/values-sw720dp/dimens.xml
 create mode 100644 wallpaper_picker_res/values-sw720dp/styles.xml
 create mode 100644 wallpaper_picker_res/values/colors.xml
 create mode 100644 wallpaper_picker_res/values/dimens.xml
 create mode 100644 wallpaper_picker_res/values/strings.xml
 create mode 100644 wallpaper_picker_res/values/styles.xml
 rename {src => wallpaper_picker_src}/android/util/Pools.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/common/BitmapUtils.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/common/Utils.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ByteBufferInputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/CountedDataInputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifData.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifInterface.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifInvalidFormatException.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifModifier.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifOutputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifParser.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifReader.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/ExifTag.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/IfdData.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/IfdId.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/JpegHeader.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/OrderedDataOutputStream.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/exif/Rational.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/BasicTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/BitmapTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLCanvas.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLES20Canvas.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLES20IdImpl.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLId.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/GLPaint.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/RawTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/Texture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/glrenderer/UploadedTexture.java (100%)
 rename {src => wallpaper_picker_src}/com/android/gallery3d/util/IntArray.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/CropView.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/WallpaperCropActivity.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/WallpaperPickerActivity.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/BitmapRegionTileSource.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/views/BlockingGLTextureView.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/views/TiledImageRenderer.java (100%)
 rename {src => wallpaper_picker_src}/com/android/photos/views/TiledImageView.java (100%)

diff --git a/Android.mk b/Android.mk
index 3bd20a7cd1..6059a3f982 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,8 +26,12 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    $(call all-java-files-under, wallpaper_picker_src) \
     $(call all-renderscript-files-under, src) \
     $(call all-proto-files-under, protos)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c1323951be..b2c5266fa2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,6 +50,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 01227e1470..9ae155b3cc 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,10 +21,6 @@
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
-    <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->
-    <dimen name="wallpaper_chooser_grid_width">196dp</dimen>
-    <dimen name="wallpaper_chooser_grid_height">140dp</dimen>
-
     <!-- When dragging items on the workspace, the number of dps by which the position of
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 9738a124b7..e1f9ab45af 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -51,12 +51,6 @@
     </style>
 
 <!-- Workspace -->
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingStart">32dp</item>
         <item name="android:paddingEnd">32dp</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c073903803..ffee05f18e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,6 @@
     <color name="workspace_icon_text_color">#FFF</color>
 
     <color name="apps_customize_icon_text_color">#FFF</color>
-    <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
     <color name="folder_items_glow_color">#FFCCCCCC</color>
     <color name="outline_color">#FFFFFFFF</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c86fe314df..28b6a5bcce 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,11 +27,6 @@
     <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
     <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen>
 
-<!-- Wallpaper picker -->
-    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
-    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
-    <dimen name="wallpaperItemIconSize">32dp</dimen>
-
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
     <dimen name="folderClingMarginTop">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 30f4d8fd33..361be7b3cc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,38 +28,6 @@
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
     <string name="folder_name"></string>
-    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
-    <string name="wallpaper_instructions">Set wallpaper</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper picker cannot load it -->
-    <string name="image_load_fail">Coudn\'t load image</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper cropper cannot load it. The user will
-         usually see this when using another app and trying to set
-         an image as the wallpaper -->
-    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
-    <!-- Shown when wallpapers are selected in Wallpaper picker -->
-    <!-- String indicating how many media item(s) is(are) selected
-            eg. 1 selected [CHAR LIMIT=30] -->
-    <plurals name="number_of_items_selected">
-        <item quantity="zero">%1$d selected</item>
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
-         e.g. "Wallpaper 3 of 10" -->
-    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
-    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
-    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
-
-    <!-- Label on button to delete wallpaper(s) -->
-    <string name="wallpaper_delete">Delete</string>
-    <!-- Label on button in Wallpaper Picker to pick an image -->
-    <string name="pick_image">Pick image</string>
-    <!-- Option in "Select wallpaper from" dialog box -->
-    <string name="pick_wallpaper">Wallpapers</string>
-    <!-- Title of activity for cropping wallpapers -->
-    <string name="crop_wallpaper">Crop wallpaper</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
     <string name="activity_not_found">App isn\'t installed.</string>
     <!--  Labels for the tabs in the customize drawer -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8226915ddf..4aad5ebfaf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,23 +18,6 @@
 -->
 
 <resources>
-    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
-        <item name="android:displayOptions">showCustom</item>
-        <item name="android:background">#88000000</item>
-    </style>
-
-    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
     <style name="ClingButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/res/drawable-hdpi/ic_actionbar_accept.png b/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
similarity index 100%
rename from res/drawable-hdpi/ic_actionbar_accept.png
rename to wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
diff --git a/res/drawable-hdpi/ic_images.png b/wallpaper_picker_res/drawable-hdpi/ic_images.png
similarity index 100%
rename from res/drawable-hdpi/ic_images.png
rename to wallpaper_picker_res/drawable-hdpi/ic_images.png
diff --git a/res/drawable-hdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
diff --git a/res/drawable-hdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-hdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
diff --git a/res/drawable-hdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-hdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-hdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
diff --git a/res/drawable-mdpi/ic_actionbar_accept.png b/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
similarity index 100%
rename from res/drawable-mdpi/ic_actionbar_accept.png
rename to wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
diff --git a/res/drawable-mdpi/ic_images.png b/wallpaper_picker_res/drawable-mdpi/ic_images.png
similarity index 100%
rename from res/drawable-mdpi/ic_images.png
rename to wallpaper_picker_res/drawable-mdpi/ic_images.png
diff --git a/res/drawable-mdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
diff --git a/res/drawable-mdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-mdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
diff --git a/res/drawable-mdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-mdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-mdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
diff --git a/res/drawable-xhdpi/ic_actionbar_accept.png b/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
similarity index 100%
rename from res/drawable-xhdpi/ic_actionbar_accept.png
rename to wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
diff --git a/res/drawable-xhdpi/ic_images.png b/wallpaper_picker_res/drawable-xhdpi/ic_images.png
similarity index 100%
rename from res/drawable-xhdpi/ic_images.png
rename to wallpaper_picker_res/drawable-xhdpi/ic_images.png
diff --git a/res/drawable-xhdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
diff --git a/res/drawable-xhdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-xhdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
diff --git a/res/drawable-xhdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-xhdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-xhdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
diff --git a/res/drawable-xxhdpi/ic_images.png b/wallpaper_picker_res/drawable-xxhdpi/ic_images.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_images.png
rename to wallpaper_picker_res/drawable-xxhdpi/ic_images.png
diff --git a/res/drawable-xxhdpi/tile_picker_focused.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_picker_focused.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
diff --git a/res/drawable-xxhdpi/tile_picker_pressed.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_picker_pressed.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
diff --git a/res/drawable-xxhdpi/tile_picker_selected.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_picker_selected.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
diff --git a/res/drawable-xxhdpi/tile_shadow_bottom.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_shadow_bottom.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
diff --git a/res/drawable-xxhdpi/tile_shadow_top.9.png b/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
similarity index 100%
rename from res/drawable-xxhdpi/tile_shadow_top.9.png
rename to wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
diff --git a/res/drawable/wallpaper_tile_fg.xml b/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
similarity index 100%
rename from res/drawable/wallpaper_tile_fg.xml
rename to wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
diff --git a/res/layout/actionbar_set_wallpaper.xml b/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
similarity index 100%
rename from res/layout/actionbar_set_wallpaper.xml
rename to wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
diff --git a/res/layout/wallpaper_cropper.xml b/wallpaper_picker_res/layout/wallpaper_cropper.xml
similarity index 100%
rename from res/layout/wallpaper_cropper.xml
rename to wallpaper_picker_res/layout/wallpaper_cropper.xml
diff --git a/res/layout/wallpaper_picker.xml b/wallpaper_picker_res/layout/wallpaper_picker.xml
similarity index 100%
rename from res/layout/wallpaper_picker.xml
rename to wallpaper_picker_res/layout/wallpaper_picker.xml
diff --git a/res/layout/wallpaper_picker_image_picker_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_image_picker_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
diff --git a/res/layout/wallpaper_picker_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_item.xml
diff --git a/res/layout/wallpaper_picker_live_wallpaper_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_live_wallpaper_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
diff --git a/res/layout/wallpaper_picker_third_party_item.xml b/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
similarity index 100%
rename from res/layout/wallpaper_picker_third_party_item.xml
rename to wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
diff --git a/res/menu/cab_delete_wallpapers.xml b/wallpaper_picker_res/menu/cab_delete_wallpapers.xml
similarity index 100%
rename from res/menu/cab_delete_wallpapers.xml
rename to wallpaper_picker_res/menu/cab_delete_wallpapers.xml
diff --git a/res/mipmap-hdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
diff --git a/res/mipmap-mdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_wallpaper.png
rename to wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
diff --git a/res/values-nodpi/wallpapers.xml b/wallpaper_picker_res/values-nodpi/wallpapers.xml
similarity index 100%
rename from res/values-nodpi/wallpapers.xml
rename to wallpaper_picker_res/values-nodpi/wallpapers.xml
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/wallpaper_picker_res/values-sw720dp/dimens.xml
new file mode 100644
index 0000000000..9ae155b3cc
--- /dev/null
+++ b/wallpaper_picker_res/values-sw720dp/dimens.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="app_icon_size">72dp</dimen>
+
+<!-- QSB -->
+    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
+
+    <!-- When dragging items on the workspace, the number of dps by which the position of
+     the drag view should be offset from the position of the original view. -->
+    <dimen name="dragViewOffsetX">0dp</dimen>
+    <dimen name="dragViewOffsetY">0dp</dimen>
+</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/wallpaper_picker_res/values-sw720dp/styles.xml
new file mode 100644
index 0000000000..91078517db
--- /dev/null
+++ b/wallpaper_picker_res/values-sw720dp/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+</resources>
diff --git a/wallpaper_picker_res/values/colors.xml b/wallpaper_picker_res/values/colors.xml
new file mode 100644
index 0000000000..adae7cff6f
--- /dev/null
+++ b/wallpaper_picker_res/values/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2013, 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 
+**
+**     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 
+** limitations under the License.
+*/
+-->
+<resources>
+    <color name="wallpaper_picker_translucent_gray">#66000000</color>
+</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/wallpaper_picker_res/values/dimens.xml
new file mode 100644
index 0000000000..0447c6d1f7
--- /dev/null
+++ b/wallpaper_picker_res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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
+  
+          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
+     limitations under the License.
+-->
+
+<resources>
+<!-- Wallpaper picker -->
+    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
+    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
+    <dimen name="wallpaperItemIconSize">32dp</dimen>
+</resources>
diff --git a/wallpaper_picker_res/values/strings.xml b/wallpaper_picker_res/values/strings.xml
new file mode 100644
index 0000000000..1ee3513f90
--- /dev/null
+++ b/wallpaper_picker_res/values/strings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+    <string name="wallpaper_instructions">Set wallpaper</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper picker cannot load it -->
+    <string name="image_load_fail">Coudn\'t load image</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
+    <!-- Shown when wallpapers are selected in Wallpaper picker -->
+    <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+    <plurals name="number_of_items_selected">
+        <item quantity="zero">%1$d selected</item>
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
+         e.g. "Wallpaper 3 of 10" -->
+    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
+    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
+    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
+
+    <!-- Label on button to delete wallpaper(s) -->
+    <string name="wallpaper_delete">Delete</string>
+    <!-- Label on button in Wallpaper Picker to pick an image -->
+    <string name="pick_image">Pick image</string>
+    <!-- Option in "Select wallpaper from" dialog box -->
+    <string name="pick_wallpaper">Wallpapers</string>
+    <!-- Title of activity for cropping wallpapers -->
+    <string name="crop_wallpaper">Crop wallpaper</string>
+</resources>
diff --git a/wallpaper_picker_res/values/styles.xml b/wallpaper_picker_res/values/styles.xml
new file mode 100644
index 0000000000..0e48ddac43
--- /dev/null
+++ b/wallpaper_picker_res/values/styles.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
+    </style>
+
+    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+</resources>
diff --git a/src/android/util/Pools.java b/wallpaper_picker_src/android/util/Pools.java
similarity index 100%
rename from src/android/util/Pools.java
rename to wallpaper_picker_src/android/util/Pools.java
diff --git a/src/com/android/gallery3d/common/BitmapUtils.java b/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
similarity index 100%
rename from src/com/android/gallery3d/common/BitmapUtils.java
rename to wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
diff --git a/src/com/android/gallery3d/common/Utils.java b/wallpaper_picker_src/com/android/gallery3d/common/Utils.java
similarity index 100%
rename from src/com/android/gallery3d/common/Utils.java
rename to wallpaper_picker_src/com/android/gallery3d/common/Utils.java
diff --git a/src/com/android/gallery3d/exif/ByteBufferInputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ByteBufferInputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
diff --git a/src/com/android/gallery3d/exif/CountedDataInputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/CountedDataInputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
diff --git a/src/com/android/gallery3d/exif/ExifData.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifData.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
diff --git a/src/com/android/gallery3d/exif/ExifInterface.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifInterface.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
diff --git a/src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifInvalidFormatException.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
diff --git a/src/com/android/gallery3d/exif/ExifModifier.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifModifier.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
diff --git a/src/com/android/gallery3d/exif/ExifOutputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifOutputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
diff --git a/src/com/android/gallery3d/exif/ExifParser.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifParser.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
diff --git a/src/com/android/gallery3d/exif/ExifReader.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifReader.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
diff --git a/src/com/android/gallery3d/exif/ExifTag.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
similarity index 100%
rename from src/com/android/gallery3d/exif/ExifTag.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
diff --git a/src/com/android/gallery3d/exif/IfdData.java b/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
similarity index 100%
rename from src/com/android/gallery3d/exif/IfdData.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
diff --git a/src/com/android/gallery3d/exif/IfdId.java b/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
similarity index 100%
rename from src/com/android/gallery3d/exif/IfdId.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
diff --git a/src/com/android/gallery3d/exif/JpegHeader.java b/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
similarity index 100%
rename from src/com/android/gallery3d/exif/JpegHeader.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
diff --git a/src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
similarity index 100%
rename from src/com/android/gallery3d/exif/OrderedDataOutputStream.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
diff --git a/src/com/android/gallery3d/exif/Rational.java b/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
similarity index 100%
rename from src/com/android/gallery3d/exif/Rational.java
rename to wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
diff --git a/src/com/android/gallery3d/glrenderer/BasicTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/BasicTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
diff --git a/src/com/android/gallery3d/glrenderer/BitmapTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/BitmapTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
diff --git a/src/com/android/gallery3d/glrenderer/GLCanvas.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLCanvas.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
diff --git a/src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLES20Canvas.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
diff --git a/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
diff --git a/src/com/android/gallery3d/glrenderer/GLId.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLId.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
diff --git a/src/com/android/gallery3d/glrenderer/GLPaint.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/GLPaint.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
diff --git a/src/com/android/gallery3d/glrenderer/RawTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/RawTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
diff --git a/src/com/android/gallery3d/glrenderer/Texture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/Texture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
similarity index 100%
rename from src/com/android/gallery3d/glrenderer/UploadedTexture.java
rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
diff --git a/src/com/android/gallery3d/util/IntArray.java b/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
similarity index 100%
rename from src/com/android/gallery3d/util/IntArray.java
rename to wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
diff --git a/src/com/android/launcher3/CropView.java b/wallpaper_picker_src/com/android/launcher3/CropView.java
similarity index 100%
rename from src/com/android/launcher3/CropView.java
rename to wallpaper_picker_src/com/android/launcher3/CropView.java
diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
similarity index 100%
rename from src/com/android/launcher3/WallpaperCropActivity.java
rename to wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
similarity index 100%
rename from src/com/android/launcher3/WallpaperPickerActivity.java
rename to wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
diff --git a/src/com/android/photos/BitmapRegionTileSource.java b/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
similarity index 100%
rename from src/com/android/photos/BitmapRegionTileSource.java
rename to wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
diff --git a/src/com/android/photos/views/BlockingGLTextureView.java b/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
similarity index 100%
rename from src/com/android/photos/views/BlockingGLTextureView.java
rename to wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
diff --git a/src/com/android/photos/views/TiledImageRenderer.java b/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
similarity index 100%
rename from src/com/android/photos/views/TiledImageRenderer.java
rename to wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
diff --git a/src/com/android/photos/views/TiledImageView.java b/wallpaper_picker_src/com/android/photos/views/TiledImageView.java
similarity index 100%
rename from src/com/android/photos/views/TiledImageView.java
rename to wallpaper_picker_src/com/android/photos/views/TiledImageView.java

From fe69287b97d16c8941ab9463e4868fca45ad8152 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 11 Dec 2013 14:47:23 -0800
Subject: [PATCH 066/147] Fix new NPE relating to reorder hints

Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47
---
 src/com/android/launcher3/CellLayout.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index a05dd90c05..75f6a196c0 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2632,9 +2632,9 @@ public class CellLayout extends ViewGroup {
         }
 
         if (mode == MODE_SHOW_REORDER_HINT) {
-            beginOrAdjustReorderPreviewAnimations(finalSolution, dragView, 0,
-                    ReorderPreviewAnimation.MODE_HINT);
             if (finalSolution != null) {
+                beginOrAdjustReorderPreviewAnimations(finalSolution, dragView, 0,
+                        ReorderPreviewAnimation.MODE_HINT);
                 result[0] = finalSolution.dragViewX;
                 result[1] = finalSolution.dragViewY;
                 resultSpan[0] = finalSolution.dragViewSpanX;

From dcd27ba90940f29bfc185c86c1b5b789e0d8f2de Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 11 Dec 2013 15:28:15 -0800
Subject: [PATCH 067/147] Fixing issue with Widget sizes being icorrectly
 reported.

Change-Id: I8474514cc3722d8450c707b7fd1ccea2ea344a59
---
 src/com/android/launcher3/Workspace.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bf4f561e0a..a1eb27dba2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3115,13 +3115,11 @@ public class Workspace extends SmoothPagedView
         display.getCurrentSizeRange(smallestSize, largestSize);
         int countX = (int) grid.numColumns;
         int countY = (int) grid.numRows;
-        int constrainedLongEdge = largestSize.y;
-        int constrainedShortEdge = smallestSize.y;
         if (orientation == CellLayout.LANDSCAPE) {
             if (mLandscapeCellLayoutMetrics == null) {
                 Rect padding = grid.getWorkspacePadding(CellLayout.LANDSCAPE);
-                int width = constrainedLongEdge - padding.left - padding.right;
-                int height = constrainedShortEdge - padding.top - padding.bottom;
+                int width = largestSize.x - padding.left - padding.right;
+                int height = smallestSize.y - padding.top - padding.bottom;
                 mLandscapeCellLayoutMetrics = new Rect();
                 mLandscapeCellLayoutMetrics.set(
                         grid.calculateCellWidth(width, countX),
@@ -3131,8 +3129,8 @@ public class Workspace extends SmoothPagedView
         } else if (orientation == CellLayout.PORTRAIT) {
             if (mPortraitCellLayoutMetrics == null) {
                 Rect padding = grid.getWorkspacePadding(CellLayout.PORTRAIT);
-                int width = constrainedShortEdge - padding.left - padding.right;
-                int height = constrainedLongEdge - padding.top - padding.bottom;
+                int width = smallestSize.x - padding.left - padding.right;
+                int height = largestSize.y - padding.top - padding.bottom;
                 mPortraitCellLayoutMetrics = new Rect();
                 mPortraitCellLayoutMetrics.set(
                         grid.calculateCellWidth(width, countX),

From ae4409dea97d03f0f0a9195ab648188efa2b5cc1 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 26 Nov 2013 10:34:59 -0800
Subject: [PATCH 068/147] Don't load items which exceed the grid bounds

-> Unified location where this is managed (with other placement verification)
-> For now, not deleting out of bounds items, but can turn it on in one line

Change-Id: I5e1a5cd357d80475ae40af7b89a0cd372d5c241b
---
 src/com/android/launcher3/LauncherModel.java | 74 +++++++++-----------
 1 file changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index cb2d23b5fb..da805a05a6 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1532,16 +1532,9 @@ public class LauncherModel extends BroadcastReceiver {
             }
         }
 
-        private boolean checkItemDimensions(ItemInfo info) {
-            LauncherAppState app = LauncherAppState.getInstance();
-            DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
-            return (info.cellX + info.spanX) > (int) grid.numColumns ||
-                    (info.cellY + info.spanY) > (int) grid.numRows;
-        }
-
         // check & update map of what's occupied; used to discard overlapping/invalid items
         private boolean checkItemPlacement(HashMap<Long, ItemInfo[][]> occupied, ItemInfo item,
-                                           AtomicBoolean deleteOnItemOverlap) {
+                                           AtomicBoolean deleteOnInvalidPlacement) {
             LauncherAppState app = LauncherAppState.getInstance();
             DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
             final int countX = (int) grid.numColumns;
@@ -1552,7 +1545,7 @@ public class LauncherModel extends BroadcastReceiver {
                 // Return early if we detect that an item is under the hotseat button
                 if (mCallbacks == null ||
                         mCallbacks.get().isAllAppsButtonRank((int) item.screenId)) {
-                    deleteOnItemOverlap.set(true);
+                    deleteOnInvalidPlacement.set(true);
                     Log.e(TAG, "Error loading shortcut into hotseat " + item
                             + " into position (" + item.screenId + ":" + item.cellX + ","
                             + item.cellY + ") occupied by all apps");
@@ -1562,6 +1555,14 @@ public class LauncherModel extends BroadcastReceiver {
                 final ItemInfo[][] hotseatItems =
                         occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT);
 
+                if (item.screenId >= grid.numHotseatIcons) {
+                    Log.e(TAG, "Error loading shortcut " + item
+                            + " into hotseat position " + item.screenId
+                            + ", position out of bounds: (0 to " + (grid.numHotseatIcons - 1)
+                            + ")");
+                    return false;
+                }
+
                 if (hotseatItems != null) {
                     if (hotseatItems[(int) item.screenId][0] != null) {
                         Log.e(TAG, "Error loading shortcut into hotseat " + item
@@ -1575,7 +1576,7 @@ public class LauncherModel extends BroadcastReceiver {
                         return true;
                     }
                 } else {
-                    final ItemInfo[][] items = new ItemInfo[(int) grid.numHotseatIcons + 1][1];
+                    final ItemInfo[][] items = new ItemInfo[(int) grid.numHotseatIcons][1];
                     items[(int) item.screenId][0] = item;
                     occupied.put((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT, items);
                     return true;
@@ -1591,6 +1592,16 @@ public class LauncherModel extends BroadcastReceiver {
             }
 
             final ItemInfo[][] screens = occupied.get(item.screenId);
+            if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&
+                    item.cellX < 0 || item.cellY < 0 ||
+                    item.cellX + item.spanX > countX || item.cellY + item.spanY > countY) {
+                Log.e(TAG, "Error loading shortcut " + item
+                        + " into cell (" + containerIndex + "-" + item.screenId + ":"
+                        + item.cellX + "," + item.cellY
+                        + ") out of screen bounds ( " + countX + "x" + countY + ")");
+                return false;
+            }
+
             // Check if any workspace icons overlap with each other
             for (int x = item.cellX; x < (item.cellX+item.spanX); x++) {
                 for (int y = item.cellY; y < (item.cellY+item.spanY); y++) {
@@ -1709,7 +1720,7 @@ public class LauncherModel extends BroadcastReceiver {
                     Intent intent;
 
                     while (!mStopped && c.moveToNext()) {
-                        AtomicBoolean deleteOnItemOverlap = new AtomicBoolean(false);
+                        AtomicBoolean deleteOnInvalidPlacement = new AtomicBoolean(false);
                         try {
                             int itemType = c.getInt(itemTypeIndex);
 
@@ -1770,18 +1781,11 @@ public class LauncherModel extends BroadcastReceiver {
                                     info.cellY = c.getInt(cellYIndex);
                                     info.spanX = 1;
                                     info.spanY = 1;
-                                    // Skip loading items that are out of bounds
-                                    if (container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
-                                        if (checkItemDimensions(info)) {
-                                            Launcher.addDumpLog(TAG, "Skipped loading out of bounds shortcut: "
-                                                    + info + ", " + grid.numColumns + "x" + grid.numRows, true);
-                                            continue;
-                                        }
-                                    }
+
                                     // check & update map of what's occupied
-                                    deleteOnItemOverlap.set(false);
-                                    if (!checkItemPlacement(occupied, info, deleteOnItemOverlap)) {
-                                        if (deleteOnItemOverlap.get()) {
+                                    deleteOnInvalidPlacement.set(false);
+                                    if (!checkItemPlacement(occupied, info, deleteOnInvalidPlacement)) {
+                                        if (deleteOnInvalidPlacement.get()) {
                                             itemsToRemove.add(id);
                                         }
                                         break;
@@ -1823,18 +1827,11 @@ public class LauncherModel extends BroadcastReceiver {
                                 folderInfo.spanX = 1;
                                 folderInfo.spanY = 1;
 
-                                // Skip loading items that are out of bounds
-                                if (container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
-                                    if (checkItemDimensions(folderInfo)) {
-                                        Log.d(TAG, "Skipped loading out of bounds folder");
-                                        continue;
-                                    }
-                                }
                                 // check & update map of what's occupied
-                                deleteOnItemOverlap.set(false);
+                                deleteOnInvalidPlacement.set(false);
                                 if (!checkItemPlacement(occupied, folderInfo,
-                                        deleteOnItemOverlap)) {
-                                    if (deleteOnItemOverlap.get()) {
+                                        deleteOnInvalidPlacement)) {
+                                    if (deleteOnInvalidPlacement.get()) {
                                         itemsToRemove.add(id);
                                     }
                                     break;
@@ -1890,18 +1887,11 @@ public class LauncherModel extends BroadcastReceiver {
                                     }
 
                                     appWidgetInfo.container = c.getInt(containerIndex);
-                                    // Skip loading items that are out of bounds
-                                    if (container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
-                                        if (checkItemDimensions(appWidgetInfo)) {
-                                            Log.d(TAG, "Skipped loading out of bounds app widget");
-                                            continue;
-                                        }
-                                    }
                                     // check & update map of what's occupied
-                                    deleteOnItemOverlap.set(false);
+                                    deleteOnInvalidPlacement.set(false);
                                     if (!checkItemPlacement(occupied, appWidgetInfo,
-                                            deleteOnItemOverlap)) {
-                                        if (deleteOnItemOverlap.get()) {
+                                            deleteOnInvalidPlacement)) {
+                                        if (deleteOnInvalidPlacement.get()) {
                                             itemsToRemove.add(id);
                                         }
                                         break;

From bd2243aca1ad6a21958923929dc376d36f8a87dc Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Wed, 11 Dec 2013 21:11:15 -0800
Subject: [PATCH 069/147] Import translations. DO NOT MERGE

Change-Id: I82b885284a196a6e466640d7790dc3c977f247a5
Auto-generated-cl: translation import
---
 res/values-af/strings.xml     | 14 --------------
 res/values-am/strings.xml     | 14 --------------
 res/values-ar/strings.xml     | 14 --------------
 res/values-be/strings.xml     | 21 ---------------------
 res/values-bg/strings.xml     | 14 --------------
 res/values-ca/strings.xml     | 14 --------------
 res/values-cs/strings.xml     | 14 --------------
 res/values-da/strings.xml     | 14 --------------
 res/values-de/strings.xml     | 14 --------------
 res/values-el/strings.xml     | 14 --------------
 res/values-en-rGB/strings.xml | 14 --------------
 res/values-en-rIN/strings.xml | 14 --------------
 res/values-es-rUS/strings.xml | 14 --------------
 res/values-es/strings.xml     | 14 --------------
 res/values-et-rEE/strings.xml | 14 --------------
 res/values-fa/strings.xml     | 14 --------------
 res/values-fi/strings.xml     | 14 --------------
 res/values-fr-rCA/strings.xml | 14 --------------
 res/values-fr/strings.xml     | 14 --------------
 res/values-hi/strings.xml     | 14 --------------
 res/values-hr/strings.xml     | 14 --------------
 res/values-hu/strings.xml     | 14 --------------
 res/values-hy-rAM/strings.xml | 14 --------------
 res/values-in/strings.xml     | 14 --------------
 res/values-it/strings.xml     | 14 --------------
 res/values-iw/strings.xml     | 14 --------------
 res/values-ja/strings.xml     | 14 --------------
 res/values-ka-rGE/strings.xml | 14 --------------
 res/values-km-rKH/strings.xml | 14 --------------
 res/values-ko/strings.xml     | 14 --------------
 res/values-lo-rLA/strings.xml | 14 --------------
 res/values-lt/strings.xml     | 14 --------------
 res/values-lv/strings.xml     | 14 --------------
 res/values-mn-rMN/strings.xml | 14 --------------
 res/values-ms-rMY/strings.xml | 14 --------------
 res/values-nb/strings.xml     | 14 --------------
 res/values-nl/strings.xml     | 14 --------------
 res/values-pl/strings.xml     | 14 --------------
 res/values-pt-rPT/strings.xml | 14 --------------
 res/values-pt/strings.xml     | 14 --------------
 res/values-rm/strings.xml     | 21 ---------------------
 res/values-ro/strings.xml     | 14 --------------
 res/values-ru/strings.xml     | 14 --------------
 res/values-sk/strings.xml     | 14 --------------
 res/values-sl/strings.xml     | 14 --------------
 res/values-sr/strings.xml     | 14 --------------
 res/values-sv/strings.xml     | 14 --------------
 res/values-sw/strings.xml     | 14 --------------
 res/values-th/strings.xml     | 14 --------------
 res/values-tl/strings.xml     | 14 --------------
 res/values-tr/strings.xml     | 14 --------------
 res/values-uk/strings.xml     | 14 --------------
 res/values-vi/strings.xml     | 14 --------------
 res/values-zh-rCN/strings.xml | 14 --------------
 res/values-zh-rHK/strings.xml | 14 --------------
 res/values-zh-rTW/strings.xml | 14 --------------
 res/values-zu/strings.xml     | 14 --------------
 57 files changed, 812 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index de987bdb4c..34a5568dc2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Tuis"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android-kernprogramme"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Stel muurpapier"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kon prent nie laai nie"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kon prent nie as muurpapier laai nie"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d gekies"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d gekies"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d gekies"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Muurpapier %1$d van %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Vee uit"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Kies prent"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Muurpapiere"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Snoei muurpapier"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Program is nie geïnstalleer nie."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Legstukke"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Legstukke"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index dc64c5d76b..c6420d56bc 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"መነሻ"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android ዋና መተግበሪያዎች"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"የግድግዳ ወረቀት አዘጋጅ"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"ምስሉን መጫን አልተቻለም"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ተመርጧል"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ተመርጧል"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ተመርጧል"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"የግድግዳ ወረቀት %1$d ከ%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"ሰርዝ"</string>
-    <string name="pick_image" msgid="1272073934062909527">"ምስል ምረጥ"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"የግድግዳ ወረቀቶች"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"የግድግዳ ወረቀት ከርክም"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"መተግበሪያ አልተጫነም።"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ፍርግሞች"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ፍርግሞች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 84c157e2bc..aeca02532d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"الرئيسية"</string>
     <string name="uid_name" msgid="7820867637514617527">"‏تطبيقات Android الأساسية"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"تعيين خلفية"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"تعذر تحميل الصورة"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"تعذر تحميل الصورة كخلفية"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"‏تم تحديد %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"‏تم تحديد %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"‏تم تحديد %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"‏الخلفية %1$d من %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"حذف"</string>
-    <string name="pick_image" msgid="1272073934062909527">"اختيار صورة"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"الخلفيات"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"اقتصاص الخلفية"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"لم يتم تثبيت التطبيق."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"الأدوات"</string>
     <string name="widget_adder" msgid="3201040140710381657">"الأدوات"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2015158d9b..246553467b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -26,27 +26,6 @@
     <!-- no translation found for uid_name (7820867637514617527) -->
     <skip />
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <!-- no translation found for wallpaper_instructions (563973358787555519) -->
-    <skip />
-    <!-- no translation found for image_load_fail (2821429163328561136) -->
-    <skip />
-    <!-- no translation found for wallpaper_load_fail (1261270681127096352) -->
-    <skip />
-    <!-- no translation found for number_of_items_selected:zero (7464587177007785408) -->
-    <!-- no translation found for number_of_items_selected:one (142482526010824029) -->
-    <!-- no translation found for number_of_items_selected:other (1418352074806573570) -->
-    <!-- no translation found for wallpaper_accessibility_name (1655953108132967972) -->
-    <skip />
-    <!-- no translation found for announce_selection (8338254712932127413) -->
-    <skip />
-    <!-- no translation found for wallpaper_delete (8095005658756613921) -->
-    <skip />
-    <!-- no translation found for pick_image (1272073934062909527) -->
-    <skip />
-    <!-- no translation found for pick_wallpaper (8179698221502010609) -->
-    <skip />
-    <!-- no translation found for crop_wallpaper (8334345984491368009) -->
-    <skip />
     <!-- no translation found for activity_not_found (8071924732094499514) -->
     <skip />
     <!-- no translation found for widgets_tab_label (2921133187116603919) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e57e9d2da6..2a2b72d290 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Начало"</string>
     <string name="uid_name" msgid="7820867637514617527">"Основни приложения на Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Задаване на тапета"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Изображението не можа да бъде заредено"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Изображението не можа да бъде заредено като тапет"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Избрахте %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Избрахте %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Избрахте %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Тапет %1$d от %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Избрахте <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Изтриване"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Избиране на изображение"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Тапети"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Подрязване на тапета"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Приложението не е инсталирано."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Приспособления"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Приспособления"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a9eb99c1db..fa520ba678 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Inici"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicacions principals d\'Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Estableix el fons de pantalla"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"No s\'ha pogut carregar la imatge."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"No s\'ha pogut carregar la imatge com a fons de pantalla."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Seleccionats: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Seleccionats: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Seleccionats: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fons de pantalla %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"S\'ha seleccionat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Suprimeix"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Selecciona una imatge"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fons de pantalla"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Retalla el fons de pantalla"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'aplicació no s\'ha instal·lat."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 258f645321..fdd48458c8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Plocha"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nastavit jako tapetu"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Obrázek nelze načíst."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Obrázek nelze načíst jako tapetu."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Vybráno: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Vybráno: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Vybráno: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Tapeta %1$d z %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Vybrána položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Smazat"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vybrat obrázek"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Tapety"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Oříznutí tapety"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikace není nainstalována."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgety"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgety"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 96b6af624a..9bf05f0b64 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startskærm"</string>
     <string name="uid_name" msgid="7820867637514617527">"Kerneapps i Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Angiv baggrund"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Billedet kunne ikke indlæses"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Billedet kunne ikke indlæses som baggrund"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d er valgt"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d er valgt"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d er valgt"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Baggrund %1$d af %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> blev valgt"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Slet"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vælg billede"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Baggrunde"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Beskær baggrund"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen er ikke installeret."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b95d482700..249af37f34 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startseite"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Hintergrund auswählen"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Bild konnte nicht geladen werden."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Bild konnte nicht als Hintergrund geladen werden."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ausgewählt"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ausgewählt"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ausgewählt"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Hintergrund %1$d von %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> ausgewählt"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Entfernen"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Bild auswählen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Hintergründe"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Hintergrund zuschneiden"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App ist nicht installiert."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2c3f3f5b1d..cfb97ece02 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Αρχική σελίδα"</string>
     <string name="uid_name" msgid="7820867637514617527">"Βασικές εφαρμογές Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ορισμός ταπετσαρίας"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Δεν ήταν δυνατή η φόρτωση της εικόνας"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Δεν ήταν δυνατή η φόρτωση της εικόνας ως ταπετσαρία"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d επιλεγμένα"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d επιλεγμένα"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d επιλεγμένα"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Ταπετσαρία %1$d από %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Επιλέχθηκε το <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Διαγραφή"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Επιλογή εικόνας"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ταπετσαρίες"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Περικοπή ταπετσαρίας"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Η εφαρμογή δεν έχει εγκατασταθεί."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Γραφικά στοιχεία"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Γραφικά στοιχεία"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0e3e5591aa..2ca832b330 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Set wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Coudn\'t load image"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Couldn\'t load image as wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selected"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selected"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selected"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Delete"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pick image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Wallpapers"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Crop wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App isn\'t installed."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0e3e5591aa..2ca832b330 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Set wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Coudn\'t load image"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Couldn\'t load image as wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selected"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selected"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selected"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Delete"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pick image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Wallpapers"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Crop wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App isn\'t installed."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fd37c32cd3..cec4c10a8c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Pantalla principal"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicaciones básicas de Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Establecer como fondo de pantalla"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"No se pudo cargar la imagen."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"No se pudo cargar la imagen como fondo de pantalla."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d seleccionados"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d seleccionado"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d seleccionados"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fondo de pantalla %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Eliminar"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Elegir imagen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fondos de pantalla"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Recortar fondo de pantalla"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"No se instaló la aplicación."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ad6b2200d1..73dae125f8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicaciones básicas de Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Establecer fondo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"No se ha podido cargar la imagen"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"No se ha podido cargar la imagen como fondo de pantalla"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Seleccionados: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Seleccionados: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Seleccionados: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fondo de pantalla %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Eliminar"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Seleccionar imagen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fondos de pantalla"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Recortar fondo de pantalla"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"La aplicación no está instalada."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ab4ad02cda..a68778a3ec 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Avaekraan"</string>
     <string name="uid_name" msgid="7820867637514617527">"Androidi tuumrakendused"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Määra taustapilt"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kujutist ei õnnestunud laadida"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kujutist ei õnnestunud taustapildina laadida"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Valitud on %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Valitud on %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Valitud on %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d/%2$d taustapildist"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Valitud on <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Kustuta"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vali kujutis"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Taustapildid"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Taustapildi kärpimine"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Rakendus pole installitud."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Vidinad"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Vidinad"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2dd1bcea6f..f118c10144 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"صفحه اصلی"</string>
     <string name="uid_name" msgid="7820867637514617527">"‏برنامه‌های Android Core"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"تنظیم کاغذدیواری"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"بارگیری تصویر انجام نشد"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"بارگیری تصویر به‌عنوان کاغذدیواری انجام نشد"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"‏%1$d انتخاب شد"</item>
-    <item quantity="one" msgid="142482526010824029">"‏%1$d انتخاب شد"</item>
-    <item quantity="other" msgid="1418352074806573570">"‏%1$d انتخاب شد"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"‏کاغذ دیواری %1$d از %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> انتخاب شده"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"حذف"</string>
-    <string name="pick_image" msgid="1272073934062909527">"انتخاب تصویر"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"کاغذدیواری‌ها"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"برش کاغذ دیواری"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"برنامه نصب نشده است."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ابزارک‌ها"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ابزارک‌ها"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c5f478f2e6..549804d602 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Aloitusruutu"</string>
     <string name="uid_name" msgid="7820867637514617527">"Androidin ydinsovellukset"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Aseta taustakuva"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kuvan lataus epäonnistui"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kuvaa ei voitu ladata taustakuvaksi"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d valittu"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d valittu"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d valittu"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Taustakuva %1$d/%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Valittu: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Poista"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Valitse kuva"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Taustakuvat"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Rajaa taustakuva"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Sovellusta ei ole asennettu."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgetit"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgetit"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 49adaac94a..97c03fe15c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Accueil"</string>
     <string name="uid_name" msgid="7820867637514617527">"Applications de base Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Définir le fond d\'écran"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Impossible de charger l\'image"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Impossible de charger l\'image comme fond d\'écran"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d sélectionné"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d sélectionné"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d sélectionné(s)"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fond d\'écran %1$d sur %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Sélection : <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Supprimer"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Sélectionner une image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fonds d\'écran"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Rogner le fond d\'écran"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bb466ea6d2..0f9d836c43 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Accueil"</string>
     <string name="uid_name" msgid="7820867637514617527">"Applications de base Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Définir comme fond d\'écran"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Impossible de charger l\'image."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Impossible de charger l\'image comme fond d\'écran."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d fond d\'écran sélectionné"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d fond d\'écran sélectionné"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d fonds d\'écran sélectionnés"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fond d\'écran %1$d sur %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> est sélectionné."</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Supprimer"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Sélectionner une image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fonds d\'écran"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Rogner le fond d\'écran"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b1060780c0..e149e0fcc6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"होम"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android के मुख्य एप्लिकेशन"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"वॉलपेपर सेट करें"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"चित्र लोड नहीं किया जा सका"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"चित्र को वॉलपेपर के रूप में लोड नहीं किया जा सका"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d चयनित"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d चयनित"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d चयनित"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"वॉलपेपर %2$d में से %1$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"चयनित <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"हटाएं"</string>
-    <string name="pick_image" msgid="1272073934062909527">"चित्र चुनें"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"वॉलपेपर"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"वॉलपेपर काटें"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"एप्‍लिकेशन इंस्‍टॉल नहीं है."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"विजेट"</string>
     <string name="widget_adder" msgid="3201040140710381657">"विजेट"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9c7d38ee3e..c9b119fefc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Početna"</string>
     <string name="uid_name" msgid="7820867637514617527">"Matične aplikacije za Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Postavi pozadinsku sliku"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nije moguće učitati sliku"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nije moguće učitati sliku kao pozadinsku sliku"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Odabrano: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Odabrano: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Odabrano: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d. pozadinska slika od %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Odabrana je stavka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Izbriši"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Odaberi sliku"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Pozadinske slike"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Obreži pozadinsku sliku"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacija nije instalirana."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgeti"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgeti"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 89504ddcfc..2b33776438 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Főoldal"</string>
     <string name="uid_name" msgid="7820867637514617527">"Alap Android-alkalmazások"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Háttérkép beállítása"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"A kép betöltése nem sikerült"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"A kép betöltése háttérképként nem sikerült"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d kiválasztva"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d kiválasztva"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d kiválasztva"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%2$d/%1$d. háttérkép"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> kiválasztva"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Törlés"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Kép választása"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Háttérképek"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Háttérkép körbevágása"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Az alkalmazás nincs telepítve."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Modulok"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Modulok"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 618193d27a..eb7396b15a 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Հիմնական"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Սահմանել պաստառը"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Չհաջողվեց բեռնել նկարը"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Չհաջողվեց նկարը սահմանել որպես պաստառ"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ընտրված"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ընտրված"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ընտրված"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d պաստառ՝ %2$d-ից"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Ընտրված է <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ջնջել"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Ընտրել պատկեր"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Պաստառներ"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Եզրատել պաստառը"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Ծրագիրը տեղադրված չէ:"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Վիջեթներ"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Վիջեթներ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cb91c30893..87d163ac30 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Layar Utama"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplikasi Inti Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Setel wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Tidak dapat memuat gambar"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Tidak dapat memuat gambar sebagai wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d dipilih"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d dipilih"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d dipilih"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d dari %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> terpilih"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Hapus"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pilih gambar"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Wallpaper"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Pangkas wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikasi tidak dipasang."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ba4067903e..92d79b0408 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home page"</string>
     <string name="uid_name" msgid="7820867637514617527">"Applicazioni di base Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Imposta sfondo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Impossibile caricare l\'immagine"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Impossibile caricare l\'immagine come sfondo"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selezionati"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selezionato"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selezionati"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Sfondo %1$d di %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Elimina"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Scegli immagine"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Sfondi"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Ritaglia sfondo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App non installata."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8d70a252d7..a348646d31 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"דף הבית"</string>
     <string name="uid_name" msgid="7820867637514617527">"‏אפליקציות הליבה של Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"בחר טפט"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"לא ניתן היה לטעון את התמונה"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"לא ניתן היה לטעון את התמונה כטפט"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"‏%1$d נבחרו"</item>
-    <item quantity="one" msgid="142482526010824029">"‏%1$d נבחרו"</item>
-    <item quantity="other" msgid="1418352074806573570">"‏%1$d נבחרו"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"‏טפט %1$d מתוך %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"בחרת <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"מחק"</string>
-    <string name="pick_image" msgid="1272073934062909527">"בחר תמונה"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"טפטים"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"חתוך את הטפט"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"האפליקציה לא מותקנת."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"רכיבי ווידג\'ט"</string>
     <string name="widget_adder" msgid="3201040140710381657">"רכיבי ווידג\'ט"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3c2b2f0ba9..1de0be5c32 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"ホーム"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"壁紙を設定"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"画像を読み込めませんでした"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"画像を壁紙として読み込めませんでした"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d件選択済み"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d件選択済み"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d件選択済み"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"壁紙: %1$d/%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"選択: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"削除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"画像を選択"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"壁紙"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"壁紙をトリミング"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"このアプリはインストールされていません。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ウィジェット"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ウィジェット"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a68951a156..c004f07f1c 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"მთავარი"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android-ის ბირთვის აპები"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"ფონის დაყენება"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"სურათი ვერ ჩაიტვირთა."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"სურათი ფონად ვერ ჩაიტვირთა."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"არჩეულია %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"არჩეულია %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"არჩეულია %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"ფონი %1$d %2$d-დან"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"არჩეულია <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"წაშლა"</string>
-    <string name="pick_image" msgid="1272073934062909527">"სურათის ამორჩევა"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"ფონები"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ფონის ჩამოჭრა"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"აპი არ არის დაყენებული."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ვიჯეტები"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ვიჯეტები"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 6799f77550..84781bcc21 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"ដើម"</string>
     <string name="uid_name" msgid="7820867637514617527">"កម្មវិធី​​សំខាន់​ៗ​របស់ Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"កំណត់​ផ្ទាំង​រូបភាព"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"មិន​អាច​ផ្ទុក​រូបភាព"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"មិន​អាច​ផ្ទុក​រូបភាព​ជា​ផ្ទាំង​រូបភាព"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"បាន​ជ្រើស %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"បាន​ជ្រើស %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"បាន​ជ្រើស %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"ផ្ទាំង​រូបភាព %1$d នៃ %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"​បាន​ជ្រើស <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"លុប"</string>
-    <string name="pick_image" msgid="1272073934062909527">"ជ្រើស​យក​រូបភាព"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"ផ្ទាំង​រូបភាព"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ច្រឹប​ផ្ទាំង​រូបភាព"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"មិន​បាន​ដំឡើង​កម្មវិធី។"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ធាតុ​ក្រាហ្វិក"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 82193d2d79..59f2103d89 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"홈"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 핵심 앱"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"배경화면 설정"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"이미지를 로드할 수 없습니다."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"이미지를 배경화면으로 로드할 수 없습니다."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d개 선택됨"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d개 선택됨"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d개 선택됨"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"배경화면 %1$d/%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> 선택함"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"삭제"</string>
-    <string name="pick_image" msgid="1272073934062909527">"이미지 선택"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"배경화면"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"배경화면 잘라내기"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"앱이 설치되지 않았습니다."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"위젯"</string>
     <string name="widget_adder" msgid="3201040140710381657">"위젯"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index fac96e42f9..ad2feeab45 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"ໜ້າຫຼັກ"</string>
     <string name="uid_name" msgid="7820867637514617527">"ແອັບພລິເຄຊັນຫຼັກຂອງ Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"ຕັ້ງເປັນພາບພື້ນຫຼັງ"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"ບໍ່ສາມາດໂຫຼດຮູບພາບໄດ້"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"ບໍ່​ສາ​ມາດ​ໂຫຼດ​ຮູບພາບ​ເປັນ​ຮູບພື້ນຫຼັງໄດ້"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
-    <item quantity="one" msgid="142482526010824029">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
-    <item quantity="other" msgid="1418352074806573570">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"ຮູບພືື້ນຫຼັງ %1$d ໃນ %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"ເລືອກແລ້ວ <xliff:g id="LABEL">%1$s</xliff:g> ອັນ"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"ລຶບ"</string>
-    <string name="pick_image" msgid="1272073934062909527">"ເລືອກຮູບ"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"ພາບພື້ນຫຼັງ"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ຕັດຮູບພື້ນຫຼັງ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ແອັບຯບໍ່ໄດ້ຖືກຕິດຕັ້ງ."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ວິດເຈັດ"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ວິດເຈັດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1d53bf1eff..8b1f396032 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Pagrindinis"</string>
     <string name="uid_name" msgid="7820867637514617527">"Pagrindinės „Android“ programos"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nustatyti ekrano foną"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nepavyko įkelti vaizdo"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nepavyko įkelti vaizdo kaip ekrano fono"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Pasirinkta: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Pasirinkta: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Pasirinkta: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d iš %2$d ekrano fonų"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Pasirinkta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ištrinti"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pasirinkti vaizdą"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ekrano fonai"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Ekrano fono apkirpimas"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Programa neįdiegta."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Valdikliai"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Valdikliai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 856439b7a8..964d84d133 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Sākums"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android pamatlietotnes"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Iestatīt fona tapeti"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nevarēja ielādēt attēlu."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nevarēja ielādēt attēlu kā fona tapeti."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Atlasīti: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Atlasīti: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Atlasīti: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d. fona tapete no %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Atlasīts: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Dzēst"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Izvēlēties attēlu"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fona tapetes"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Apgriezt fona tapeti"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Lietotne nav instalēta."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Logrīki"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Logrīki"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 20af05e0d1..bed237a832 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Нүүр"</string>
     <string name="uid_name" msgid="7820867637514617527">"Андройд үндсэн апп"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ханын зургийг тохируулах"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Зургийг ачааллаж чадсангүй"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Зургийг ханын зураг болгож ачааллаж чадсангүй"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d сонгогдсон"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d сонгогдсон"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d сонгогдсон"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%2$d ханын цаасны %1$d нь"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> сонгогдсон"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Устгах"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Зураг сонгох"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ханын зураг"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Ханын зургийг тайрах"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Апп суугаагүй байна."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Виджет"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Виджет"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dca483d3e8..3558b25107 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Laman Utama"</string>
     <string name="uid_name" msgid="7820867637514617527">"Apl Teras Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Tetapkan kertas dinding"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Tidak dapat memuatkan imej"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Tidak dapat memuatkan imej sebagai kertas dinding"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d dipilih"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d dipilih"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d dipilih"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Kertas dinding %1$d daripada %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Memilih <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Padam"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pilih imej"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Kertas dinding"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Pangkas kertas dinding"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Apl tidak dipasang."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9cb161fe2d..13d87591e1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startside"</string>
     <string name="uid_name" msgid="7820867637514617527">"Kjerneapper for Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Angi bakgrunn"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kunne ikke laste inn bildet"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kunne ikke laste inn bildet som bakgrunn"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d valgt"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d valgt"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d valgt"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Bakgrunn %1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Valgt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Slett"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Velg bilde"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Bakgrunner"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Beskjær bakgrunnen"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen er ikke installert."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Moduler"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Moduler"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e28b3955c5..aa035a09ab 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startpagina"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android-kernapps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Achtergrond instellen"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kan afbeelding niet laden"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kan afbeelding niet laden als achtergrond"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d geselecteerd"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d geselecteerd"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d geselecteerd"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Achtergrond %1$d van %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> is geselecteerd"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Verwijderen"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Afbeelding kiezen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Achtergronden"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Achtergrond bijsnijden"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App is niet geïnstalleerd."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ec72374d53..9eade81a9a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ekran główny"</string>
     <string name="uid_name" msgid="7820867637514617527">"Główne aplikacje Androida"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ustaw tapetę"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nie udało się załadować obrazu"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nie udało się załadować obrazu jako tapety"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Wybrane: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Wybrane: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Wybrane: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Tapeta %1$d z %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Wybrano <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Usuń"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Wybierz obraz"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Tapety"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Przytnij tapetę"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacja nie jest zainstalowana."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widżety"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widżety"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 510468e2ed..4c9401dc38 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ecrã principal"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicações principais do Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Definir imagem fundo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Não foi possível carregar a imagem"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Não foi possível carregar a imagem como imagem de fundo"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selecionado(s)"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selecionado(s)"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selecionado(s)"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Imagem de fundo %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Eliminar"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Escolher imagem"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Imagens de fundo"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Recortar imagem de fundo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"A aplicação não está instalada."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1ac9f5b49a..d82d9ea1d2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Início"</string>
     <string name="uid_name" msgid="7820867637514617527">"Principais aplicativos do Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Definir plano de fundo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Não foi possível carregar a imagem"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Não foi possível carregar a imagem como plano de fundo"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selecionados"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selecionados"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selecionados"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Plano de fundo %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Excluir"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Escolher imagem"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Planos de fundo"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Cortar plano de fundo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"O aplicativo não está instalado."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 2015158d9b..246553467b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -26,27 +26,6 @@
     <!-- no translation found for uid_name (7820867637514617527) -->
     <skip />
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <!-- no translation found for wallpaper_instructions (563973358787555519) -->
-    <skip />
-    <!-- no translation found for image_load_fail (2821429163328561136) -->
-    <skip />
-    <!-- no translation found for wallpaper_load_fail (1261270681127096352) -->
-    <skip />
-    <!-- no translation found for number_of_items_selected:zero (7464587177007785408) -->
-    <!-- no translation found for number_of_items_selected:one (142482526010824029) -->
-    <!-- no translation found for number_of_items_selected:other (1418352074806573570) -->
-    <!-- no translation found for wallpaper_accessibility_name (1655953108132967972) -->
-    <skip />
-    <!-- no translation found for announce_selection (8338254712932127413) -->
-    <skip />
-    <!-- no translation found for wallpaper_delete (8095005658756613921) -->
-    <skip />
-    <!-- no translation found for pick_image (1272073934062909527) -->
-    <skip />
-    <!-- no translation found for pick_wallpaper (8179698221502010609) -->
-    <skip />
-    <!-- no translation found for crop_wallpaper (8334345984491368009) -->
-    <skip />
     <!-- no translation found for activity_not_found (8071924732094499514) -->
     <skip />
     <!-- no translation found for widgets_tab_label (2921133187116603919) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 85023c3d19..016dd918c2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ecran de pornire"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Setați imaginea de fundal"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nu s-a putut încărca imaginea"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nu s-a putut încărca imaginea ca fundal"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selectate"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selectat"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selectate"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Imaginea de fundal %1$d din %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"S-a selectat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ștergeți"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Alegeți imaginea"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Imagini de fundal"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Decupați imaginea de fundal"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplicația nu este instalată."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgeturi"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgeturi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c8a2287eb8..8d0984da29 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Главный экран"</string>
     <string name="uid_name" msgid="7820867637514617527">"Основные приложения Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Установить как обои"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Не удалось загрузить изображение"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Не удалось загрузить изображение"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Выбрано: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Выбрано: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Выбрано: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Обои %1$d из %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Удалить"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Выбрать изображение"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Обои"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Обрезать обои"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Приложение удалено"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Виджеты"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Виджеты"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 77fd07df4e..3a4b03348a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Plocha"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nastaviť tapetu"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Obrázok nie je možné načítať"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Obrázok nie je možné načítať ako tapetu"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Počet vybratých položiek: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Počet vybratých položiek: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Počet vybratých položiek: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Tapeta %1$d z %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Vybratá položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Odstrániť"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vybrať obrázok"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Tapety"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Orezanie tapety"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikácia nie je nainštalovaná."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Miniaplikácie"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Miniaplikácie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 28392fe4cb..68086dbc1c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Začetni zaslon"</string>
     <string name="uid_name" msgid="7820867637514617527">"Osnovne aplikacije sistema Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nastavi ozadje"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Slike ni bilo mogoče naložiti"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Slike ni bilo mogoče naložiti kot ozadja"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Št. izbranih: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Št. izbranih: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Št. izbranih: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Ozadje %1$d od %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Izbrano: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Izbriši"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Izberi sliko"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ozadja"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Obrezovanje ozadja"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacija ni nameščena."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Pripomočki"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Pripomočki"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 82c825b374..6ab175069d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Почетна"</string>
     <string name="uid_name" msgid="7820867637514617527">"Основне Android апликације"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Подеси позадину"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Није могуће учитати слику"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Није могуће учитати слику као позадину"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Изабранo je %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Изабрана je %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Изабранo je %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Позадина %1$d од %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Изабрано је <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Избриши"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Изабери слику"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Позадине"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Опсецање позадине"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Апликација није инсталирана."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Виџети"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Виџети"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9d9c544007..c6dcb18ff3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startskärm"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ange bakgrund"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Det gick inte att läsa in bilden"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Det gick inte att läsa in bilden som bakgrund"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d har valts"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d har valts"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d har valts"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Bakgrund %1$d av %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> har valts"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ta bort"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Välj bild"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Bakgrunder"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Beskär bakgrund"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen är inte installerad."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgetar"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgetar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d83fc16871..e0ae27924d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Mwanzo"</string>
     <string name="uid_name" msgid="7820867637514617527">"Programu Msingi za Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Weka mandhari"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Haikuweza kupakia picha"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Haikuweza kupakia picha kama mandhari"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d zimechaguliwa"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d zimechaguliwa"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d zimechaguliwa"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Mandhari %1$d ya %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> iliyochaguliwa"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Futa"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Chukua picha"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Mandhari"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Punguza mandhari"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Programu haijasakinishwa."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Wijeti"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Wijeti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9d78b3bdac..0a9ea784dc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"หน้าแรก"</string>
     <string name="uid_name" msgid="7820867637514617527">"แอปหลักของแอนดรอยด์"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"ตั้งค่าวอลเปเปอร์"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"ไม่สามารถโหลดรูปภาพ"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"ไม่สามารถโหลดรูปภาพเป็นวอลเปเปอร์"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"เลือกไว้ %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"เลือกไว้ %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"เลือกไว้ %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"วอลเปเปอร์ %1$d จาก %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"เลือก <xliff:g id="LABEL">%1$s</xliff:g> แล้ว"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"ลบ"</string>
-    <string name="pick_image" msgid="1272073934062909527">"เลือกภาพ"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"วอลเปเปอร์"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ครอบตัดวอลล์เปเปอร์"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ไม่ได้ติดตั้งแอป"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"วิดเจ็ต"</string>
     <string name="widget_adder" msgid="3201040140710381657">"วิดเจ็ต"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index bdc23637d9..41de1c02c7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Itakda ang wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Hindi ma-load ang larawan"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Hindi ma-load ang larawan bilang wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ang napili"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ang napili"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ang napili"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d ng %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Napili ang <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Tanggalin"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pumili ng larawan"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Mga Wallpaper"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"I-crop ang wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Hindi naka-install ang app."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Mga Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Mga Widget"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e2fbf21253..e77d76b8e8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ana ekran"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Çekirdek Uygulamaları"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Duvar kağıdını ayarla"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Resim yüklenemedi"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Resim duvar kağıdı olarak yüklenemedi"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d tane seçildi"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d tane seçildi"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d tane seçildi"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Duvar kağıdı %1$d / %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> seçildi"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Sil"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Resim seç"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Duvar Kağıtları"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Duvar kağıdını kırp"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Uygulama yüklü değil."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget\'lar"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget\'lar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6b397a051e..5a32a479e6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Головний екран"</string>
     <string name="uid_name" msgid="7820867637514617527">"Базові програми Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Установити фон"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Не вдалося завантажити зображення"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Не вдалося завантажити зображення як фоновий малюнок"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Вибрано %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Вибрано %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Вибрано %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Фоновий малюнок %1$d з %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Вибрано <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Видалити"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Вибрати зображення"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Фонові малюнки"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Обрізати фоновий малюнок"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Програму не встановлено."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Віджети"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Віджети"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index abe4dec23c..4c15bc80e4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Màn hình chính"</string>
     <string name="uid_name" msgid="7820867637514617527">"Ứng dụng lõi Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Đặt hình nền"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Không thể tải hình ảnh"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Không thể tải hình ảnh làm hình nền"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Đã chọn %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Đã chọn %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Đã chọn %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Hình nền %1$d / %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> được chọn"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Xóa"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Chọn hình ảnh"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Hình nền"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Cắt hình nền"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Ứng dụng chưa được cài đặt."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Tiện ích con"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Tiện ích con"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d8d260d4ea..8a6d9c64c0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"主屏"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 核心应用"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"设置壁纸"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"无法加载图片"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"无法加载要设为壁纸的图片"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"已选择%1$d项"</item>
-    <item quantity="one" msgid="142482526010824029">"已选择%1$d项"</item>
-    <item quantity="other" msgid="1418352074806573570">"已选择%1$d项"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"第%1$d张壁纸，共%2$d张"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"已选择<xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"删除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"选择图片"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"壁纸"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"剪裁壁纸"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"未安装该应用。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"小部件"</string>
     <string name="widget_adder" msgid="3201040140710381657">"小部件"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 56ea177256..9d1e305799 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"主畫面"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 核心應用程式"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"設定桌布"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"無法載入圖片"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"無法載入圖片設為桌布"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"已選取 %1$d 個"</item>
-    <item quantity="one" msgid="142482526010824029">"已選取 %1$d 個"</item>
-    <item quantity="other" msgid="1418352074806573570">"已選取 %1$d 個"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"第 %1$d 張桌布，共 %2$d 張"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"已選取「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"刪除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"選擇圖片"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"桌布"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"裁剪桌布"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"尚未安裝應用程式。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"小工具"</string>
     <string name="widget_adder" msgid="3201040140710381657">"小工具"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0520c9d649..6d82cf80e0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"主螢幕"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 核心應用程式"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"設定桌布"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"無法載入圖片"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"無法載入您要設為桌布的圖片"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"已選取 %1$d 個項目"</item>
-    <item quantity="one" msgid="142482526010824029">"已選取 %1$d 個項目"</item>
-    <item quantity="other" msgid="1418352074806573570">"已選取 %1$d 個項目"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"第 %1$d 張桌布，共 %2$d 張"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"刪除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"選擇圖片"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"桌布"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"裁剪桌布"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"應用程式未安裝。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"小工具"</string>
     <string name="widget_adder" msgid="3201040140710381657">"小工具"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dafb95d177..2cde50a328 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ikhaya"</string>
     <string name="uid_name" msgid="7820867637514617527">"Izinhlelo zokusebenza ze-Android Core"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Setha isithombe sangemuva"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Ayikwazanga ukulayisha isithombe"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Ayikwazanga ukulayisha isithombe njengesithombe sangemuva"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d khethiwe"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d khethiwe"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d khethiwe"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Isithombe sangemuva se-%1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhethiwe"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Susa"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Thatha isithombe"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Izithombe zangemuva"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Nqampuna isithombe sangemuva"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Uhlelo lokusebenza alufakiwe."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Amawijethi"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Amawijethi"</string>

From 69413c91c5839fd061f2422ea603faf11a5dd629 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 11 Dec 2013 17:09:53 +0100
Subject: [PATCH 070/147] Move additional wallpaper picker files to special dir

Change-Id: I3dd6f0ce4db72f9f30ed02e8c27039f68ab9a728
---
 update_system_wallpaper_cropper.py            | 71 ++++++++++---------
 .../android/launcher3/DrawableTileSource.java |  0
 .../launcher3/LiveWallpaperListAdapter.java   |  0
 .../launcher3/SavedWallpaperImages.java       |  0
 .../ThirdPartyWallpaperPickerListAdapter.java |  0
 .../android/launcher3/WallpaperRootView.java  |  0
 6 files changed, 37 insertions(+), 34 deletions(-)
 rename {src => wallpaper_picker_src}/com/android/launcher3/DrawableTileSource.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/LiveWallpaperListAdapter.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/SavedWallpaperImages.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java (100%)
 rename {src => wallpaper_picker_src}/com/android/launcher3/WallpaperRootView.java (100%)

diff --git a/update_system_wallpaper_cropper.py b/update_system_wallpaper_cropper.py
index 5d24f6ffea..36904f2153 100644
--- a/update_system_wallpaper_cropper.py
+++ b/update_system_wallpaper_cropper.py
@@ -5,42 +5,43 @@
 # necessary so do this with care
 import os
 import sys
+src_dir = "wallpaper_picker_src/"
 files = """
 src/android/util/Pools.java
-src/com/android/gallery3d/util/IntArray.java
-src/com/android/gallery3d/common/Utils.java
-src/com/android/gallery3d/exif/ByteBufferInputStream.java
-src/com/android/gallery3d/exif/CountedDataInputStream.java
-src/com/android/gallery3d/exif/ExifData.java
-src/com/android/gallery3d/exif/ExifInterface.java
-src/com/android/gallery3d/exif/ExifInvalidFormatException.java
-src/com/android/gallery3d/exif/ExifModifier.java
-src/com/android/gallery3d/exif/ExifOutputStream.java
-src/com/android/gallery3d/exif/ExifParser.java
-src/com/android/gallery3d/exif/ExifReader.java
-src/com/android/gallery3d/exif/ExifTag.java
-src/com/android/gallery3d/exif/IfdData.java
-src/com/android/gallery3d/exif/IfdId.java
-src/com/android/gallery3d/exif/JpegHeader.java
-src/com/android/gallery3d/exif/OrderedDataOutputStream.java
-src/com/android/gallery3d/exif/Rational.java
-src/com/android/gallery3d/glrenderer/BasicTexture.java
-src/com/android/gallery3d/glrenderer/BitmapTexture.java
-src/com/android/gallery3d/glrenderer/GLCanvas.java
-src/com/android/gallery3d/glrenderer/GLES20Canvas.java
-src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
-src/com/android/gallery3d/glrenderer/GLId.java
-src/com/android/gallery3d/glrenderer/GLPaint.java
-src/com/android/gallery3d/glrenderer/RawTexture.java
-src/com/android/gallery3d/glrenderer/Texture.java
-src/com/android/gallery3d/glrenderer/UploadedTexture.java
-src/com/android/photos/BitmapRegionTileSource.java
-src/com/android/photos/views/BlockingGLTextureView.java
-src/com/android/photos/views/TiledImageRenderer.java
-src/com/android/photos/views/TiledImageView.java
-src/com/android/gallery3d/common/BitmapUtils.java
-src/com/android/launcher3/CropView.java
-src/com/android/launcher3/WallpaperCropActivity.java
+com/android/gallery3d/util/IntArray.java
+com/android/gallery3d/common/Utils.java
+com/android/gallery3d/exif/ByteBufferInputStream.java
+com/android/gallery3d/exif/CountedDataInputStream.java
+com/android/gallery3d/exif/ExifData.java
+com/android/gallery3d/exif/ExifInterface.java
+com/android/gallery3d/exif/ExifInvalidFormatException.java
+com/android/gallery3d/exif/ExifModifier.java
+com/android/gallery3d/exif/ExifOutputStream.java
+com/android/gallery3d/exif/ExifParser.java
+com/android/gallery3d/exif/ExifReader.java
+com/android/gallery3d/exif/ExifTag.java
+com/android/gallery3d/exif/IfdData.java
+com/android/gallery3d/exif/IfdId.java
+com/android/gallery3d/exif/JpegHeader.java
+com/android/gallery3d/exif/OrderedDataOutputStream.java
+com/android/gallery3d/exif/Rational.java
+com/android/gallery3d/glrenderer/BasicTexture.java
+com/android/gallery3d/glrenderer/BitmapTexture.java
+com/android/gallery3d/glrenderer/GLCanvas.java
+com/android/gallery3d/glrenderer/GLES20Canvas.java
+com/android/gallery3d/glrenderer/GLES20IdImpl.java
+com/android/gallery3d/glrenderer/GLId.java
+com/android/gallery3d/glrenderer/GLPaint.java
+com/android/gallery3d/glrenderer/RawTexture.java
+com/android/gallery3d/glrenderer/Texture.java
+com/android/gallery3d/glrenderer/UploadedTexture.java
+com/android/photos/BitmapRegionTileSource.java
+com/android/photos/views/BlockingGLTextureView.java
+com/android/photos/views/TiledImageRenderer.java
+com/android/photos/views/TiledImageView.java
+com/android/gallery3d/common/BitmapUtils.java
+com/android/launcher3/CropView.java
+com/android/launcher3/WallpaperCropActivity.java
 """
 
 if len(sys.argv) != 2:
@@ -48,8 +49,10 @@ if len(sys.argv) != 2:
     exit()
 framework_dir = sys.argv[1] + "/packages/WallpaperCropper"
 for file_path in files.split():
+    file_path = src_dir + file_path
     dir = os.path.dirname(file_path)
     dir = dir.replace("launcher3", "wallpapercropper")
+    dir = dir.replace(src_dir, "src/")
     cmd = 'cp %s %s/%s' % (file_path, framework_dir, dir)
     print cmd
     os.system(cmd)
diff --git a/src/com/android/launcher3/DrawableTileSource.java b/wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java
similarity index 100%
rename from src/com/android/launcher3/DrawableTileSource.java
rename to wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java
diff --git a/src/com/android/launcher3/LiveWallpaperListAdapter.java b/wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java
similarity index 100%
rename from src/com/android/launcher3/LiveWallpaperListAdapter.java
rename to wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java
diff --git a/src/com/android/launcher3/SavedWallpaperImages.java b/wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java
similarity index 100%
rename from src/com/android/launcher3/SavedWallpaperImages.java
rename to wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java
diff --git a/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java b/wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
similarity index 100%
rename from src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
rename to wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
diff --git a/src/com/android/launcher3/WallpaperRootView.java b/wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java
similarity index 100%
rename from src/com/android/launcher3/WallpaperRootView.java
rename to wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java

From 306c1cf200d4e334b19e09a5a5a2026d9f6d12b2 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Thu, 12 Dec 2013 14:56:00 -0800
Subject: [PATCH 071/147] Show widgets when ALL_APPS is disabled.

Change-Id: I367448df69a63ffd3412fe4c99137a21426d285c
---
 src/com/android/launcher3/Launcher.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 318066b568..9485cea249 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2908,8 +2908,9 @@ public class Launcher extends Activity
         // Shrink workspaces away if going to AppsCustomize from workspace
         Animator workspaceAnim =
                 mWorkspace.getChangeStateAnimation(Workspace.State.SMALL, animated);
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS) {
-            // Set the content type for the all apps space
+        if (!AppsCustomizePagedView.DISABLE_ALL_APPS
+                || contentType == AppsCustomizePagedView.ContentType.Widgets) {
+            // Set the content type for the all apps/widgets space
             mAppsCustomizeTabHost.setContentTypeImmediate(contentType);
         }
 
@@ -4053,6 +4054,10 @@ public class Launcher extends Activity
                 }
                 mIntentsOnWorkspaceFromUpgradePath = null;
             }
+            if (mAppsCustomizeContent != null) {
+                mAppsCustomizeContent.onPackagesUpdated(
+                        LauncherModel.getSortedWidgetsAndShortcuts(this));
+            }
         } else {
             if (mAppsCustomizeContent != null) {
                 mAppsCustomizeContent.setApps(apps);
@@ -4141,8 +4146,7 @@ public class Launcher extends Activity
         }
 
         // Update the widgets pane
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
-                mAppsCustomizeContent != null) {
+        if (mAppsCustomizeContent != null) {
             mAppsCustomizeContent.onPackagesUpdated(widgetsAndShortcuts);
         }
     }

From 4de0974c460ce6439cce7931fb0ba945095a4b94 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 12 Dec 2013 16:16:39 -0800
Subject: [PATCH 072/147] Fix NPE from feedback (issue 12106858)

Change-Id: I63f7f73b85d4c1652d1e722f94c51b567a83cc6b
---
 src/com/android/launcher3/PagedView.java | 26 ++++++++++++------------
 src/com/android/launcher3/Workspace.java |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index c216f926fd..1e4f4fa7f6 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1152,22 +1152,22 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
     @Override
     protected void dispatchDraw(Canvas canvas) {
-        int halfScreenSize = getViewportWidth() / 2;
-        // mOverScrollX is equal to getScrollX() when we're within the normal scroll range.
-        // Otherwise it is equal to the scaled overscroll position.
-        int screenCenter = mOverScrollX + halfScreenSize;
-
-        if (screenCenter != mLastScreenCenter || mForceScreenScrolled) {
-            // set mForceScreenScrolled before calling screenScrolled so that screenScrolled can
-            // set it for the next frame
-            mForceScreenScrolled = false;
-            screenScrolled(screenCenter);
-            mLastScreenCenter = screenCenter;
-        }
-
         // Find out which screens are visible; as an optimization we only call draw on them
         final int pageCount = getChildCount();
         if (pageCount > 0) {
+            int halfScreenSize = getViewportWidth() / 2;
+            // mOverScrollX is equal to getScrollX() when we're within the normal scroll range.
+            // Otherwise it is equal to the scaled overscroll position.
+            int screenCenter = mOverScrollX + halfScreenSize;
+
+            if (screenCenter != mLastScreenCenter || mForceScreenScrolled) {
+                // set mForceScreenScrolled before calling screenScrolled so that screenScrolled can
+                // set it for the next frame
+                mForceScreenScrolled = false;
+                screenScrolled(screenCenter);
+                mLastScreenCenter = screenCenter;
+            }
+
             getVisiblePages(mTempVisiblePagesRange);
             final int leftScreen = mTempVisiblePagesRange[0];
             final int rightScreen = mTempVisiblePagesRange[1];
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 72399e4ece..52420b73b9 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1666,7 +1666,7 @@ public class Workspace extends SmoothPagedView
                 cl.setOverscrollTransformsDirty(true);
             }
         } else {
-            if (mOverscrollTransformsSet) {
+            if (mOverscrollTransformsSet && getChildCount() > 0) {
                 mOverscrollTransformsSet = false;
                 ((CellLayout) getChildAt(0)).resetOverscrollTransforms();
                 ((CellLayout) getChildAt(getChildCount() - 1)).resetOverscrollTransforms();

From 7ad868b86e45d6f58c186d2731ab2beb84643757 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 12 Dec 2013 15:04:25 +0100
Subject: [PATCH 073/147] Create separate project for Wallpaper Picker

Change-Id: Id9e855780b9fb68c63eb6e9f6c19bcbce28a6fd5
---
 Android.mk                                    |   4 +--
 AndroidManifest.xml                           |   2 +-
 WallpaperPicker/AndroidManifest.xml           |  10 ++++++
 WallpaperPicker/README                        |   4 +++
 .../drawable-hdpi/ic_actionbar_accept.png     | Bin
 .../res}/drawable-hdpi/ic_images.png          | Bin
 .../drawable-hdpi/tile_picker_focused.9.png   | Bin
 .../drawable-hdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-hdpi/tile_picker_selected.9.png  | Bin
 .../drawable-hdpi/tile_shadow_bottom.9.png    | Bin
 .../res}/drawable-hdpi/tile_shadow_top.9.png  | Bin
 .../drawable-mdpi/ic_actionbar_accept.png     | Bin
 .../res}/drawable-mdpi/ic_images.png          | Bin
 .../drawable-mdpi/tile_picker_focused.9.png   | Bin
 .../drawable-mdpi/tile_picker_pressed.9.png   | Bin
 .../drawable-mdpi/tile_picker_selected.9.png  | Bin
 .../drawable-mdpi/tile_shadow_bottom.9.png    | Bin
 .../res}/drawable-mdpi/tile_shadow_top.9.png  | Bin
 .../drawable-xhdpi/ic_actionbar_accept.png    | Bin
 .../res}/drawable-xhdpi/ic_images.png         | Bin
 .../drawable-xhdpi/tile_picker_focused.9.png  | Bin
 .../drawable-xhdpi/tile_picker_pressed.9.png  | Bin
 .../drawable-xhdpi/tile_picker_selected.9.png | Bin
 .../drawable-xhdpi/tile_shadow_bottom.9.png   | Bin
 .../res}/drawable-xhdpi/tile_shadow_top.9.png | Bin
 .../res}/drawable-xxhdpi/ic_images.png        | Bin
 .../drawable-xxhdpi/tile_picker_focused.9.png | Bin
 .../drawable-xxhdpi/tile_picker_pressed.9.png | Bin
 .../tile_picker_selected.9.png                | Bin
 .../drawable-xxhdpi/tile_shadow_bottom.9.png  | Bin
 .../drawable-xxhdpi/tile_shadow_top.9.png     | Bin
 .../res}/drawable/wallpaper_tile_fg.xml       |   0
 .../res}/layout/actionbar_set_wallpaper.xml   |   0
 .../res}/layout/wallpaper_cropper.xml         |   0
 .../res}/layout/wallpaper_picker.xml          |   0
 .../wallpaper_picker_image_picker_item.xml    |   0
 .../res}/layout/wallpaper_picker_item.xml     |   0
 .../wallpaper_picker_live_wallpaper_item.xml  |   0
 .../wallpaper_picker_third_party_item.xml     |   0
 .../res}/menu/cab_delete_wallpapers.xml       |   0
 .../mipmap-hdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-mdpi/ic_launcher_wallpaper.png     | Bin
 .../mipmap-xhdpi/ic_launcher_wallpaper.png    | Bin
 .../mipmap-xxhdpi/ic_launcher_wallpaper.png   | Bin
 .../res}/values-nodpi/wallpapers.xml          |   0
 WallpaperPicker/res/values-sw600dp/config.xml |  18 ++++++++++
 .../res}/values-sw720dp/dimens.xml            |   0
 .../res}/values-sw720dp/styles.xml            |   0
 .../res}/values/colors.xml                    |   0
 WallpaperPicker/res/values/config.xml         |  18 ++++++++++
 .../res}/values/dimens.xml                    |   0
 .../res}/values/strings.xml                   |   0
 .../res}/values/styles.xml                    |   0
 .../src}/android/util/Pools.java              |   0
 .../android/gallery3d/common/BitmapUtils.java |   0
 .../com/android/gallery3d/common/Utils.java   |   0
 .../gallery3d/exif/ByteBufferInputStream.java |   0
 .../exif/CountedDataInputStream.java          |   0
 .../com/android/gallery3d/exif/ExifData.java  |   0
 .../android/gallery3d/exif/ExifInterface.java |   0
 .../exif/ExifInvalidFormatException.java      |   0
 .../android/gallery3d/exif/ExifModifier.java  |   0
 .../gallery3d/exif/ExifOutputStream.java      |   0
 .../android/gallery3d/exif/ExifParser.java    |   0
 .../android/gallery3d/exif/ExifReader.java    |   0
 .../com/android/gallery3d/exif/ExifTag.java   |   0
 .../com/android/gallery3d/exif/IfdData.java   |   0
 .../com/android/gallery3d/exif/IfdId.java     |   0
 .../android/gallery3d/exif/JpegHeader.java    |   0
 .../exif/OrderedDataOutputStream.java         |   0
 .../com/android/gallery3d/exif/Rational.java  |   0
 .../gallery3d/glrenderer/BasicTexture.java    |   0
 .../gallery3d/glrenderer/BitmapTexture.java   |   0
 .../gallery3d/glrenderer/GLCanvas.java        |   0
 .../gallery3d/glrenderer/GLES20Canvas.java    |   0
 .../gallery3d/glrenderer/GLES20IdImpl.java    |   0
 .../android/gallery3d/glrenderer/GLId.java    |   0
 .../android/gallery3d/glrenderer/GLPaint.java |   0
 .../gallery3d/glrenderer/RawTexture.java      |   0
 .../android/gallery3d/glrenderer/Texture.java |   0
 .../gallery3d/glrenderer/UploadedTexture.java |   0
 .../com/android/gallery3d/util/IntArray.java  |   0
 .../launcher3/CheckableFrameLayout.java       |   0
 .../src}/com/android/launcher3/CropView.java  |   0
 .../android/launcher3/DrawableTileSource.java |   0
 .../launcher3/LiveWallpaperListAdapter.java   |   3 +-
 .../launcher3/SavedWallpaperImages.java       |   0
 .../ThirdPartyWallpaperPickerListAdapter.java |   4 +--
 .../launcher3/WallpaperCropActivity.java      |   0
 .../launcher3/WallpaperPickerActivity.java    |  34 +++++++++---------
 .../android/launcher3/WallpaperRootView.java  |   0
 .../photos/BitmapRegionTileSource.java        |   0
 .../photos/views/BlockingGLTextureView.java   |   0
 .../photos/views/TiledImageRenderer.java      |   0
 .../android/photos/views/TiledImageView.java  |   0
 src/com/android/launcher3/Launcher.java       |   2 +-
 .../LauncherWallpaperPickerActivity.java      |  30 ++++++++++++++++
 src/com/android/launcher3/Utilities.java      |  16 +++++++++
 src/com/android/launcher3/Workspace.java      |   2 +-
 update_system_wallpaper_cropper.py            |   2 +-
 100 files changed, 122 insertions(+), 27 deletions(-)
 create mode 100644 WallpaperPicker/AndroidManifest.xml
 create mode 100644 WallpaperPicker/README
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/ic_actionbar_accept.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-hdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/ic_actionbar_accept.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-mdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/ic_actionbar_accept.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xhdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xxhdpi/ic_images.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xxhdpi/tile_picker_focused.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xxhdpi/tile_picker_pressed.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xxhdpi/tile_picker_selected.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xxhdpi/tile_shadow_bottom.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable-xxhdpi/tile_shadow_top.9.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/drawable/wallpaper_tile_fg.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/actionbar_set_wallpaper.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/wallpaper_cropper.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/wallpaper_picker.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/wallpaper_picker_image_picker_item.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/wallpaper_picker_item.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/wallpaper_picker_live_wallpaper_item.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/layout/wallpaper_picker_third_party_item.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/menu/cab_delete_wallpapers.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/mipmap-hdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/mipmap-mdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/mipmap-xhdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/mipmap-xxhdpi/ic_launcher_wallpaper.png (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/values-nodpi/wallpapers.xml (100%)
 create mode 100644 WallpaperPicker/res/values-sw600dp/config.xml
 rename {wallpaper_picker_res => WallpaperPicker/res}/values-sw720dp/dimens.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/values-sw720dp/styles.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/values/colors.xml (100%)
 create mode 100644 WallpaperPicker/res/values/config.xml
 rename {wallpaper_picker_res => WallpaperPicker/res}/values/dimens.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/values/strings.xml (100%)
 rename {wallpaper_picker_res => WallpaperPicker/res}/values/styles.xml (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/android/util/Pools.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/common/BitmapUtils.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/common/Utils.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ByteBufferInputStream.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/CountedDataInputStream.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifData.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifInterface.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifInvalidFormatException.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifModifier.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifOutputStream.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifParser.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifReader.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/ExifTag.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/IfdData.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/IfdId.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/JpegHeader.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/OrderedDataOutputStream.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/exif/Rational.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/BasicTexture.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/BitmapTexture.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/GLCanvas.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/GLES20Canvas.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/GLES20IdImpl.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/GLId.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/GLPaint.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/RawTexture.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/Texture.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/glrenderer/UploadedTexture.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/gallery3d/util/IntArray.java (100%)
 rename {src => WallpaperPicker/src}/com/android/launcher3/CheckableFrameLayout.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/CropView.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/DrawableTileSource.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/LiveWallpaperListAdapter.java (98%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/SavedWallpaperImages.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java (97%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/WallpaperCropActivity.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/WallpaperPickerActivity.java (97%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/launcher3/WallpaperRootView.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/photos/BitmapRegionTileSource.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/photos/views/BlockingGLTextureView.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/photos/views/TiledImageRenderer.java (100%)
 rename {wallpaper_picker_src => WallpaperPicker/src}/com/android/photos/views/TiledImageView.java (100%)
 create mode 100644 src/com/android/launcher3/LauncherWallpaperPickerActivity.java

diff --git a/Android.mk b/Android.mk
index 840b161c56..dbce33f8b4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, wallpaper_picker_src) \
+    $(call all-java-files-under, WallpaperPicker/src) \
     $(call all-renderscript-files-under, src) \
     $(call all-proto-files-under, protos)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1e418ec2f1..4e27e6f27c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -104,7 +104,7 @@
         </activity>
 
         <activity
-            android:name="com.android.launcher3.WallpaperPickerActivity"
+            android:name="com.android.launcher3.LauncherWallpaperPickerActivity"
             android:theme="@style/Theme.WallpaperCropper"
             android:label="@string/pick_wallpaper"
             android:icon="@mipmap/ic_launcher_wallpaper"
diff --git a/WallpaperPicker/AndroidManifest.xml b/WallpaperPicker/AndroidManifest.xml
new file mode 100644
index 0000000000..86a94d078e
--- /dev/null
+++ b/WallpaperPicker/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.launcher3"
+        android:versionCode="1"
+        android:versionName="1.0"
+        >
+
+    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />
+
+</manifest>
diff --git a/WallpaperPicker/README b/WallpaperPicker/README
new file mode 100644
index 0000000000..d8efb07f61
--- /dev/null
+++ b/WallpaperPicker/README
@@ -0,0 +1,4 @@
+This project contains the wallpaper picker for Launcher3. It's in a separate
+folder to organize the code separately from the rest of the launcher, and has
+a manifest so that a separate Eclipse project can exist for the wallpaper
+picker (necessary to have the Eclipse build work)
\ No newline at end of file
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png b/WallpaperPicker/res/drawable-hdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
rename to WallpaperPicker/res/drawable-hdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_images.png b/WallpaperPicker/res/drawable-hdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/ic_images.png
rename to WallpaperPicker/res/drawable-hdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
rename to WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
rename to WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
rename to WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-hdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
rename to WallpaperPicker/res/drawable-hdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-hdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
rename to WallpaperPicker/res/drawable-hdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png b/WallpaperPicker/res/drawable-mdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
rename to WallpaperPicker/res/drawable-mdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_images.png b/WallpaperPicker/res/drawable-mdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/ic_images.png
rename to WallpaperPicker/res/drawable-mdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
rename to WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
rename to WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
rename to WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-mdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
rename to WallpaperPicker/res/drawable-mdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-mdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
rename to WallpaperPicker/res/drawable-mdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png b/WallpaperPicker/res/drawable-xhdpi/ic_actionbar_accept.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
rename to WallpaperPicker/res/drawable-xhdpi/ic_actionbar_accept.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_images.png b/WallpaperPicker/res/drawable-xhdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/ic_images.png
rename to WallpaperPicker/res/drawable-xhdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
rename to WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
rename to WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
rename to WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
rename to WallpaperPicker/res/drawable-xhdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
rename to WallpaperPicker/res/drawable-xhdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png b/WallpaperPicker/res/drawable-xxhdpi/ic_images.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/ic_images.png
rename to WallpaperPicker/res/drawable-xxhdpi/ic_images.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
rename to WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
rename to WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
rename to WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_shadow_bottom.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
rename to WallpaperPicker/res/drawable-xxhdpi/tile_shadow_bottom.9.png
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_shadow_top.9.png
similarity index 100%
rename from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
rename to WallpaperPicker/res/drawable-xxhdpi/tile_shadow_top.9.png
diff --git a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml b/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
similarity index 100%
rename from wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
rename to WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
diff --git a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
similarity index 100%
rename from wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
rename to WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_cropper.xml b/WallpaperPicker/res/layout/wallpaper_cropper.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_cropper.xml
rename to WallpaperPicker/res/layout/wallpaper_cropper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker.xml b/WallpaperPicker/res/layout/wallpaper_picker.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker.xml
rename to WallpaperPicker/res/layout/wallpaper_picker.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_image_picker_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
rename to WallpaperPicker/res/layout/wallpaper_picker_image_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_item.xml
rename to WallpaperPicker/res/layout/wallpaper_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_live_wallpaper_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
rename to WallpaperPicker/res/layout/wallpaper_picker_live_wallpaper_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml
similarity index 100%
rename from wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
rename to WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml
diff --git a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml b/WallpaperPicker/res/menu/cab_delete_wallpapers.xml
similarity index 100%
rename from wallpaper_picker_res/menu/cab_delete_wallpapers.xml
rename to WallpaperPicker/res/menu/cab_delete_wallpapers.xml
diff --git a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-hdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
rename to WallpaperPicker/res/mipmap-hdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-mdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
rename to WallpaperPicker/res/mipmap-mdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-xhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
rename to WallpaperPicker/res/mipmap-xhdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
similarity index 100%
rename from wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
rename to WallpaperPicker/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
diff --git a/wallpaper_picker_res/values-nodpi/wallpapers.xml b/WallpaperPicker/res/values-nodpi/wallpapers.xml
similarity index 100%
rename from wallpaper_picker_res/values-nodpi/wallpapers.xml
rename to WallpaperPicker/res/values-nodpi/wallpapers.xml
diff --git a/WallpaperPicker/res/values-sw600dp/config.xml b/WallpaperPicker/res/values-sw600dp/config.xml
new file mode 100644
index 0000000000..62342dcc2f
--- /dev/null
+++ b/WallpaperPicker/res/values-sw600dp/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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
+
+          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
+     limitations under the License.
+-->
+<resources>
+    <bool name="allow_rotation">true</bool>
+</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/WallpaperPicker/res/values-sw720dp/dimens.xml
similarity index 100%
rename from wallpaper_picker_res/values-sw720dp/dimens.xml
rename to WallpaperPicker/res/values-sw720dp/dimens.xml
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/WallpaperPicker/res/values-sw720dp/styles.xml
similarity index 100%
rename from wallpaper_picker_res/values-sw720dp/styles.xml
rename to WallpaperPicker/res/values-sw720dp/styles.xml
diff --git a/wallpaper_picker_res/values/colors.xml b/WallpaperPicker/res/values/colors.xml
similarity index 100%
rename from wallpaper_picker_res/values/colors.xml
rename to WallpaperPicker/res/values/colors.xml
diff --git a/WallpaperPicker/res/values/config.xml b/WallpaperPicker/res/values/config.xml
new file mode 100644
index 0000000000..1b24190735
--- /dev/null
+++ b/WallpaperPicker/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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
+
+          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
+     limitations under the License.
+-->
+<resources>
+    <bool name="allow_rotation">false</bool>
+</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/WallpaperPicker/res/values/dimens.xml
similarity index 100%
rename from wallpaper_picker_res/values/dimens.xml
rename to WallpaperPicker/res/values/dimens.xml
diff --git a/wallpaper_picker_res/values/strings.xml b/WallpaperPicker/res/values/strings.xml
similarity index 100%
rename from wallpaper_picker_res/values/strings.xml
rename to WallpaperPicker/res/values/strings.xml
diff --git a/wallpaper_picker_res/values/styles.xml b/WallpaperPicker/res/values/styles.xml
similarity index 100%
rename from wallpaper_picker_res/values/styles.xml
rename to WallpaperPicker/res/values/styles.xml
diff --git a/wallpaper_picker_src/android/util/Pools.java b/WallpaperPicker/src/android/util/Pools.java
similarity index 100%
rename from wallpaper_picker_src/android/util/Pools.java
rename to WallpaperPicker/src/android/util/Pools.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java b/WallpaperPicker/src/com/android/gallery3d/common/BitmapUtils.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
rename to WallpaperPicker/src/com/android/gallery3d/common/BitmapUtils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java b/WallpaperPicker/src/com/android/gallery3d/common/Utils.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/common/Utils.java
rename to WallpaperPicker/src/com/android/gallery3d/common/Utils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/ByteBufferInputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ByteBufferInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/CountedDataInputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/CountedDataInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifData.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifParser.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifParser.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifReader.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifReader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifTag.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/ExifTag.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java b/WallpaperPicker/src/com/android/gallery3d/exif/IfdData.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/IfdData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java b/WallpaperPicker/src/com/android/gallery3d/exif/IfdId.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/IfdId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java b/WallpaperPicker/src/com/android/gallery3d/exif/JpegHeader.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/JpegHeader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java b/WallpaperPicker/src/com/android/gallery3d/exif/Rational.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
rename to WallpaperPicker/src/com/android/gallery3d/exif/Rational.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20Canvas.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20Canvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLId.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/GLId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/RawTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/RawTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/Texture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/Texture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
rename to WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java b/WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
similarity index 100%
rename from wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
rename to WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
diff --git a/src/com/android/launcher3/CheckableFrameLayout.java b/WallpaperPicker/src/com/android/launcher3/CheckableFrameLayout.java
similarity index 100%
rename from src/com/android/launcher3/CheckableFrameLayout.java
rename to WallpaperPicker/src/com/android/launcher3/CheckableFrameLayout.java
diff --git a/wallpaper_picker_src/com/android/launcher3/CropView.java b/WallpaperPicker/src/com/android/launcher3/CropView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/CropView.java
rename to WallpaperPicker/src/com/android/launcher3/CropView.java
diff --git a/wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java b/WallpaperPicker/src/com/android/launcher3/DrawableTileSource.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java
rename to WallpaperPicker/src/com/android/launcher3/DrawableTileSource.java
diff --git a/wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java b/WallpaperPicker/src/com/android/launcher3/LiveWallpaperListAdapter.java
similarity index 98%
rename from wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java
rename to WallpaperPicker/src/com/android/launcher3/LiveWallpaperListAdapter.java
index 152a75dedb..60b253711b 100644
--- a/wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java
+++ b/WallpaperPicker/src/com/android/launcher3/LiveWallpaperListAdapter.java
@@ -123,8 +123,7 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter
             preview.putExtra(WallpaperManager.EXTRA_LIVE_WALLPAPER_COMPONENT,
                     mInfo.getComponent());
             a.onLiveWallpaperPickerLaunch();
-            Utilities.startActivityForResultSafely(
-                    a, preview, WallpaperPickerActivity.PICK_LIVE_WALLPAPER);
+            a.startActivityForResultSafely(preview, WallpaperPickerActivity.PICK_LIVE_WALLPAPER);
         }
     }
 
diff --git a/wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java
rename to WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
diff --git a/wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java b/WallpaperPicker/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
similarity index 97%
rename from wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
rename to WallpaperPicker/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
index 494694cbd0..7a4d48ca93 100644
--- a/wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
+++ b/WallpaperPicker/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
@@ -56,8 +56,8 @@ public class ThirdPartyWallpaperPickerListAdapter extends BaseAdapter implements
                     mResolveInfo.activityInfo.packageName, mResolveInfo.activityInfo.name);
             Intent launchIntent = new Intent(Intent.ACTION_SET_WALLPAPER);
             launchIntent.setComponent(itemComponentName);
-            Utilities.startActivityForResultSafely(
-                    a, launchIntent, WallpaperPickerActivity.PICK_WALLPAPER_THIRD_PARTY_ACTIVITY);
+            a.startActivityForResultSafely(
+                    launchIntent, WallpaperPickerActivity.PICK_WALLPAPER_THIRD_PARTY_ACTIVITY);
         }
     }
 
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
rename to WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
similarity index 97%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
rename to WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 2da05c92bc..d3c779fe4b 100644
--- a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -57,6 +57,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLayoutChangeListener;
 import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
 import android.view.ViewTreeObserver;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.animation.AccelerateInterpolator;
@@ -125,7 +126,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         public void onClick(WallpaperPickerActivity a) {
             Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("image/*");
-            Utilities.startActivityForResultSafely(a, intent, IMAGE_PICK);
+            a.startActivityForResultSafely(intent, IMAGE_PICK);
         }
     }
 
@@ -278,7 +279,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         mCropView = (CropView) findViewById(R.id.cropView);
         mWallpaperStrip = findViewById(R.id.wallpaper_strip);
         mCropView.setTouchCallback(new CropView.TouchCallback() {
-            LauncherViewPropertyAnimator mAnim;
+            ViewPropertyAnimator mAnim;
             @Override
             public void onTouchDown() {
                 if (mAnim != null) {
@@ -287,17 +288,14 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                 if (mWallpaperStrip.getAlpha() == 1f) {
                     mIgnoreNextTap = true;
                 }
-                mAnim = new LauncherViewPropertyAnimator(mWallpaperStrip);
+                mAnim = mWallpaperStrip.animate();
                 mAnim.alpha(0f)
-                     .setDuration(150)
-                     .addListener(new Animator.AnimatorListener() {
-                         public void onAnimationStart(Animator animator) { }
-                         public void onAnimationEnd(Animator animator) {
-                             mWallpaperStrip.setVisibility(View.INVISIBLE);
-                         }
-                         public void onAnimationCancel(Animator animator) { }
-                         public void onAnimationRepeat(Animator animator) { }
-                     });
+                    .setDuration(150)
+                    .withEndAction(new Runnable() {
+                        public void run() {
+                            mWallpaperStrip.setVisibility(View.INVISIBLE);
+                        }
+                    });
                 mAnim.setInterpolator(new AccelerateInterpolator(0.75f));
                 mAnim.start();
             }
@@ -314,7 +312,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                         mAnim.cancel();
                     }
                     mWallpaperStrip.setVisibility(View.VISIBLE);
-                    mAnim = new LauncherViewPropertyAnimator(mWallpaperStrip);
+                    mAnim = mWallpaperStrip.animate();
                     mAnim.alpha(1f)
                          .setDuration(150)
                          .setInterpolator(new DecelerateInterpolator(0.75f));
@@ -576,10 +574,6 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         }
     }
 
-    public boolean enableRotation() {
-        return super.enableRotation() || Launcher.sForceEnableRotation;
-    }
-
     protected Bitmap getThumbnailOfLastPhoto() {
         Cursor cursor = MediaStore.Images.Media.query(getContentResolver(),
                 MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
@@ -1001,4 +995,10 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
 
         return view;
     }
+
+    // In Launcher3, we override this with a method that catches exceptions
+    // from starting activities; didn't want to copy and paste code into here
+    public void startActivityForResultSafely(Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode);
+    }
 }
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java b/WallpaperPicker/src/com/android/launcher3/WallpaperRootView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java
rename to WallpaperPicker/src/com/android/launcher3/WallpaperRootView.java
diff --git a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
rename to WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
diff --git a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java b/WallpaperPicker/src/com/android/photos/views/BlockingGLTextureView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
rename to WallpaperPicker/src/com/android/photos/views/BlockingGLTextureView.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java b/WallpaperPicker/src/com/android/photos/views/TiledImageRenderer.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
rename to WallpaperPicker/src/com/android/photos/views/TiledImageRenderer.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java b/WallpaperPicker/src/com/android/photos/views/TiledImageView.java
similarity index 100%
rename from wallpaper_picker_src/com/android/photos/views/TiledImageView.java
rename to WallpaperPicker/src/com/android/photos/views/TiledImageView.java
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9485cea249..a8dd99795a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2174,7 +2174,7 @@ public class Launcher extends Activity
     }
 
     protected ComponentName getWallpaperPickerComponent() {
-        return new ComponentName(getPackageName(), WallpaperPickerActivity.class.getName());
+        return new ComponentName(getPackageName(), LauncherWallpaperPickerActivity.class.getName());
     }
 
     /**
diff --git a/src/com/android/launcher3/LauncherWallpaperPickerActivity.java b/src/com/android/launcher3/LauncherWallpaperPickerActivity.java
new file mode 100644
index 0000000000..10fe013eee
--- /dev/null
+++ b/src/com/android/launcher3/LauncherWallpaperPickerActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 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
+ *
+ *      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
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.content.Intent;
+
+public class LauncherWallpaperPickerActivity extends WallpaperPickerActivity {
+    @Override
+    public void startActivityForResultSafely(Intent intent, int requestCode) {
+        Utilities.startActivityForResultSafely(this, intent, requestCode);
+    }
+    @Override
+    public boolean enableRotation() {
+        return Utilities.isRotationEnabled(this);
+    }
+}
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 9ffd044b49..cbc978585a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -65,6 +65,12 @@ public final class Utilities {
     static int sColors[] = { 0xffff0000, 0xff00ff00, 0xff0000ff };
     static int sColorIndex = 0;
 
+
+    // To turn on these properties, type
+    // adb shell setprop log.tag.PROPERTY_NAME [VERBOSE | SUPPRESS]
+    static final String FORCE_ENABLE_ROTATION_PROPERTY = "launcher_force_rotate";
+    public static boolean sForceEnableRotation = isPropertyEnabled(FORCE_ENABLE_ROTATION_PROPERTY);
+
     /**
      * Returns a FastBitmapDrawable with the icon, accurately sized.
      */
@@ -82,6 +88,16 @@ public final class Utilities {
         icon.setBounds(0, 0, sIconTextureWidth, sIconTextureHeight);
     }
 
+    private static boolean isPropertyEnabled(String propertyName) {
+        return Log.isLoggable(propertyName, Log.VERBOSE);
+    }
+
+    public static boolean isRotationEnabled(Context c) {
+        boolean enableRotation = sForceEnableRotation ||
+                c.getResources().getBoolean(R.bool.allow_rotation);
+        return enableRotation;
+    }
+
     /**
      * Returns a bitmap suitable for the all apps view. Used to convert pre-ICS
      * icon bitmaps that are stored in the database (which were 74x74 pixels at hdpi size)
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9937fc5e31..e6550bc70d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1232,7 +1232,7 @@ public class Workspace extends SmoothPagedView
                 String spKey = WallpaperCropActivity.getSharedPreferencesKey();
                 SharedPreferences sp =
                         mLauncher.getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS);
-                WallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
+                LauncherWallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
                         sp, mLauncher.getWindowManager(), mWallpaperManager);
                 return null;
             }
diff --git a/update_system_wallpaper_cropper.py b/update_system_wallpaper_cropper.py
index 36904f2153..44cbcc967c 100644
--- a/update_system_wallpaper_cropper.py
+++ b/update_system_wallpaper_cropper.py
@@ -5,7 +5,7 @@
 # necessary so do this with care
 import os
 import sys
-src_dir = "wallpaper_picker_src/"
+src_dir = "WallpaperPicker/src/"
 files = """
 src/android/util/Pools.java
 com/android/gallery3d/util/IntArray.java

From 34c2e6cf7af328aba25c98158161dbad15ae986d Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 13 Dec 2013 16:07:45 +0100
Subject: [PATCH 074/147] Clean up imports

---
 .../src/com/android/gallery3d/exif/ExifModifier.java   |  1 -
 .../src/com/android/gallery3d/glrenderer/GLCanvas.java |  2 --
 .../src/com/android/photos/BitmapRegionTileSource.java |  2 --
 src/com/android/launcher3/AddAdapter.java              |  2 --
 src/com/android/launcher3/AllAppsList.java             |  6 +++---
 src/com/android/launcher3/AppInfo.java                 |  2 +-
 src/com/android/launcher3/AppWidgetResizeFrame.java    |  2 --
 src/com/android/launcher3/BubbleTextView.java          |  1 -
 src/com/android/launcher3/ButtonDropTarget.java        |  2 --
 src/com/android/launcher3/CellLayout.java              |  2 --
 src/com/android/launcher3/Cling.java                   |  3 +--
 src/com/android/launcher3/DeferredHandler.java         |  1 +
 src/com/android/launcher3/DragController.java          |  1 -
 src/com/android/launcher3/DragView.java                |  3 ---
 src/com/android/launcher3/DrawableStateProxyView.java  |  2 --
 src/com/android/launcher3/Folder.java                  |  4 ----
 src/com/android/launcher3/FolderIcon.java              |  3 +--
 src/com/android/launcher3/InstallShortcutReceiver.java |  6 ++++--
 src/com/android/launcher3/InstallWidgetReceiver.java   |  4 +---
 src/com/android/launcher3/LauncherAppState.java        |  2 --
 src/com/android/launcher3/LauncherModel.java           |  1 +
 src/com/android/launcher3/PageIndicator.java           | 10 ----------
 src/com/android/launcher3/PageIndicatorMarker.java     |  8 +-------
 src/com/android/launcher3/PagedView.java               |  2 --
 src/com/android/launcher3/PagedViewIconCache.java      | 10 +++++-----
 src/com/android/launcher3/PagedViewWidget.java         |  2 --
 src/com/android/launcher3/ScrimView.java               |  3 ---
 src/com/android/launcher3/ShortcutInfo.java            |  2 +-
 28 files changed, 20 insertions(+), 69 deletions(-)

diff --git a/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
index f00362b6b0..0531cbad99 100644
--- a/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
@@ -18,7 +18,6 @@ package com.android.gallery3d.exif;
 
 import android.util.Log;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
index 305e905210..5b07477043 100644
--- a/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
@@ -20,8 +20,6 @@ import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.RectF;
 
-import javax.microedition.khronos.opengles.GL11;
-
 //
 // GLCanvas gives a convenient interface to draw using OpenGL.
 //
diff --git a/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
index 8511de2da9..cdc5cdcbd6 100644
--- a/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
+++ b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
@@ -24,9 +24,7 @@ import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapRegionDecoder;
 import android.graphics.Canvas;
-import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
diff --git a/src/com/android/launcher3/AddAdapter.java b/src/com/android/launcher3/AddAdapter.java
index ad15e75c65..5308a3de45 100644
--- a/src/com/android/launcher3/AddAdapter.java
+++ b/src/com/android/launcher3/AddAdapter.java
@@ -27,8 +27,6 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
-import com.android.launcher3.R;
-
 /**
  * Adapter showing the types of items that can be added to a {@link Workspace}.
  */
diff --git a/src/com/android/launcher3/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java
index d955e4eaee..b641eb5b3c 100644
--- a/src/com/android/launcher3/AllAppsList.java
+++ b/src/com/android/launcher3/AllAppsList.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -26,6 +23,9 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * Stores the list of all applications for the all apps view.
diff --git a/src/com/android/launcher3/AppInfo.java b/src/com/android/launcher3/AppInfo.java
index 53f81bb1cb..d5a7769018 100644
--- a/src/com/android/launcher3/AppInfo.java
+++ b/src/com/android/launcher3/AppInfo.java
@@ -18,9 +18,9 @@ package com.android.launcher3;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.util.Log;
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index fcb04ea089..f57f4d0361 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -13,8 +13,6 @@ import android.view.Gravity;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.android.launcher3.R;
-
 public class AppWidgetResizeFrame extends FrameLayout {
     private LauncherAppWidgetHostView mWidgetView;
     private CellLayout mCellLayout;
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 30016e5b3f..ee42904dd6 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -20,7 +20,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.Region.Op;
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index d51ae46e84..019f86c217 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -25,8 +25,6 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.launcher3.R;
-
 
 /**
  * Implements a DropTarget.
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 05e31af02b..fa6ce96314 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -35,7 +35,6 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.NinePatchDrawable;
 import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -48,7 +47,6 @@ import android.view.animation.Animation;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LayoutAnimationController;
 
-import com.android.launcher3.R;
 import com.android.launcher3.FolderIcon.FolderRingAnimator;
 
 import java.util.ArrayList;
diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java
index 9974acde69..3af427139e 100644
--- a/src/com/android/launcher3/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -18,9 +18,8 @@ package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.app.ActivityOptions;
-import android.content.Context;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
diff --git a/src/com/android/launcher3/DeferredHandler.java b/src/com/android/launcher3/DeferredHandler.java
index 92ecf96438..a2d121d635 100644
--- a/src/com/android/launcher3/DeferredHandler.java
+++ b/src/com/android/launcher3/DeferredHandler.java
@@ -21,6 +21,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.MessageQueue;
 import android.util.Pair;
+
 import java.util.LinkedList;
 import java.util.ListIterator;
 
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 1bfaa233b3..4c3ea2a0a4 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -28,7 +28,6 @@ import android.os.IBinder;
 import android.util.Log;
 import android.view.*;
 import android.view.inputmethod.InputMethodManager;
-import com.android.launcher3.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher3/DragView.java b/src/com/android/launcher3/DragView.java
index b66b55c9dc..ea34e46f9e 100644
--- a/src/com/android/launcher3/DragView.java
+++ b/src/com/android/launcher3/DragView.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 package com.android.launcher3;
 
 import android.animation.ValueAnimator;
@@ -30,8 +29,6 @@ import android.graphics.Rect;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
-import com.android.launcher3.R;
-
 public class DragView extends View {
     private static float sDragAlpha = 1f;
 
diff --git a/src/com/android/launcher3/DrawableStateProxyView.java b/src/com/android/launcher3/DrawableStateProxyView.java
index 0758de1f77..c83659ad52 100644
--- a/src/com/android/launcher3/DrawableStateProxyView.java
+++ b/src/com/android/launcher3/DrawableStateProxyView.java
@@ -23,8 +23,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.android.launcher3.R;
-
 public class DrawableStateProxyView extends LinearLayout {
 
     private View mView;
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 9637bbb48d..f292821f48 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -31,9 +31,7 @@ import android.text.InputType;
 import android.text.Selection;
 import android.text.Spannable;
 import android.util.AttributeSet;
-import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.ActionMode;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -43,8 +41,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Interpolator;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index 5e461a7b51..644db47acf 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -36,11 +36,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
-import android.widget.ImageView;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.launcher3.R;
 import com.android.launcher3.DropTarget.DragObject;
 import com.android.launcher3.FolderInfo.FolderListener;
 
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index fb75161fe7..140106af9c 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -28,13 +28,15 @@ import android.util.Base64;
 import android.util.Log;
 import android.widget.Toast;
 
+import org.json.JSONObject;
+import org.json.JSONStringer;
+import org.json.JSONTokener;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.json.*;
-
 public class InstallShortcutReceiver extends BroadcastReceiver {
     private static final String TAG = "InstallShortcutReceiver";
     private static final boolean DBG = false;
diff --git a/src/com/android/launcher3/InstallWidgetReceiver.java b/src/com/android/launcher3/InstallWidgetReceiver.java
index 0ef478074c..74b9e3d99f 100644
--- a/src/com/android/launcher3/InstallWidgetReceiver.java
+++ b/src/com/android/launcher3/InstallWidgetReceiver.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import java.util.List;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ClipData;
 import android.content.Context;
@@ -33,7 +31,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.android.launcher3.R;
+import java.util.List;
 
 
 /**
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 5daa845f34..84a1d04118 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -22,9 +22,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.provider.Settings;
 import android.util.Log;
-import android.view.Display;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index da805a05a6..b4f7f5dbd7 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -43,6 +43,7 @@ import android.provider.BaseColumns;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
+
 import com.android.launcher3.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
 
 import java.lang.ref.WeakReference;
diff --git a/src/com/android/launcher3/PageIndicator.java b/src/com/android/launcher3/PageIndicator.java
index 08e5f721a1..62ea03bcc8 100644
--- a/src/com/android/launcher3/PageIndicator.java
+++ b/src/com/android/launcher3/PageIndicator.java
@@ -16,22 +16,12 @@
 
 package com.android.launcher3;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.LayoutTransition;
-import android.animation.TimeInterpolator;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import com.android.launcher3.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher3/PageIndicatorMarker.java b/src/com/android/launcher3/PageIndicatorMarker.java
index b1025d6fe7..f012db74b0 100644
--- a/src/com/android/launcher3/PageIndicatorMarker.java
+++ b/src/com/android/launcher3/PageIndicatorMarker.java
@@ -16,17 +16,11 @@
 
 package com.android.launcher3;
 
-import android.animation.AnimatorListenerAdapter;
-import android.animation.LayoutTransition;
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.FrameLayout;
-import com.android.launcher3.R;
+import android.widget.ImageView;
 
 public class PageIndicatorMarker extends FrameLayout {
     @SuppressWarnings("unused")
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 1e4f4fa7f6..196913ef63 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -32,7 +32,6 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.accessibility.AccessibilityEventCompat;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -51,7 +50,6 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
-import android.widget.Scroller;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher3/PagedViewIconCache.java b/src/com/android/launcher3/PagedViewIconCache.java
index 8d8924b7ee..93887ea230 100644
--- a/src/com/android/launcher3/PagedViewIconCache.java
+++ b/src/com/android/launcher3/PagedViewIconCache.java
@@ -16,17 +16,17 @@
 
 package com.android.launcher3;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.pm.ComponentInfo;
 import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
 /**
  * Simple cache mechanism for PagedView outlines.
  */
diff --git a/src/com/android/launcher3/PagedViewWidget.java b/src/com/android/launcher3/PagedViewWidget.java
index d2f897a338..db4aeb9403 100644
--- a/src/com/android/launcher3/PagedViewWidget.java
+++ b/src/com/android/launcher3/PagedViewWidget.java
@@ -30,8 +30,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher3.R;
-
 /**
  * The linear layout used strictly for the widget/wallpaper tab of the customization tray
  */
diff --git a/src/com/android/launcher3/ScrimView.java b/src/com/android/launcher3/ScrimView.java
index 6831fe3d4e..68200fe640 100644
--- a/src/com/android/launcher3/ScrimView.java
+++ b/src/com/android/launcher3/ScrimView.java
@@ -17,11 +17,8 @@
 package com.android.launcher3;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.FrameLayout;
 
 public class ScrimView extends FrameLayout implements Insettable {
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index fc087a897b..660f32c791 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -20,9 +20,9 @@ import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PackageInfo;
 import android.graphics.Bitmap;
 import android.util.Log;
 

From 31ff527a4a489019803f7b6147c95630700f4bb9 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 13 Dec 2013 16:28:36 +0100
Subject: [PATCH 075/147] Update script to pull latest files from Gallery

---
 update_gallery_files.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update_gallery_files.py b/update_gallery_files.py
index ef4e8c933c..738d225eb7 100644
--- a/update_gallery_files.py
+++ b/update_gallery_files.py
@@ -49,6 +49,6 @@ for file_path in files.split():
     dir = os.path.dirname(file_path)
     if file_path.find('exif') != -1 or file_path.find('common') != -1:
         file_path = 'gallerycommon/' + file_path
-    cmd = 'cp %s/%s %s/' % (gallery_dir, file_path, dir)
+    cmd = 'cp %s/%s WallpaperPicker/%s/' % (gallery_dir, file_path, dir)
     print cmd
     os.system(cmd)

From 674531f26196502db825838b21b9cbf34463088c Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 13 Dec 2013 15:07:14 -0800
Subject: [PATCH 076/147] Don't notifyPageSwitchListener until page settles
 (issue 12069757)

-> Should address the dismiss timer not working quite right

Change-Id: I63ad32d8f7c37f1a090ff1dd6024eeb7c0c6ce65
---
 src/com/android/launcher3/PagedView.java | 17 +++++++++++++++--
 src/com/android/launcher3/Workspace.java |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 1e4f4fa7f6..fa52f52b10 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -451,6 +451,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         return new PageIndicator.PageMarkerResources();
     }
 
+    /**
+     * Add a page change listener which will be called when a page is _finished_ listening.
+     *
+     */
     public void setPageSwitchListener(PageSwitchListener pageSwitchListener) {
         mPageSwitchListener = pageSwitchListener;
         if (mPageSwitchListener != null) {
@@ -525,6 +529,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
      */
     void stopScrolling() {
         mCurrentPage = getNextPage();
+        notifyPageSwitchListener();
         forceFinishScroller();
     }
 
@@ -574,11 +579,19 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         return mRestorePage;
     }
 
+    /**
+     * Should be called whenever the page changes. In the case of a scroll, we wait until the page
+     * has settled.
+     */
     protected void notifyPageSwitchListener() {
         if (mPageSwitchListener != null) {
-            mPageSwitchListener.onPageSwitch(getPageAt(mCurrentPage), mCurrentPage);
+            mPageSwitchListener.onPageSwitch(getPageAt(getNextPage()), getNextPage());
         }
 
+        updatePageIndicator();
+    }
+
+    private void updatePageIndicator() {
         // Update the page indicator (when we aren't reordering)
         if (mPageIndicator != null && !isReordering(false)) {
             mPageIndicator.setActiveMarker(getNextPage());
@@ -2232,7 +2245,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
         mScroller.startScroll(mUnboundedScrollX, 0, delta, 0, duration);
 
-        notifyPageSwitchListener();
+        updatePageIndicator();
 
         // Trigger a compute() to finish switching pages if necessary
         if (immediate) {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 52420b73b9..6b719b2582 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1209,7 +1209,7 @@ public class Workspace extends SmoothPagedView
     @Override
     protected void notifyPageSwitchListener() {
         super.notifyPageSwitchListener();
-        Launcher.setScreen(mCurrentPage);
+        Launcher.setScreen(getNextPage());
 
         if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) {
             mCustomContentShowing = true;

From 9c58d8269b3bdfdbe500b52ccce878ff2edb196b Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 13 Dec 2013 17:18:10 -0800
Subject: [PATCH 077/147] Fix issue where deleting item from folder leaves
 extra page

Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
---
 src/com/android/launcher3/Folder.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 9637bbb48d..37a947c3ae 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -772,7 +772,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 }
                 completeDragExit();
             }
-        } else {
+        }
+
+        // This is kind of hacky, but in general, dropping on the workspace handles removing
+        // the extra screen, but dropping elsewhere (back to self, or onto delete) doesn't.
+        if (target != mLauncher.getWorkspace()) {
             mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
         }
 

From f6a22ada816ae4f63576679f03472b0a984e82be Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Thu, 12 Dec 2013 11:20:09 -0500
Subject: [PATCH 078/147] Add auto-detection of payload type

update docs and error messages
use png extension of files, since they are
don't create image files by default
use input filename for image files

Change-Id: I3e9c31a1de02976432d3f39cf82b5403055d620a
---
 util/com/android/launcher3/DecoderRing.java | 150 +++++++++++++++-----
 1 file changed, 114 insertions(+), 36 deletions(-)

diff --git a/util/com/android/launcher3/DecoderRing.java b/util/com/android/launcher3/DecoderRing.java
index bd0275e5fa..6ad6bc5a55 100644
--- a/util/com/android/launcher3/DecoderRing.java
+++ b/util/com/android/launcher3/DecoderRing.java
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3;
 
+import com.android.launcher3.backup.BackupProtos;
 import com.android.launcher3.backup.BackupProtos.CheckedMessage;
 import com.android.launcher3.backup.BackupProtos.Favorite;
 import com.android.launcher3.backup.BackupProtos.Key;
@@ -36,20 +37,46 @@ import java.io.IOException;
 import java.lang.System;
 import java.util.zip.CRC32;
 
+import javax.xml.bind.DatatypeConverter;
+
+
 /**
- * Commandline utility for decoding protos written to the android logs during debugging.
+ * Commandline utility for decoding Launcher3 backup protocol buffers.
  *
- * base64 -D icon.log > icon.bin
- * java -classpath $ANDROID_HOST_OUT/framework/protoutil.jar:$ANDROID_HOST_OUT/../common/obj/JAVA_LIBRARIES/host-libprotobuf-java-2.3.0-nano_intermediates/javalib.jar \
- *   com.android.launcher3.DecoderRing -i icon.bin
+ * <P>When using com.android.internal.backup.LocalTransport, the file names are base64-encoded Key
+ * protocol buffers with a prefix, that have been base64-encoded again by the transport:
+ * <pre>
+ *     echo TDpDQUlnL0pxVTVnOD0= | base64 -D | dd bs=1 skip=2 | base64 -D | launcher_protoutil -k
+ * </pre>
  *
- * TODO: write a wrapper to setup the classpath
+ * <P>This tool understands these file names and will use the embedded Key to detect the type and
+ * extract the payload automatically:
+ * <pre>
+ *     launcher_protoutil /tmp/TDpDQUlnL0pxVTVnOD0=
+ * </pre>
+ *
+ * <P>With payload debugging enabled, base64-encoded protocol buffers will be written to the logs.
+ * Copy the encoded log snippet into a file, and specify the type explicitly:
+ * <pre>
+ *    base64 -D icon.log > icon.bin
+ *    launcher_protoutil -i icon.bin
+ * </pre>
  */
 class DecoderRing {
+    private static Class[] TYPES = {
+            Key.class,
+            Favorite.class,
+            Screen.class,
+            Resource.class,
+            Widget.class
+    };
+    static final int ICON_TYPE_BITMAP = 1;
+
     public static void main(String[ ] args)
             throws Exception {
         File source = null;
         Class type = null;
+        boolean extractImages = false;
         int skip = 0;
 
         for (int i = 0; i < args.length; i++) {
@@ -71,6 +98,8 @@ class DecoderRing {
                 } else {
                     usage(args);
                 }
+            } else if ("-x".equals(args[i])) {
+                extractImages = true;
             } else if (args[i] != null && !args[i].startsWith("-")) {
                 source = new File(args[i]);
             } else {
@@ -80,7 +109,35 @@ class DecoderRing {
         }
 
         if (type == null) {
-            usage(args);
+            if (source == null) {
+                usage(args);
+            } else {
+                Key key = new Key();
+                try {
+                    byte[] rawKey = DatatypeConverter.parseBase64Binary(source.getName());
+                    if (rawKey[0] != 'L' || rawKey[1] != ':') {
+                        System.err.println("you must specify the payload type. " +
+                                source.getName() + " is not a launcher backup key.");
+                        System.exit(1);
+                    }
+                    String encodedPayload = new String(rawKey, 2, rawKey.length - 2);
+                    byte[] keyProtoData = DatatypeConverter.parseBase64Binary(encodedPayload);
+                    key = Key.parseFrom(keyProtoData);
+                } catch (InvalidProtocolBufferNanoException protoException) {
+                    System.err.println("failed to extract key from filename: " + protoException);
+                    System.exit(1);
+                } catch (IllegalArgumentException base64Exception) {
+                    System.err.println("failed to extract key from filename: " + base64Exception);
+                    System.exit(1);
+                }
+                // keys are self-checked
+                if (key.checksum != checkKey(key)) {
+                    System.err.println("key ckecksum failed");
+                    System.exit(1);
+                }
+                type = TYPES[key.type];
+                System.err.println("This is a " + type.getSimpleName() + " backup");
+            }
         }
 
         // read in the bytes
@@ -114,7 +171,6 @@ class DecoderRing {
             System.err.println("failed to read input: " + e);
             System.exit(1);
         }
-        System.err.println("read this many bytes: " + byteStream.size());
 
         MessageNano proto = null;
         if (type == Key.class) {
@@ -127,7 +183,7 @@ class DecoderRing {
             }
             // keys are self-checked
             if (key.checksum != checkKey(key)) {
-                System.err.println("key ckecksum failed");
+                System.err.println("key checksum failed");
                 System.exit(1);
             }
             proto = key;
@@ -143,7 +199,7 @@ class DecoderRing {
             CRC32 checksum = new CRC32();
             checksum.update(wrapper.payload);
             if (wrapper.checksum != checksum.getValue()) {
-                System.err.println("wrapper ckecksum failed");
+                System.err.println("wrapper checksum failed");
                 System.exit(1);
             }
             // decode the actual message
@@ -159,32 +215,34 @@ class DecoderRing {
         // Generic string output
         System.out.println(proto.toString());
 
-        // save off the icon bits in a file for inspection
-        if (proto instanceof Resource) {
-            Resource icon = (Resource) proto;
-            final String path = "icon.webp";
-            FileOutputStream iconFile = new FileOutputStream(path);
-            iconFile.write(icon.data);
-            iconFile.close();
-            System.err.println("wrote " + path);
-        }
-
-        // save off the widget icon and preview bits in files for inspection
-        if (proto instanceof Widget) {
-            Widget widget = (Widget) proto;
-            if (widget.icon != null) {
-                final String path = "widget_icon.webp";
-                FileOutputStream iconFile = new FileOutputStream(path);
-                iconFile.write(widget.icon.data);
-                iconFile.close();
-                System.err.println("wrote " + path);
+        if (extractImages) {
+            String prefix = "stdin";
+            if (source != null) {
+                prefix = source.getName();
             }
-            if (widget.preview != null) {
-                final String path = "widget_preview.webp";
-                FileOutputStream iconFile = new FileOutputStream(path);
-                iconFile.write(widget.preview.data);
-                iconFile.close();
-                System.err.println("wrote " + path);
+            // save off the icon bits in a file for inspection
+            if (proto instanceof Resource) {
+                Resource icon = (Resource) proto;
+                writeImageData(icon.data, prefix + ".png");
+            }
+
+            // save off the icon bits in a file for inspection
+            if (proto instanceof Favorite) {
+                Favorite favorite = (Favorite) proto;
+                if (favorite.iconType == ICON_TYPE_BITMAP) {
+                    writeImageData(favorite.icon, prefix + ".png");
+                }
+            }
+
+            // save off the widget icon and preview bits in files for inspection
+            if (proto instanceof Widget) {
+                Widget widget = (Widget) proto;
+                if (widget.icon != null) {
+                    writeImageData(widget.icon.data, prefix + "_icon.png");
+                }
+                if (widget.preview != null) {
+                    writeImageData(widget.preview.data, prefix + "_preview.png");
+                }
             }
         }
 
@@ -192,6 +250,25 @@ class DecoderRing {
         System.exit(0);
     }
 
+    private static void writeImageData(byte[] data, String path) {
+        FileOutputStream iconFile = null;
+        try {
+            iconFile = new FileOutputStream(path);
+            iconFile.write(data);
+            System.err.println("wrote " + path);
+        } catch (IOException e) {
+            System.err.println("failed to write image file: " + e);
+        } finally {
+            if (iconFile != null) {
+                try {
+                    iconFile.close();
+                } catch (IOException e) {
+                    System.err.println("failed to close the image file: " + e);
+                }
+            }
+        }
+    }
+
     private static long checkKey(Key key) {
         CRC32 checksum = new CRC32();
         checksum.update(key.type);
@@ -204,13 +281,14 @@ class DecoderRing {
     }
 
     private static void usage(String[] args) {
-        System.err.println("DecoderRing type [input]");
+        System.err.println("launcher_protoutil [-x] [-S b] [-k|-f|-i|-s|-w] [filename]");
         System.err.println("\t-k\tdecode a key");
         System.err.println("\t-f\tdecode a favorite");
         System.err.println("\t-i\tdecode a icon");
         System.err.println("\t-s\tdecode a screen");
         System.err.println("\t-w\tdecode a widget");
-        System.err.println("\t-s b\tskip b bytes");
+        System.err.println("\t-S b\tskip b bytes");
+        System.err.println("\t-x\textract image data to files");
         System.err.println("\tfilename\tread from filename, not stdin");
         System.exit(1);
     }

From 10c29d30f97494c4516cd3c2078039e90c16dea3 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 16 Dec 2013 13:16:15 -0800
Subject: [PATCH 079/147] Import translations. DO NOT MERGE

Change-Id: I40a264c567f7d0e599182ce68f5b844bd2856f9d
Auto-generated-cl: translation import
---
 WallpaperPicker/res/values-af/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-am/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ar/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-bg/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ca/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-da/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-de/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-el/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-en-rGB/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-en-rIN/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-es/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-et-rEE/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fi/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hu/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hy-rAM/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-it/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-iw/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-km-rKH/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ko/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-lt/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-lv/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-mn-rMN/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-nl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-pl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-pt-rPT/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-pt/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ro/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ru/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-th/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-tl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-uk/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-vi/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rHK/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rTW/strings.xml | 36 +++++++++++++++++++
 36 files changed, 1296 insertions(+)
 create mode 100644 WallpaperPicker/res/values-af/strings.xml
 create mode 100644 WallpaperPicker/res/values-am/strings.xml
 create mode 100644 WallpaperPicker/res/values-ar/strings.xml
 create mode 100644 WallpaperPicker/res/values-bg/strings.xml
 create mode 100644 WallpaperPicker/res/values-ca/strings.xml
 create mode 100644 WallpaperPicker/res/values-da/strings.xml
 create mode 100644 WallpaperPicker/res/values-de/strings.xml
 create mode 100644 WallpaperPicker/res/values-el/strings.xml
 create mode 100644 WallpaperPicker/res/values-en-rGB/strings.xml
 create mode 100644 WallpaperPicker/res/values-en-rIN/strings.xml
 create mode 100644 WallpaperPicker/res/values-es/strings.xml
 create mode 100644 WallpaperPicker/res/values-et-rEE/strings.xml
 create mode 100644 WallpaperPicker/res/values-fi/strings.xml
 create mode 100644 WallpaperPicker/res/values-hr/strings.xml
 create mode 100644 WallpaperPicker/res/values-hu/strings.xml
 create mode 100644 WallpaperPicker/res/values-hy-rAM/strings.xml
 create mode 100644 WallpaperPicker/res/values-it/strings.xml
 create mode 100644 WallpaperPicker/res/values-iw/strings.xml
 create mode 100644 WallpaperPicker/res/values-km-rKH/strings.xml
 create mode 100644 WallpaperPicker/res/values-ko/strings.xml
 create mode 100644 WallpaperPicker/res/values-lt/strings.xml
 create mode 100644 WallpaperPicker/res/values-lv/strings.xml
 create mode 100644 WallpaperPicker/res/values-mn-rMN/strings.xml
 create mode 100644 WallpaperPicker/res/values-nl/strings.xml
 create mode 100644 WallpaperPicker/res/values-pl/strings.xml
 create mode 100644 WallpaperPicker/res/values-pt-rPT/strings.xml
 create mode 100644 WallpaperPicker/res/values-pt/strings.xml
 create mode 100644 WallpaperPicker/res/values-ro/strings.xml
 create mode 100644 WallpaperPicker/res/values-ru/strings.xml
 create mode 100644 WallpaperPicker/res/values-sr/strings.xml
 create mode 100644 WallpaperPicker/res/values-th/strings.xml
 create mode 100644 WallpaperPicker/res/values-tl/strings.xml
 create mode 100644 WallpaperPicker/res/values-uk/strings.xml
 create mode 100644 WallpaperPicker/res/values-vi/strings.xml
 create mode 100644 WallpaperPicker/res/values-zh-rHK/strings.xml
 create mode 100644 WallpaperPicker/res/values-zh-rTW/strings.xml

diff --git a/WallpaperPicker/res/values-af/strings.xml b/WallpaperPicker/res/values-af/strings.xml
new file mode 100644
index 0000000000..c17d26be0e
--- /dev/null
+++ b/WallpaperPicker/res/values-af/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Stel muurpapier"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kon nie prent laai nie"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kon nie prent as muurpapier laai nie"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d gekies"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d gekies"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d gekies"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Muurpapier %1$d van %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Vee uit"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Kies prent"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Muurpapiere"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Snoei muurpapier"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml
new file mode 100644
index 0000000000..e4bcadbed8
--- /dev/null
+++ b/WallpaperPicker/res/values-am/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"የግድግዳ ወረቀት አዘጋጅ"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"ምስሉን መጫን አልተቻለም"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ተመርጧል"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ተመርጧል"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ተመርጧል"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"የግድግዳ ወረቀት %1$d የ%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"ሰርዝ"</string>
+    <string name="pick_image" msgid="6704438906027442697">"ምስል ይምረጡ"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይቁረጡ"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ar/strings.xml b/WallpaperPicker/res/values-ar/strings.xml
new file mode 100644
index 0000000000..2075cc875d
--- /dev/null
+++ b/WallpaperPicker/res/values-ar/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"تعيين الخلفية"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"تعذر تحميل الصورة"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"تعذر تحميل الصورة كخلفية"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"‏تم تحديد %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"‏تم تحديد %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"‏تم تحديد %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏الخلفية %1$d من %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف"</string>
+    <string name="pick_image" msgid="6704438906027442697">"اختيار صورة"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"الخلفيات"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"اقتصاص الخلفية"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-bg/strings.xml b/WallpaperPicker/res/values-bg/strings.xml
new file mode 100644
index 0000000000..ce4fc651b0
--- /dev/null
+++ b/WallpaperPicker/res/values-bg/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Задаване на тапета"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Изображението не можа да бъде заредено"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Изображението не можа да бъде заредено като тапет"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Избрахте %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Избрахте %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Избрахте %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Тапет %1$d от %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Избрахте <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Изтриване"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Избиране на изображение"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Тапети"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Подрязване на тапета"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ca/strings.xml b/WallpaperPicker/res/values-ca/strings.xml
new file mode 100644
index 0000000000..89de81c30f
--- /dev/null
+++ b/WallpaperPicker/res/values-ca/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Estableix el fons de pantalla"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"No s\'ha pogut carregar la imatge."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"No s\'ha pogut carregar la imatge com a fons de pantalla."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Seleccionats: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Seleccionats: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Seleccionats: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fons de pantalla %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"S\'ha seleccionat <xliff:g id="LABEL">%1$s</xliff:g>."</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Suprimeix"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Tria una imatge"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fons de pantalla"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Retallar fons de pantalla"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-da/strings.xml b/WallpaperPicker/res/values-da/strings.xml
new file mode 100644
index 0000000000..5b233e1d0e
--- /dev/null
+++ b/WallpaperPicker/res/values-da/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Angiv baggrund"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Billedet kunne ikke indlæses"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Billedet kunne ikke indlæses som baggrund"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d er valgt"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d er valgt"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d er valgt"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Baggrund %1$d af %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> blev valgt"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Slet"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vælg et billede"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Baggrunde"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskær baggrunden"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-de/strings.xml b/WallpaperPicker/res/values-de/strings.xml
new file mode 100644
index 0000000000..11c1cac6a3
--- /dev/null
+++ b/WallpaperPicker/res/values-de/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Hintergrund auswählen"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Bild konnte nicht geladen werden."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Bild konnte nicht als Hintergrund geladen werden."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ausgewählt"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ausgewählt"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ausgewählt"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Hintergrund %1$d von %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ausgewählt"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Löschen"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Bild auswählen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Hintergründe"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Hintergrund zuschneiden"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-el/strings.xml b/WallpaperPicker/res/values-el/strings.xml
new file mode 100644
index 0000000000..8e1e78fb94
--- /dev/null
+++ b/WallpaperPicker/res/values-el/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ορισμός ταπετσαρίας"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Δεν ήταν δυνατή η φόρτωση της εικόνας"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Δεν ήταν δυνατή η φόρτωση της εικόνας ως ταπετσαρία"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d επιλεγμένα"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d επιλεγμένα"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d επιλεγμένα"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Ταπετσαρία %1$d από %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Επιλέχθηκε το <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Διαγραφή"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Επιλογή εικόνας"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ταπετσαρίες"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Περικοπή ταπετσαρίας"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-en-rGB/strings.xml b/WallpaperPicker/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000000..c057c0cb35
--- /dev/null
+++ b/WallpaperPicker/res/values-en-rGB/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Set wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Couldn\'t load image"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Couldn\'t load image as wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selected"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selected"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selected"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-en-rIN/strings.xml b/WallpaperPicker/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000000..c057c0cb35
--- /dev/null
+++ b/WallpaperPicker/res/values-en-rIN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Set wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Couldn\'t load image"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Couldn\'t load image as wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selected"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selected"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selected"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-es/strings.xml b/WallpaperPicker/res/values-es/strings.xml
new file mode 100644
index 0000000000..702b6d413f
--- /dev/null
+++ b/WallpaperPicker/res/values-es/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Establecer fondo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"No se ha podido cargar la imagen"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"No se ha podido cargar la imagen como fondo de pantalla"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Seleccionados: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Seleccionados: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Seleccionados: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Seleccionar imagen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-et-rEE/strings.xml b/WallpaperPicker/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000000..c09e223d9e
--- /dev/null
+++ b/WallpaperPicker/res/values-et-rEE/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Määra taustapilt"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kujutist ei õnnestunud laadida"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kujutist ei õnnestunud taustapildina laadida"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Valitud on %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Valitud on %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Valitud on %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d taustapildist"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Valitud on <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Kustuta"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vali kujutis"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Taustapildid"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Taustapildi kärpimine"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fi/strings.xml b/WallpaperPicker/res/values-fi/strings.xml
new file mode 100644
index 0000000000..0fa4b7bcfc
--- /dev/null
+++ b/WallpaperPicker/res/values-fi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Aseta taustakuva"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kuvan lataus epäonnistui"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kuvaa ei voitu ladata taustakuvaksi"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d valittu"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d valittu"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d valittu"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Taustakuva %1$d/%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Valittu: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Poista"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Valitse kuva"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Taustakuvat"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Rajaa taustakuva"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hr/strings.xml b/WallpaperPicker/res/values-hr/strings.xml
new file mode 100644
index 0000000000..ff2eed2ccf
--- /dev/null
+++ b/WallpaperPicker/res/values-hr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Postavi pozadinsku sliku"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nije moguće učitati sliku"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nije moguće učitati sliku kao pozadinsku sliku"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Odabrano je %1$d stavki"</item>
+    <item quantity="one" msgid="8409622005831789373">"Odabrana je %1$d stavka"</item>
+    <item quantity="other" msgid="479468347731745357">"Odabrano stavki: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. pozadinska slika od %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Odabrana je <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Odaberi sliku"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Pozadinske slike"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Obrezivanje pozadinske slike"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hu/strings.xml b/WallpaperPicker/res/values-hu/strings.xml
new file mode 100644
index 0000000000..703aa12eb2
--- /dev/null
+++ b/WallpaperPicker/res/values-hu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Háttérkép beállítása"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"A kép betöltése nem sikerült"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"A kép betöltése háttérképként nem sikerült"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d kiválasztva"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d kiválasztva"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d kiválasztva"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d. háttérkép"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> kiválasztva"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Törlés"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Kép kiválasztása"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Háttérképek"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Háttérkép körbevágása"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hy-rAM/strings.xml b/WallpaperPicker/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000000..f3891dd35a
--- /dev/null
+++ b/WallpaperPicker/res/values-hy-rAM/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Սահմանել պաստառը"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Չհաջողվեց բեռնել նկարը"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Չհաջողվեց նկարը սահմանել որպես պաստառ"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ընտրված"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d պաստառ՝ %2$d-ից"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Ընտրված է <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ջնջել"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Ընտրել պատկեր"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Պաստառներ"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Եզրատել պաստառը"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml
new file mode 100644
index 0000000000..fcd49bd291
--- /dev/null
+++ b/WallpaperPicker/res/values-it/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Imposta sfondo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Impossibile caricare l\'immagine"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossibile caricare l\'immagine come sfondo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selezionato"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selezionato"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selezionato"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Sfondo %1$d di %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Elimina"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Scegli l\'immagine"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Sfondi"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Ritaglia sfondo"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-iw/strings.xml b/WallpaperPicker/res/values-iw/strings.xml
new file mode 100644
index 0000000000..ddc96e92c5
--- /dev/null
+++ b/WallpaperPicker/res/values-iw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"הגדר טפט"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"לא ניתן היה לטעון את התמונה"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"לא ניתן היה לטעון את התמונה כטפט"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"‏%1$d נבחרו"</item>
+    <item quantity="one" msgid="8409622005831789373">"‏%1$d נבחרו"</item>
+    <item quantity="other" msgid="479468347731745357">"‏%1$d נבחרו"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏טפט %1$d מתוך %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"בחרת <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"מחק"</string>
+    <string name="pick_image" msgid="6704438906027442697">"בחר תמונה"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"טפטים"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"חתוך את הטפט"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-km-rKH/strings.xml b/WallpaperPicker/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000000..41722355f1
--- /dev/null
+++ b/WallpaperPicker/res/values-km-rKH/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"កំណត់​ផ្ទាំង​រូបភាព"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"មិន​អាច​ផ្ទុក​រូបភាព"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"មិន​អាច​ផ្ទុក​រូបភាព​ជា​ផ្ទាំង​រូបភាព"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ផ្ទាំង​រូបភាព %1$d នៃ %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"បាន​ជ្រើស <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"លុប"</string>
+    <string name="pick_image" msgid="6704438906027442697">"ជ្រើស​យក​រូបភាព"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"ផ្ទាំង​រូបភាព"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ច្រឹប​ផ្ទាំង​រូបភាព"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ko/strings.xml b/WallpaperPicker/res/values-ko/strings.xml
new file mode 100644
index 0000000000..a5a85b773d
--- /dev/null
+++ b/WallpaperPicker/res/values-ko/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"배경화면 설정"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"이미지를 로드할 수 없습니다."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"이미지를 배경화면으로 로드할 수 없습니다."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d개 선택됨"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d개 선택됨"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d개 선택됨"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"배경화면 %1$d/%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> 선택함"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"삭제"</string>
+    <string name="pick_image" msgid="6704438906027442697">"이미지 선택"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"배경화면"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"배경화면 잘라내기"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-lt/strings.xml b/WallpaperPicker/res/values-lt/strings.xml
new file mode 100644
index 0000000000..86035b8838
--- /dev/null
+++ b/WallpaperPicker/res/values-lt/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nustatyti ekrano foną"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nepavyko įkelti vaizdo"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nepavyko įkelti vaizdo kaip ekrano fono"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Pasirinkta: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Pasirinkta: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Pasirinkta: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d ekrano fonas iš %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Pasirinkta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ištrinti"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pasirinkti vaizdą"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ekrano fonai"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Apkirpti ekrano foną"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-lv/strings.xml b/WallpaperPicker/res/values-lv/strings.xml
new file mode 100644
index 0000000000..02e5cfb22a
--- /dev/null
+++ b/WallpaperPicker/res/values-lv/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Iestatīt fona tapeti"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nevarēja ielādēt attēlu."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nevarēja ielādēt attēlu kā fona tapeti."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Atlasīts: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Atlasīta: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Atlasītas: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. fona tapete no %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Atlasīta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Dzēst"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Izvēlēties attēlu"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fona tapetes"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Apgriezt fona tapeti"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-mn-rMN/strings.xml b/WallpaperPicker/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000000..71ff9e0f72
--- /dev/null
+++ b/WallpaperPicker/res/values-mn-rMN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ханын зургийг тохируулах"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Зургийг ачаалж чадсангүй"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Зургийг ханын зураг болгож ачаалж чадсангүй"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d сонгогдсон"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d ханын цаасны %1$d нь"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> сонгогдсон"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Устгах"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Зураг сонгох"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ханын зураг"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Ханын зургийг тайрах"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-nl/strings.xml b/WallpaperPicker/res/values-nl/strings.xml
new file mode 100644
index 0000000000..7dd4f22b07
--- /dev/null
+++ b/WallpaperPicker/res/values-nl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Achtergrond instellen"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kan afbeelding niet laden"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kan afbeelding niet laden als achtergrond"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d geselecteerd"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d geselecteerd"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d geselecteerd"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Achtergrond %1$d van %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> is geselecteerd"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Verwijderen"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Afbeelding kiezen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Achtergronden"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Achtergrond bijsnijden"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-pl/strings.xml b/WallpaperPicker/res/values-pl/strings.xml
new file mode 100644
index 0000000000..bcdbb3dc7b
--- /dev/null
+++ b/WallpaperPicker/res/values-pl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ustaw tapetę"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nie udało się załadować obrazu"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nie udało się załadować obrazu jako tapety"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Wybranych %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Wybrana %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Wybrane: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Wybrano <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Usuń"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Wybierz obraz"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Przytnij tapetę"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-pt-rPT/strings.xml b/WallpaperPicker/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..83492327f9
--- /dev/null
+++ b/WallpaperPicker/res/values-pt-rPT/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Definir imagem fundo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Não foi possível carregar a imagem"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Não foi possível carregar a imagem como imagem de fundo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selecionadas"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selecionada"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selecionadas"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imagem de fundo %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> selecionada"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Escolher imagem"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Imagens de fundo"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar imagem de fundo"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-pt/strings.xml b/WallpaperPicker/res/values-pt/strings.xml
new file mode 100644
index 0000000000..2332fcbd13
--- /dev/null
+++ b/WallpaperPicker/res/values-pt/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Definir plano de fundo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Não foi possível carregar a imagem"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Não foi possível carregar a imagem como plano de fundo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selecionados"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selecionado"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selecionados"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Plano de fundo %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Excluir"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Escolher imagem"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Planos de fundo"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Cortar plano de fundo"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ro/strings.xml b/WallpaperPicker/res/values-ro/strings.xml
new file mode 100644
index 0000000000..8ee1a5a391
--- /dev/null
+++ b/WallpaperPicker/res/values-ro/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Setați imaginea de fundal"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nu s-a putut încărca imaginea"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nu s-a putut încărca imaginea ca fundal"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selectate"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selectată"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selectate"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imaginea de fundal %1$d din %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"S-a selectat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ștergeți"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Alegeți imaginea"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Imagini de fundal"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Decupați imaginea de fundal"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml
new file mode 100644
index 0000000000..2ba2af2a5d
--- /dev/null
+++ b/WallpaperPicker/res/values-ru/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Установить как обои"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Не удалось загрузить изображение"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Не удалось загрузить изображение"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Обои %1$d из %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Удалить"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Выбрать обои"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Обои"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Кадрировать обои"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sr/strings.xml b/WallpaperPicker/res/values-sr/strings.xml
new file mode 100644
index 0000000000..fdfaaf60f0
--- /dev/null
+++ b/WallpaperPicker/res/values-sr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Подеси позадину"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Није могуће учитати слику"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Није могуће учитати слику као позадину"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Изабрано је %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Изабрана је %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Изабраних: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Позадина %1$d од %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Изабрана је <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Избриши"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Изабери слику"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Позадине"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Опсеци позадину"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-th/strings.xml b/WallpaperPicker/res/values-th/strings.xml
new file mode 100644
index 0000000000..6b4c235361
--- /dev/null
+++ b/WallpaperPicker/res/values-th/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"ตั้งวอลเปเปอร์"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"ไม่สามารถโหลดรูปภาพ"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ไม่สามารถโหลดรูปภาพเป็นวอลเปเปอร์"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"เลือกไว้ %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"เลือกไว้ %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"เลือกไว้ %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"วอลเปเปอร์ %1$d จาก %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"เลือก <xliff:g id="LABEL">%1$s</xliff:g> แล้ว"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"ลบ"</string>
+    <string name="pick_image" msgid="6704438906027442697">"เลือกรูปภาพ"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"วอลเปเปอร์"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ครอบตัดวอลเปเปอร์"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-tl/strings.xml b/WallpaperPicker/res/values-tl/strings.xml
new file mode 100644
index 0000000000..c9fe338d42
--- /dev/null
+++ b/WallpaperPicker/res/values-tl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Itakda ang wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Hindi ma-load ang larawan"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Hindi ma-load ang larawan bilang wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ang napili"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ang napili"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ang napili"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d ng %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Napili ang <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Tanggalin"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pumili ng larawan"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Mga Wallpaper"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"I-crop ang wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-uk/strings.xml b/WallpaperPicker/res/values-uk/strings.xml
new file mode 100644
index 0000000000..076c88238b
--- /dev/null
+++ b/WallpaperPicker/res/values-uk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Установити фон"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Не вдалося завантажити зображення"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Не вдалося завантажити зображення як фоновий малюнок"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Вибрано %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Вибрано %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Вибрано %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Фоновий малюнок %1$d з %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Вибрано <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Видалити"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Вибрати зображення"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Фонові малюнки"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Обрізати фоновий малюнок"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-vi/strings.xml b/WallpaperPicker/res/values-vi/strings.xml
new file mode 100644
index 0000000000..d1efbe9892
--- /dev/null
+++ b/WallpaperPicker/res/values-vi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Đặt hình nền"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Không thể tải hình ảnh"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Không thể tải hình ảnh làm hình nền"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Đã chọn %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Đã chọn %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Đã chọn %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Hình nền %1$d / %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> được chọn"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Xóa"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Chọn hình ảnh"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Hình nền"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Cắt hình nền"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rHK/strings.xml b/WallpaperPicker/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000000..e7a12c1baf
--- /dev/null
+++ b/WallpaperPicker/res/values-zh-rHK/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"設定桌布"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"無法載入圖片"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"無法載入圖片設為桌布"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"已選取 %1$d 張"</item>
+    <item quantity="one" msgid="8409622005831789373">"已選取 %1$d 張"</item>
+    <item quantity="other" msgid="479468347731745357">"已選取 %1$d 張"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已選取「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"裁剪桌布"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rTW/strings.xml b/WallpaperPicker/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000..4184976083
--- /dev/null
+++ b/WallpaperPicker/res/values-zh-rTW/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"設定桌布"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"無法載入圖片"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"無法載入您要設為桌布的圖片"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"已選取 %1$d 個"</item>
+    <item quantity="one" msgid="8409622005831789373">"已選取 %1$d 個"</item>
+    <item quantity="other" msgid="479468347731745357">"已選取 %1$d 個"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"裁剪桌布"</string>
+</resources>

From 99af01ae3aba809a08d103e7e8a83d56b137de8e Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 16 Dec 2013 13:18:55 -0800
Subject: [PATCH 080/147] Import translations. DO NOT MERGE

Change-Id: If4f1706611c12995db7f3ff9349aaa08609848a1
Auto-generated-cl: translation import
---
 WallpaperPicker/res/values-af/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-am/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ar/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-bg/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ca/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-da/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-de/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-el/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-en-rGB/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-en-rIN/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-es/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-et-rEE/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fi/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hu/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hy-rAM/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-it/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-iw/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-km-rKH/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ko/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-lt/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-lv/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-mn-rMN/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-nl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-pl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-pt-rPT/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-pt/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ro/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ru/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-th/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-tl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-uk/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-vi/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rHK/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rTW/strings.xml | 36 +++++++++++++++++++
 res/values-af/strings.xml                     | 14 --------
 res/values-am/strings.xml                     | 14 --------
 res/values-ar/strings.xml                     | 14 --------
 res/values-bg/strings.xml                     | 14 --------
 res/values-ca/strings.xml                     | 14 --------
 res/values-cs/strings.xml                     | 14 --------
 res/values-da/strings.xml                     | 14 --------
 res/values-de/strings.xml                     | 14 --------
 res/values-el/strings.xml                     | 14 --------
 res/values-en-rGB/strings.xml                 | 14 --------
 res/values-en-rIN/strings.xml                 | 14 --------
 res/values-es-rUS/strings.xml                 | 14 --------
 res/values-es/strings.xml                     | 14 --------
 res/values-et-rEE/strings.xml                 | 14 --------
 res/values-fa/strings.xml                     | 14 --------
 res/values-fi/strings.xml                     | 14 --------
 res/values-fr-rCA/strings.xml                 | 14 --------
 res/values-fr/strings.xml                     | 14 --------
 res/values-hi/strings.xml                     | 14 --------
 res/values-hr/strings.xml                     | 14 --------
 res/values-hu/strings.xml                     | 14 --------
 res/values-hy-rAM/strings.xml                 | 14 --------
 res/values-in/strings.xml                     | 14 --------
 res/values-it/strings.xml                     | 14 --------
 res/values-iw/strings.xml                     | 14 --------
 res/values-ja/strings.xml                     | 14 --------
 res/values-ka-rGE/strings.xml                 | 14 --------
 res/values-km-rKH/strings.xml                 | 14 --------
 res/values-ko/strings.xml                     | 14 --------
 res/values-lo-rLA/strings.xml                 | 14 --------
 res/values-lt/strings.xml                     | 14 --------
 res/values-lv/strings.xml                     | 14 --------
 res/values-mn-rMN/strings.xml                 | 14 --------
 res/values-ms-rMY/strings.xml                 | 14 --------
 res/values-nb/strings.xml                     | 14 --------
 res/values-nl/strings.xml                     | 14 --------
 res/values-pl/strings.xml                     | 14 --------
 res/values-pt-rPT/strings.xml                 | 14 --------
 res/values-pt/strings.xml                     | 14 --------
 res/values-rm/strings.xml                     | 21 -----------
 res/values-ro/strings.xml                     | 14 --------
 res/values-ru/strings.xml                     | 14 --------
 res/values-sk/strings.xml                     | 14 --------
 res/values-sl/strings.xml                     | 14 --------
 res/values-sr/strings.xml                     | 14 --------
 res/values-sv/strings.xml                     | 14 --------
 res/values-sw/strings.xml                     | 14 --------
 res/values-th/strings.xml                     | 14 --------
 res/values-tl/strings.xml                     | 14 --------
 res/values-tr/strings.xml                     | 14 --------
 res/values-uk/strings.xml                     | 14 --------
 res/values-vi/strings.xml                     | 14 --------
 res/values-zh-rCN/strings.xml                 | 14 --------
 res/values-zh-rHK/strings.xml                 | 14 --------
 res/values-zh-rTW/strings.xml                 | 14 --------
 res/values-zu/strings.xml                     | 14 --------
 92 files changed, 1296 insertions(+), 791 deletions(-)
 create mode 100644 WallpaperPicker/res/values-af/strings.xml
 create mode 100644 WallpaperPicker/res/values-am/strings.xml
 create mode 100644 WallpaperPicker/res/values-ar/strings.xml
 create mode 100644 WallpaperPicker/res/values-bg/strings.xml
 create mode 100644 WallpaperPicker/res/values-ca/strings.xml
 create mode 100644 WallpaperPicker/res/values-da/strings.xml
 create mode 100644 WallpaperPicker/res/values-de/strings.xml
 create mode 100644 WallpaperPicker/res/values-el/strings.xml
 create mode 100644 WallpaperPicker/res/values-en-rGB/strings.xml
 create mode 100644 WallpaperPicker/res/values-en-rIN/strings.xml
 create mode 100644 WallpaperPicker/res/values-es/strings.xml
 create mode 100644 WallpaperPicker/res/values-et-rEE/strings.xml
 create mode 100644 WallpaperPicker/res/values-fi/strings.xml
 create mode 100644 WallpaperPicker/res/values-hr/strings.xml
 create mode 100644 WallpaperPicker/res/values-hu/strings.xml
 create mode 100644 WallpaperPicker/res/values-hy-rAM/strings.xml
 create mode 100644 WallpaperPicker/res/values-it/strings.xml
 create mode 100644 WallpaperPicker/res/values-iw/strings.xml
 create mode 100644 WallpaperPicker/res/values-km-rKH/strings.xml
 create mode 100644 WallpaperPicker/res/values-ko/strings.xml
 create mode 100644 WallpaperPicker/res/values-lt/strings.xml
 create mode 100644 WallpaperPicker/res/values-lv/strings.xml
 create mode 100644 WallpaperPicker/res/values-mn-rMN/strings.xml
 create mode 100644 WallpaperPicker/res/values-nl/strings.xml
 create mode 100644 WallpaperPicker/res/values-pl/strings.xml
 create mode 100644 WallpaperPicker/res/values-pt-rPT/strings.xml
 create mode 100644 WallpaperPicker/res/values-pt/strings.xml
 create mode 100644 WallpaperPicker/res/values-ro/strings.xml
 create mode 100644 WallpaperPicker/res/values-ru/strings.xml
 create mode 100644 WallpaperPicker/res/values-sr/strings.xml
 create mode 100644 WallpaperPicker/res/values-th/strings.xml
 create mode 100644 WallpaperPicker/res/values-tl/strings.xml
 create mode 100644 WallpaperPicker/res/values-uk/strings.xml
 create mode 100644 WallpaperPicker/res/values-vi/strings.xml
 create mode 100644 WallpaperPicker/res/values-zh-rHK/strings.xml
 create mode 100644 WallpaperPicker/res/values-zh-rTW/strings.xml

diff --git a/WallpaperPicker/res/values-af/strings.xml b/WallpaperPicker/res/values-af/strings.xml
new file mode 100644
index 0000000000..c17d26be0e
--- /dev/null
+++ b/WallpaperPicker/res/values-af/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Stel muurpapier"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kon nie prent laai nie"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kon nie prent as muurpapier laai nie"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d gekies"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d gekies"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d gekies"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Muurpapier %1$d van %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Vee uit"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Kies prent"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Muurpapiere"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Snoei muurpapier"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml
new file mode 100644
index 0000000000..e4bcadbed8
--- /dev/null
+++ b/WallpaperPicker/res/values-am/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"የግድግዳ ወረቀት አዘጋጅ"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"ምስሉን መጫን አልተቻለም"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ተመርጧል"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ተመርጧል"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ተመርጧል"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"የግድግዳ ወረቀት %1$d የ%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"ሰርዝ"</string>
+    <string name="pick_image" msgid="6704438906027442697">"ምስል ይምረጡ"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይቁረጡ"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ar/strings.xml b/WallpaperPicker/res/values-ar/strings.xml
new file mode 100644
index 0000000000..2075cc875d
--- /dev/null
+++ b/WallpaperPicker/res/values-ar/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"تعيين الخلفية"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"تعذر تحميل الصورة"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"تعذر تحميل الصورة كخلفية"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"‏تم تحديد %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"‏تم تحديد %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"‏تم تحديد %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏الخلفية %1$d من %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف"</string>
+    <string name="pick_image" msgid="6704438906027442697">"اختيار صورة"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"الخلفيات"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"اقتصاص الخلفية"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-bg/strings.xml b/WallpaperPicker/res/values-bg/strings.xml
new file mode 100644
index 0000000000..ce4fc651b0
--- /dev/null
+++ b/WallpaperPicker/res/values-bg/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Задаване на тапета"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Изображението не можа да бъде заредено"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Изображението не можа да бъде заредено като тапет"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Избрахте %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Избрахте %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Избрахте %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Тапет %1$d от %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Избрахте <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Изтриване"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Избиране на изображение"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Тапети"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Подрязване на тапета"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ca/strings.xml b/WallpaperPicker/res/values-ca/strings.xml
new file mode 100644
index 0000000000..89de81c30f
--- /dev/null
+++ b/WallpaperPicker/res/values-ca/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Estableix el fons de pantalla"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"No s\'ha pogut carregar la imatge."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"No s\'ha pogut carregar la imatge com a fons de pantalla."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Seleccionats: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Seleccionats: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Seleccionats: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fons de pantalla %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"S\'ha seleccionat <xliff:g id="LABEL">%1$s</xliff:g>."</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Suprimeix"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Tria una imatge"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fons de pantalla"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Retallar fons de pantalla"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-da/strings.xml b/WallpaperPicker/res/values-da/strings.xml
new file mode 100644
index 0000000000..5b233e1d0e
--- /dev/null
+++ b/WallpaperPicker/res/values-da/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Angiv baggrund"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Billedet kunne ikke indlæses"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Billedet kunne ikke indlæses som baggrund"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d er valgt"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d er valgt"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d er valgt"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Baggrund %1$d af %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> blev valgt"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Slet"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vælg et billede"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Baggrunde"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskær baggrunden"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-de/strings.xml b/WallpaperPicker/res/values-de/strings.xml
new file mode 100644
index 0000000000..11c1cac6a3
--- /dev/null
+++ b/WallpaperPicker/res/values-de/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Hintergrund auswählen"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Bild konnte nicht geladen werden."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Bild konnte nicht als Hintergrund geladen werden."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ausgewählt"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ausgewählt"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ausgewählt"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Hintergrund %1$d von %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ausgewählt"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Löschen"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Bild auswählen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Hintergründe"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Hintergrund zuschneiden"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-el/strings.xml b/WallpaperPicker/res/values-el/strings.xml
new file mode 100644
index 0000000000..8e1e78fb94
--- /dev/null
+++ b/WallpaperPicker/res/values-el/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ορισμός ταπετσαρίας"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Δεν ήταν δυνατή η φόρτωση της εικόνας"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Δεν ήταν δυνατή η φόρτωση της εικόνας ως ταπετσαρία"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d επιλεγμένα"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d επιλεγμένα"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d επιλεγμένα"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Ταπετσαρία %1$d από %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Επιλέχθηκε το <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Διαγραφή"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Επιλογή εικόνας"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ταπετσαρίες"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Περικοπή ταπετσαρίας"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-en-rGB/strings.xml b/WallpaperPicker/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000000..c057c0cb35
--- /dev/null
+++ b/WallpaperPicker/res/values-en-rGB/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Set wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Couldn\'t load image"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Couldn\'t load image as wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selected"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selected"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selected"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-en-rIN/strings.xml b/WallpaperPicker/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000000..c057c0cb35
--- /dev/null
+++ b/WallpaperPicker/res/values-en-rIN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Set wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Couldn\'t load image"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Couldn\'t load image as wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selected"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selected"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selected"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-es/strings.xml b/WallpaperPicker/res/values-es/strings.xml
new file mode 100644
index 0000000000..702b6d413f
--- /dev/null
+++ b/WallpaperPicker/res/values-es/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Establecer fondo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"No se ha podido cargar la imagen"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"No se ha podido cargar la imagen como fondo de pantalla"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Seleccionados: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Seleccionados: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Seleccionados: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Seleccionar imagen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-et-rEE/strings.xml b/WallpaperPicker/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000000..c09e223d9e
--- /dev/null
+++ b/WallpaperPicker/res/values-et-rEE/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Määra taustapilt"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kujutist ei õnnestunud laadida"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kujutist ei õnnestunud taustapildina laadida"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Valitud on %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Valitud on %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Valitud on %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d taustapildist"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Valitud on <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Kustuta"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vali kujutis"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Taustapildid"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Taustapildi kärpimine"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fi/strings.xml b/WallpaperPicker/res/values-fi/strings.xml
new file mode 100644
index 0000000000..0fa4b7bcfc
--- /dev/null
+++ b/WallpaperPicker/res/values-fi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Aseta taustakuva"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kuvan lataus epäonnistui"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kuvaa ei voitu ladata taustakuvaksi"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d valittu"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d valittu"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d valittu"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Taustakuva %1$d/%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Valittu: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Poista"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Valitse kuva"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Taustakuvat"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Rajaa taustakuva"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hr/strings.xml b/WallpaperPicker/res/values-hr/strings.xml
new file mode 100644
index 0000000000..ff2eed2ccf
--- /dev/null
+++ b/WallpaperPicker/res/values-hr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Postavi pozadinsku sliku"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nije moguće učitati sliku"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nije moguće učitati sliku kao pozadinsku sliku"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Odabrano je %1$d stavki"</item>
+    <item quantity="one" msgid="8409622005831789373">"Odabrana je %1$d stavka"</item>
+    <item quantity="other" msgid="479468347731745357">"Odabrano stavki: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. pozadinska slika od %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Odabrana je <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Odaberi sliku"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Pozadinske slike"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Obrezivanje pozadinske slike"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hu/strings.xml b/WallpaperPicker/res/values-hu/strings.xml
new file mode 100644
index 0000000000..703aa12eb2
--- /dev/null
+++ b/WallpaperPicker/res/values-hu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Háttérkép beállítása"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"A kép betöltése nem sikerült"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"A kép betöltése háttérképként nem sikerült"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d kiválasztva"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d kiválasztva"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d kiválasztva"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d. háttérkép"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> kiválasztva"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Törlés"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Kép kiválasztása"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Háttérképek"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Háttérkép körbevágása"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hy-rAM/strings.xml b/WallpaperPicker/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000000..f3891dd35a
--- /dev/null
+++ b/WallpaperPicker/res/values-hy-rAM/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Սահմանել պաստառը"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Չհաջողվեց բեռնել նկարը"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Չհաջողվեց նկարը սահմանել որպես պաստառ"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ընտրված"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ընտրված"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ընտրված"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d պաստառ՝ %2$d-ից"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Ընտրված է <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ջնջել"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Ընտրել պատկեր"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Պաստառներ"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Եզրատել պաստառը"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml
new file mode 100644
index 0000000000..fcd49bd291
--- /dev/null
+++ b/WallpaperPicker/res/values-it/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Imposta sfondo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Impossibile caricare l\'immagine"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossibile caricare l\'immagine come sfondo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selezionato"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selezionato"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selezionato"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Sfondo %1$d di %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Elimina"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Scegli l\'immagine"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Sfondi"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Ritaglia sfondo"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-iw/strings.xml b/WallpaperPicker/res/values-iw/strings.xml
new file mode 100644
index 0000000000..ddc96e92c5
--- /dev/null
+++ b/WallpaperPicker/res/values-iw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"הגדר טפט"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"לא ניתן היה לטעון את התמונה"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"לא ניתן היה לטעון את התמונה כטפט"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"‏%1$d נבחרו"</item>
+    <item quantity="one" msgid="8409622005831789373">"‏%1$d נבחרו"</item>
+    <item quantity="other" msgid="479468347731745357">"‏%1$d נבחרו"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏טפט %1$d מתוך %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"בחרת <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"מחק"</string>
+    <string name="pick_image" msgid="6704438906027442697">"בחר תמונה"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"טפטים"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"חתוך את הטפט"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-km-rKH/strings.xml b/WallpaperPicker/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000000..41722355f1
--- /dev/null
+++ b/WallpaperPicker/res/values-km-rKH/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"កំណត់​ផ្ទាំង​រូបភាព"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"មិន​អាច​ផ្ទុក​រូបភាព"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"មិន​អាច​ផ្ទុក​រូបភាព​ជា​ផ្ទាំង​រូបភាព"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"បាន​ជ្រើស %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"បាន​ជ្រើស %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ផ្ទាំង​រូបភាព %1$d នៃ %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"បាន​ជ្រើស <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"លុប"</string>
+    <string name="pick_image" msgid="6704438906027442697">"ជ្រើស​យក​រូបភាព"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"ផ្ទាំង​រូបភាព"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ច្រឹប​ផ្ទាំង​រូបភាព"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ko/strings.xml b/WallpaperPicker/res/values-ko/strings.xml
new file mode 100644
index 0000000000..a5a85b773d
--- /dev/null
+++ b/WallpaperPicker/res/values-ko/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"배경화면 설정"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"이미지를 로드할 수 없습니다."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"이미지를 배경화면으로 로드할 수 없습니다."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d개 선택됨"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d개 선택됨"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d개 선택됨"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"배경화면 %1$d/%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> 선택함"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"삭제"</string>
+    <string name="pick_image" msgid="6704438906027442697">"이미지 선택"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"배경화면"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"배경화면 잘라내기"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-lt/strings.xml b/WallpaperPicker/res/values-lt/strings.xml
new file mode 100644
index 0000000000..86035b8838
--- /dev/null
+++ b/WallpaperPicker/res/values-lt/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nustatyti ekrano foną"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nepavyko įkelti vaizdo"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nepavyko įkelti vaizdo kaip ekrano fono"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Pasirinkta: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Pasirinkta: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Pasirinkta: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d ekrano fonas iš %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Pasirinkta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ištrinti"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pasirinkti vaizdą"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ekrano fonai"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Apkirpti ekrano foną"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-lv/strings.xml b/WallpaperPicker/res/values-lv/strings.xml
new file mode 100644
index 0000000000..02e5cfb22a
--- /dev/null
+++ b/WallpaperPicker/res/values-lv/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Iestatīt fona tapeti"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nevarēja ielādēt attēlu."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nevarēja ielādēt attēlu kā fona tapeti."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Atlasīts: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Atlasīta: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Atlasītas: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. fona tapete no %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Atlasīta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Dzēst"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Izvēlēties attēlu"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fona tapetes"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Apgriezt fona tapeti"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-mn-rMN/strings.xml b/WallpaperPicker/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000000..71ff9e0f72
--- /dev/null
+++ b/WallpaperPicker/res/values-mn-rMN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ханын зургийг тохируулах"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Зургийг ачаалж чадсангүй"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Зургийг ханын зураг болгож ачаалж чадсангүй"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d сонгогдсон"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d сонгогдсон"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d сонгогдсон"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d ханын цаасны %1$d нь"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> сонгогдсон"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Устгах"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Зураг сонгох"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ханын зураг"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Ханын зургийг тайрах"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-nl/strings.xml b/WallpaperPicker/res/values-nl/strings.xml
new file mode 100644
index 0000000000..7dd4f22b07
--- /dev/null
+++ b/WallpaperPicker/res/values-nl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Achtergrond instellen"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kan afbeelding niet laden"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kan afbeelding niet laden als achtergrond"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d geselecteerd"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d geselecteerd"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d geselecteerd"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Achtergrond %1$d van %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> is geselecteerd"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Verwijderen"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Afbeelding kiezen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Achtergronden"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Achtergrond bijsnijden"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-pl/strings.xml b/WallpaperPicker/res/values-pl/strings.xml
new file mode 100644
index 0000000000..bcdbb3dc7b
--- /dev/null
+++ b/WallpaperPicker/res/values-pl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ustaw tapetę"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nie udało się załadować obrazu"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nie udało się załadować obrazu jako tapety"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Wybranych %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Wybrana %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Wybrane: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Wybrano <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Usuń"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Wybierz obraz"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Przytnij tapetę"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-pt-rPT/strings.xml b/WallpaperPicker/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..83492327f9
--- /dev/null
+++ b/WallpaperPicker/res/values-pt-rPT/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Definir imagem fundo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Não foi possível carregar a imagem"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Não foi possível carregar a imagem como imagem de fundo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selecionadas"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selecionada"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selecionadas"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imagem de fundo %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> selecionada"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Escolher imagem"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Imagens de fundo"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar imagem de fundo"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-pt/strings.xml b/WallpaperPicker/res/values-pt/strings.xml
new file mode 100644
index 0000000000..2332fcbd13
--- /dev/null
+++ b/WallpaperPicker/res/values-pt/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Definir plano de fundo"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Não foi possível carregar a imagem"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Não foi possível carregar a imagem como plano de fundo"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selecionados"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selecionado"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selecionados"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Plano de fundo %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Excluir"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Escolher imagem"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Planos de fundo"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Cortar plano de fundo"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ro/strings.xml b/WallpaperPicker/res/values-ro/strings.xml
new file mode 100644
index 0000000000..8ee1a5a391
--- /dev/null
+++ b/WallpaperPicker/res/values-ro/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Setați imaginea de fundal"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Nu s-a putut încărca imaginea"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nu s-a putut încărca imaginea ca fundal"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selectate"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d selectată"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selectate"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imaginea de fundal %1$d din %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"S-a selectat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ștergeți"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Alegeți imaginea"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Imagini de fundal"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Decupați imaginea de fundal"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml
new file mode 100644
index 0000000000..2ba2af2a5d
--- /dev/null
+++ b/WallpaperPicker/res/values-ru/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Установить как обои"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Не удалось загрузить изображение"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Не удалось загрузить изображение"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Обои %1$d из %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Удалить"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Выбрать обои"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Обои"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Кадрировать обои"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sr/strings.xml b/WallpaperPicker/res/values-sr/strings.xml
new file mode 100644
index 0000000000..fdfaaf60f0
--- /dev/null
+++ b/WallpaperPicker/res/values-sr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Подеси позадину"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Није могуће учитати слику"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Није могуће учитати слику као позадину"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Изабрано је %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Изабрана је %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Изабраних: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Позадина %1$d од %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Изабрана је <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Избриши"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Изабери слику"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Позадине"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Опсеци позадину"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-th/strings.xml b/WallpaperPicker/res/values-th/strings.xml
new file mode 100644
index 0000000000..6b4c235361
--- /dev/null
+++ b/WallpaperPicker/res/values-th/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"ตั้งวอลเปเปอร์"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"ไม่สามารถโหลดรูปภาพ"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ไม่สามารถโหลดรูปภาพเป็นวอลเปเปอร์"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"เลือกไว้ %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"เลือกไว้ %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"เลือกไว้ %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"วอลเปเปอร์ %1$d จาก %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"เลือก <xliff:g id="LABEL">%1$s</xliff:g> แล้ว"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"ลบ"</string>
+    <string name="pick_image" msgid="6704438906027442697">"เลือกรูปภาพ"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"วอลเปเปอร์"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ครอบตัดวอลเปเปอร์"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-tl/strings.xml b/WallpaperPicker/res/values-tl/strings.xml
new file mode 100644
index 0000000000..c9fe338d42
--- /dev/null
+++ b/WallpaperPicker/res/values-tl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Itakda ang wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Hindi ma-load ang larawan"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Hindi ma-load ang larawan bilang wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d ang napili"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d ang napili"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d ang napili"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d ng %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Napili ang <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Tanggalin"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pumili ng larawan"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Mga Wallpaper"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"I-crop ang wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-uk/strings.xml b/WallpaperPicker/res/values-uk/strings.xml
new file mode 100644
index 0000000000..076c88238b
--- /dev/null
+++ b/WallpaperPicker/res/values-uk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Установити фон"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Не вдалося завантажити зображення"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Не вдалося завантажити зображення як фоновий малюнок"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Вибрано %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Вибрано %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Вибрано %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Фоновий малюнок %1$d з %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Вибрано <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Видалити"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Вибрати зображення"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Фонові малюнки"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Обрізати фоновий малюнок"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-vi/strings.xml b/WallpaperPicker/res/values-vi/strings.xml
new file mode 100644
index 0000000000..d1efbe9892
--- /dev/null
+++ b/WallpaperPicker/res/values-vi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Đặt hình nền"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Không thể tải hình ảnh"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Không thể tải hình ảnh làm hình nền"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Đã chọn %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Đã chọn %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Đã chọn %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Hình nền %1$d / %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> được chọn"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Xóa"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Chọn hình ảnh"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Hình nền"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Cắt hình nền"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rHK/strings.xml b/WallpaperPicker/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000000..e7a12c1baf
--- /dev/null
+++ b/WallpaperPicker/res/values-zh-rHK/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"設定桌布"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"無法載入圖片"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"無法載入圖片設為桌布"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"已選取 %1$d 張"</item>
+    <item quantity="one" msgid="8409622005831789373">"已選取 %1$d 張"</item>
+    <item quantity="other" msgid="479468347731745357">"已選取 %1$d 張"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已選取「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"裁剪桌布"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rTW/strings.xml b/WallpaperPicker/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000..4184976083
--- /dev/null
+++ b/WallpaperPicker/res/values-zh-rTW/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"設定桌布"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"無法載入圖片"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"無法載入您要設為桌布的圖片"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"已選取 %1$d 個"</item>
+    <item quantity="one" msgid="8409622005831789373">"已選取 %1$d 個"</item>
+    <item quantity="other" msgid="479468347731745357">"已選取 %1$d 個"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"裁剪桌布"</string>
+</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index de987bdb4c..34a5568dc2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Tuis"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android-kernprogramme"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Stel muurpapier"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kon prent nie laai nie"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kon prent nie as muurpapier laai nie"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d gekies"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d gekies"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d gekies"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Muurpapier %1$d van %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Vee uit"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Kies prent"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Muurpapiere"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Snoei muurpapier"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Program is nie geïnstalleer nie."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Legstukke"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Legstukke"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index dc64c5d76b..c6420d56bc 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"መነሻ"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android ዋና መተግበሪያዎች"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"የግድግዳ ወረቀት አዘጋጅ"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"ምስሉን መጫን አልተቻለም"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ተመርጧል"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ተመርጧል"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ተመርጧል"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"የግድግዳ ወረቀት %1$d ከ%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"ሰርዝ"</string>
-    <string name="pick_image" msgid="1272073934062909527">"ምስል ምረጥ"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"የግድግዳ ወረቀቶች"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"የግድግዳ ወረቀት ከርክም"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"መተግበሪያ አልተጫነም።"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ፍርግሞች"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ፍርግሞች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 84c157e2bc..aeca02532d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"الرئيسية"</string>
     <string name="uid_name" msgid="7820867637514617527">"‏تطبيقات Android الأساسية"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"تعيين خلفية"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"تعذر تحميل الصورة"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"تعذر تحميل الصورة كخلفية"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"‏تم تحديد %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"‏تم تحديد %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"‏تم تحديد %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"‏الخلفية %1$d من %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"حذف"</string>
-    <string name="pick_image" msgid="1272073934062909527">"اختيار صورة"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"الخلفيات"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"اقتصاص الخلفية"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"لم يتم تثبيت التطبيق."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"الأدوات"</string>
     <string name="widget_adder" msgid="3201040140710381657">"الأدوات"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e57e9d2da6..2a2b72d290 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Начало"</string>
     <string name="uid_name" msgid="7820867637514617527">"Основни приложения на Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Задаване на тапета"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Изображението не можа да бъде заредено"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Изображението не можа да бъде заредено като тапет"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Избрахте %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Избрахте %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Избрахте %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Тапет %1$d от %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Избрахте <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Изтриване"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Избиране на изображение"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Тапети"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Подрязване на тапета"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Приложението не е инсталирано."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Приспособления"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Приспособления"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a9eb99c1db..fa520ba678 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Inici"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicacions principals d\'Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Estableix el fons de pantalla"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"No s\'ha pogut carregar la imatge."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"No s\'ha pogut carregar la imatge com a fons de pantalla."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Seleccionats: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Seleccionats: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Seleccionats: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fons de pantalla %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"S\'ha seleccionat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Suprimeix"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Selecciona una imatge"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fons de pantalla"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Retalla el fons de pantalla"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'aplicació no s\'ha instal·lat."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 258f645321..fdd48458c8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Plocha"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nastavit jako tapetu"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Obrázek nelze načíst."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Obrázek nelze načíst jako tapetu."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Vybráno: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Vybráno: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Vybráno: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Tapeta %1$d z %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Vybrána položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Smazat"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vybrat obrázek"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Tapety"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Oříznutí tapety"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikace není nainstalována."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgety"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgety"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 96b6af624a..9bf05f0b64 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startskærm"</string>
     <string name="uid_name" msgid="7820867637514617527">"Kerneapps i Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Angiv baggrund"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Billedet kunne ikke indlæses"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Billedet kunne ikke indlæses som baggrund"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d er valgt"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d er valgt"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d er valgt"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Baggrund %1$d af %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> blev valgt"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Slet"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vælg billede"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Baggrunde"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Beskær baggrund"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen er ikke installeret."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b95d482700..249af37f34 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startseite"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Hintergrund auswählen"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Bild konnte nicht geladen werden."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Bild konnte nicht als Hintergrund geladen werden."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ausgewählt"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ausgewählt"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ausgewählt"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Hintergrund %1$d von %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> ausgewählt"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Entfernen"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Bild auswählen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Hintergründe"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Hintergrund zuschneiden"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App ist nicht installiert."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2c3f3f5b1d..cfb97ece02 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Αρχική σελίδα"</string>
     <string name="uid_name" msgid="7820867637514617527">"Βασικές εφαρμογές Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ορισμός ταπετσαρίας"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Δεν ήταν δυνατή η φόρτωση της εικόνας"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Δεν ήταν δυνατή η φόρτωση της εικόνας ως ταπετσαρία"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d επιλεγμένα"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d επιλεγμένα"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d επιλεγμένα"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Ταπετσαρία %1$d από %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Επιλέχθηκε το <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Διαγραφή"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Επιλογή εικόνας"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ταπετσαρίες"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Περικοπή ταπετσαρίας"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Η εφαρμογή δεν έχει εγκατασταθεί."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Γραφικά στοιχεία"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Γραφικά στοιχεία"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0e3e5591aa..2ca832b330 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Set wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Coudn\'t load image"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Couldn\'t load image as wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selected"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selected"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selected"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Delete"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pick image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Wallpapers"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Crop wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App isn\'t installed."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0e3e5591aa..2ca832b330 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Set wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Coudn\'t load image"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Couldn\'t load image as wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selected"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selected"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selected"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Delete"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pick image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Wallpapers"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Crop wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App isn\'t installed."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fd37c32cd3..cec4c10a8c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Pantalla principal"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicaciones básicas de Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Establecer como fondo de pantalla"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"No se pudo cargar la imagen."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"No se pudo cargar la imagen como fondo de pantalla."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d seleccionados"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d seleccionado"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d seleccionados"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fondo de pantalla %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Eliminar"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Elegir imagen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fondos de pantalla"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Recortar fondo de pantalla"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"No se instaló la aplicación."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ad6b2200d1..73dae125f8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicaciones básicas de Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Establecer fondo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"No se ha podido cargar la imagen"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"No se ha podido cargar la imagen como fondo de pantalla"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Seleccionados: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Seleccionados: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Seleccionados: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fondo de pantalla %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Eliminar"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Seleccionar imagen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fondos de pantalla"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Recortar fondo de pantalla"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"La aplicación no está instalada."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ab4ad02cda..a68778a3ec 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Avaekraan"</string>
     <string name="uid_name" msgid="7820867637514617527">"Androidi tuumrakendused"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Määra taustapilt"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kujutist ei õnnestunud laadida"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kujutist ei õnnestunud taustapildina laadida"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Valitud on %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Valitud on %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Valitud on %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d/%2$d taustapildist"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Valitud on <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Kustuta"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vali kujutis"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Taustapildid"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Taustapildi kärpimine"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Rakendus pole installitud."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Vidinad"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Vidinad"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2dd1bcea6f..f118c10144 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"صفحه اصلی"</string>
     <string name="uid_name" msgid="7820867637514617527">"‏برنامه‌های Android Core"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"تنظیم کاغذدیواری"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"بارگیری تصویر انجام نشد"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"بارگیری تصویر به‌عنوان کاغذدیواری انجام نشد"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"‏%1$d انتخاب شد"</item>
-    <item quantity="one" msgid="142482526010824029">"‏%1$d انتخاب شد"</item>
-    <item quantity="other" msgid="1418352074806573570">"‏%1$d انتخاب شد"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"‏کاغذ دیواری %1$d از %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> انتخاب شده"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"حذف"</string>
-    <string name="pick_image" msgid="1272073934062909527">"انتخاب تصویر"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"کاغذدیواری‌ها"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"برش کاغذ دیواری"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"برنامه نصب نشده است."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ابزارک‌ها"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ابزارک‌ها"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c5f478f2e6..549804d602 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Aloitusruutu"</string>
     <string name="uid_name" msgid="7820867637514617527">"Androidin ydinsovellukset"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Aseta taustakuva"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kuvan lataus epäonnistui"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kuvaa ei voitu ladata taustakuvaksi"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d valittu"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d valittu"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d valittu"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Taustakuva %1$d/%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Valittu: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Poista"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Valitse kuva"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Taustakuvat"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Rajaa taustakuva"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Sovellusta ei ole asennettu."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgetit"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgetit"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 49adaac94a..97c03fe15c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Accueil"</string>
     <string name="uid_name" msgid="7820867637514617527">"Applications de base Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Définir le fond d\'écran"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Impossible de charger l\'image"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Impossible de charger l\'image comme fond d\'écran"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d sélectionné"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d sélectionné"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d sélectionné(s)"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fond d\'écran %1$d sur %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Sélection : <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Supprimer"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Sélectionner une image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fonds d\'écran"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Rogner le fond d\'écran"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bb466ea6d2..0f9d836c43 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Accueil"</string>
     <string name="uid_name" msgid="7820867637514617527">"Applications de base Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Définir comme fond d\'écran"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Impossible de charger l\'image."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Impossible de charger l\'image comme fond d\'écran."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d fond d\'écran sélectionné"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d fond d\'écran sélectionné"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d fonds d\'écran sélectionnés"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Fond d\'écran %1$d sur %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> est sélectionné."</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Supprimer"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Sélectionner une image"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fonds d\'écran"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Rogner le fond d\'écran"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"L\'application n\'est pas installée."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b1060780c0..e149e0fcc6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"होम"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android के मुख्य एप्लिकेशन"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"वॉलपेपर सेट करें"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"चित्र लोड नहीं किया जा सका"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"चित्र को वॉलपेपर के रूप में लोड नहीं किया जा सका"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d चयनित"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d चयनित"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d चयनित"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"वॉलपेपर %2$d में से %1$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"चयनित <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"हटाएं"</string>
-    <string name="pick_image" msgid="1272073934062909527">"चित्र चुनें"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"वॉलपेपर"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"वॉलपेपर काटें"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"एप्‍लिकेशन इंस्‍टॉल नहीं है."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"विजेट"</string>
     <string name="widget_adder" msgid="3201040140710381657">"विजेट"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9c7d38ee3e..c9b119fefc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Početna"</string>
     <string name="uid_name" msgid="7820867637514617527">"Matične aplikacije za Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Postavi pozadinsku sliku"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nije moguće učitati sliku"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nije moguće učitati sliku kao pozadinsku sliku"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Odabrano: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Odabrano: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Odabrano: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d. pozadinska slika od %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Odabrana je stavka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Izbriši"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Odaberi sliku"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Pozadinske slike"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Obreži pozadinsku sliku"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacija nije instalirana."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgeti"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgeti"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 89504ddcfc..2b33776438 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Főoldal"</string>
     <string name="uid_name" msgid="7820867637514617527">"Alap Android-alkalmazások"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Háttérkép beállítása"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"A kép betöltése nem sikerült"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"A kép betöltése háttérképként nem sikerült"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d kiválasztva"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d kiválasztva"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d kiválasztva"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%2$d/%1$d. háttérkép"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> kiválasztva"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Törlés"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Kép választása"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Háttérképek"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Háttérkép körbevágása"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Az alkalmazás nincs telepítve."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Modulok"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Modulok"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 618193d27a..eb7396b15a 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Հիմնական"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Սահմանել պաստառը"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Չհաջողվեց բեռնել նկարը"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Չհաջողվեց նկարը սահմանել որպես պաստառ"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ընտրված"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ընտրված"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ընտրված"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d պաստառ՝ %2$d-ից"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Ընտրված է <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ջնջել"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Ընտրել պատկեր"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Պաստառներ"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Եզրատել պաստառը"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Ծրագիրը տեղադրված չէ:"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Վիջեթներ"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Վիջեթներ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cb91c30893..87d163ac30 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Layar Utama"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplikasi Inti Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Setel wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Tidak dapat memuat gambar"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Tidak dapat memuat gambar sebagai wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d dipilih"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d dipilih"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d dipilih"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d dari %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> terpilih"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Hapus"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pilih gambar"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Wallpaper"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Pangkas wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikasi tidak dipasang."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ba4067903e..92d79b0408 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home page"</string>
     <string name="uid_name" msgid="7820867637514617527">"Applicazioni di base Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Imposta sfondo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Impossibile caricare l\'immagine"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Impossibile caricare l\'immagine come sfondo"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selezionati"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selezionato"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selezionati"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Sfondo %1$d di %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Elimina"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Scegli immagine"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Sfondi"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Ritaglia sfondo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App non installata."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8d70a252d7..a348646d31 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"דף הבית"</string>
     <string name="uid_name" msgid="7820867637514617527">"‏אפליקציות הליבה של Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"בחר טפט"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"לא ניתן היה לטעון את התמונה"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"לא ניתן היה לטעון את התמונה כטפט"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"‏%1$d נבחרו"</item>
-    <item quantity="one" msgid="142482526010824029">"‏%1$d נבחרו"</item>
-    <item quantity="other" msgid="1418352074806573570">"‏%1$d נבחרו"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"‏טפט %1$d מתוך %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"בחרת <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"מחק"</string>
-    <string name="pick_image" msgid="1272073934062909527">"בחר תמונה"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"טפטים"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"חתוך את הטפט"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"האפליקציה לא מותקנת."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"רכיבי ווידג\'ט"</string>
     <string name="widget_adder" msgid="3201040140710381657">"רכיבי ווידג\'ט"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3c2b2f0ba9..1de0be5c32 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"ホーム"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"壁紙を設定"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"画像を読み込めませんでした"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"画像を壁紙として読み込めませんでした"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d件選択済み"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d件選択済み"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d件選択済み"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"壁紙: %1$d/%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"選択: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"削除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"画像を選択"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"壁紙"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"壁紙をトリミング"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"このアプリはインストールされていません。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ウィジェット"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ウィジェット"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a68951a156..c004f07f1c 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"მთავარი"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android-ის ბირთვის აპები"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"ფონის დაყენება"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"სურათი ვერ ჩაიტვირთა."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"სურათი ფონად ვერ ჩაიტვირთა."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"არჩეულია %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"არჩეულია %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"არჩეულია %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"ფონი %1$d %2$d-დან"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"არჩეულია <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"წაშლა"</string>
-    <string name="pick_image" msgid="1272073934062909527">"სურათის ამორჩევა"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"ფონები"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ფონის ჩამოჭრა"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"აპი არ არის დაყენებული."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ვიჯეტები"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ვიჯეტები"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 6799f77550..84781bcc21 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"ដើម"</string>
     <string name="uid_name" msgid="7820867637514617527">"កម្មវិធី​​សំខាន់​ៗ​របស់ Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"កំណត់​ផ្ទាំង​រូបភាព"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"មិន​អាច​ផ្ទុក​រូបភាព"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"មិន​អាច​ផ្ទុក​រូបភាព​ជា​ផ្ទាំង​រូបភាព"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"បាន​ជ្រើស %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"បាន​ជ្រើស %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"បាន​ជ្រើស %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"ផ្ទាំង​រូបភាព %1$d នៃ %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"​បាន​ជ្រើស <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"លុប"</string>
-    <string name="pick_image" msgid="1272073934062909527">"ជ្រើស​យក​រូបភាព"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"ផ្ទាំង​រូបភាព"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ច្រឹប​ផ្ទាំង​រូបភាព"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"មិន​បាន​ដំឡើង​កម្មវិធី។"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ធាតុ​ក្រាហ្វិក"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 82193d2d79..59f2103d89 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"홈"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 핵심 앱"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"배경화면 설정"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"이미지를 로드할 수 없습니다."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"이미지를 배경화면으로 로드할 수 없습니다."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d개 선택됨"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d개 선택됨"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d개 선택됨"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"배경화면 %1$d/%2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> 선택함"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"삭제"</string>
-    <string name="pick_image" msgid="1272073934062909527">"이미지 선택"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"배경화면"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"배경화면 잘라내기"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"앱이 설치되지 않았습니다."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"위젯"</string>
     <string name="widget_adder" msgid="3201040140710381657">"위젯"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index fac96e42f9..ad2feeab45 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"ໜ້າຫຼັກ"</string>
     <string name="uid_name" msgid="7820867637514617527">"ແອັບພລິເຄຊັນຫຼັກຂອງ Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"ຕັ້ງເປັນພາບພື້ນຫຼັງ"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"ບໍ່ສາມາດໂຫຼດຮູບພາບໄດ້"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"ບໍ່​ສາ​ມາດ​ໂຫຼດ​ຮູບພາບ​ເປັນ​ຮູບພື້ນຫຼັງໄດ້"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
-    <item quantity="one" msgid="142482526010824029">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
-    <item quantity="other" msgid="1418352074806573570">"ເລືອກ %1$d ລາຍການແລ້ວ"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"ຮູບພືື້ນຫຼັງ %1$d ໃນ %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"ເລືອກແລ້ວ <xliff:g id="LABEL">%1$s</xliff:g> ອັນ"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"ລຶບ"</string>
-    <string name="pick_image" msgid="1272073934062909527">"ເລືອກຮູບ"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"ພາບພື້ນຫຼັງ"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ຕັດຮູບພື້ນຫຼັງ"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ແອັບຯບໍ່ໄດ້ຖືກຕິດຕັ້ງ."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"ວິດເຈັດ"</string>
     <string name="widget_adder" msgid="3201040140710381657">"ວິດເຈັດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1d53bf1eff..8b1f396032 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Pagrindinis"</string>
     <string name="uid_name" msgid="7820867637514617527">"Pagrindinės „Android“ programos"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nustatyti ekrano foną"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nepavyko įkelti vaizdo"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nepavyko įkelti vaizdo kaip ekrano fono"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Pasirinkta: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Pasirinkta: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Pasirinkta: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d iš %2$d ekrano fonų"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Pasirinkta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ištrinti"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pasirinkti vaizdą"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ekrano fonai"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Ekrano fono apkirpimas"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Programa neįdiegta."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Valdikliai"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Valdikliai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 856439b7a8..964d84d133 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Sākums"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android pamatlietotnes"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Iestatīt fona tapeti"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nevarēja ielādēt attēlu."</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nevarēja ielādēt attēlu kā fona tapeti."</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Atlasīti: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Atlasīti: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Atlasīti: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%1$d. fona tapete no %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Atlasīts: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Dzēst"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Izvēlēties attēlu"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Fona tapetes"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Apgriezt fona tapeti"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Lietotne nav instalēta."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Logrīki"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Logrīki"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 20af05e0d1..bed237a832 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Нүүр"</string>
     <string name="uid_name" msgid="7820867637514617527">"Андройд үндсэн апп"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ханын зургийг тохируулах"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Зургийг ачааллаж чадсангүй"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Зургийг ханын зураг болгож ачааллаж чадсангүй"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d сонгогдсон"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d сонгогдсон"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d сонгогдсон"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%2$d ханын цаасны %1$d нь"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> сонгогдсон"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Устгах"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Зураг сонгох"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ханын зураг"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Ханын зургийг тайрах"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Апп суугаагүй байна."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Виджет"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Виджет"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dca483d3e8..3558b25107 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Laman Utama"</string>
     <string name="uid_name" msgid="7820867637514617527">"Apl Teras Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Tetapkan kertas dinding"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Tidak dapat memuatkan imej"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Tidak dapat memuatkan imej sebagai kertas dinding"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d dipilih"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d dipilih"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d dipilih"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Kertas dinding %1$d daripada %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Memilih <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Padam"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pilih imej"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Kertas dinding"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Pangkas kertas dinding"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Apl tidak dipasang."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9cb161fe2d..13d87591e1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startside"</string>
     <string name="uid_name" msgid="7820867637514617527">"Kjerneapper for Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Angi bakgrunn"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kunne ikke laste inn bildet"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kunne ikke laste inn bildet som bakgrunn"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d valgt"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d valgt"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d valgt"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Bakgrunn %1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Valgt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Slett"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Velg bilde"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Bakgrunner"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Beskjær bakgrunnen"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen er ikke installert."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Moduler"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Moduler"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e28b3955c5..aa035a09ab 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startpagina"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android-kernapps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Achtergrond instellen"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Kan afbeelding niet laden"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Kan afbeelding niet laden als achtergrond"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d geselecteerd"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d geselecteerd"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d geselecteerd"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Achtergrond %1$d van %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> is geselecteerd"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Verwijderen"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Afbeelding kiezen"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Achtergronden"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Achtergrond bijsnijden"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"App is niet geïnstalleerd."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ec72374d53..9eade81a9a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ekran główny"</string>
     <string name="uid_name" msgid="7820867637514617527">"Główne aplikacje Androida"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ustaw tapetę"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nie udało się załadować obrazu"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nie udało się załadować obrazu jako tapety"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Wybrane: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Wybrane: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Wybrane: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Tapeta %1$d z %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Wybrano <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Usuń"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Wybierz obraz"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Tapety"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Przytnij tapetę"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacja nie jest zainstalowana."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widżety"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widżety"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 510468e2ed..4c9401dc38 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ecrã principal"</string>
     <string name="uid_name" msgid="7820867637514617527">"Aplicações principais do Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Definir imagem fundo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Não foi possível carregar a imagem"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Não foi possível carregar a imagem como imagem de fundo"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selecionado(s)"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selecionado(s)"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selecionado(s)"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Imagem de fundo %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Eliminar"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Escolher imagem"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Imagens de fundo"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Recortar imagem de fundo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"A aplicação não está instalada."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1ac9f5b49a..d82d9ea1d2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Início"</string>
     <string name="uid_name" msgid="7820867637514617527">"Principais aplicativos do Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Definir plano de fundo"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Não foi possível carregar a imagem"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Não foi possível carregar a imagem como plano de fundo"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selecionados"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selecionados"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selecionados"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Plano de fundo %1$d de %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Excluir"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Escolher imagem"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Planos de fundo"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Cortar plano de fundo"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"O aplicativo não está instalado."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgets"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgets"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 2015158d9b..246553467b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -26,27 +26,6 @@
     <!-- no translation found for uid_name (7820867637514617527) -->
     <skip />
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <!-- no translation found for wallpaper_instructions (563973358787555519) -->
-    <skip />
-    <!-- no translation found for image_load_fail (2821429163328561136) -->
-    <skip />
-    <!-- no translation found for wallpaper_load_fail (1261270681127096352) -->
-    <skip />
-    <!-- no translation found for number_of_items_selected:zero (7464587177007785408) -->
-    <!-- no translation found for number_of_items_selected:one (142482526010824029) -->
-    <!-- no translation found for number_of_items_selected:other (1418352074806573570) -->
-    <!-- no translation found for wallpaper_accessibility_name (1655953108132967972) -->
-    <skip />
-    <!-- no translation found for announce_selection (8338254712932127413) -->
-    <skip />
-    <!-- no translation found for wallpaper_delete (8095005658756613921) -->
-    <skip />
-    <!-- no translation found for pick_image (1272073934062909527) -->
-    <skip />
-    <!-- no translation found for pick_wallpaper (8179698221502010609) -->
-    <skip />
-    <!-- no translation found for crop_wallpaper (8334345984491368009) -->
-    <skip />
     <!-- no translation found for activity_not_found (8071924732094499514) -->
     <skip />
     <!-- no translation found for widgets_tab_label (2921133187116603919) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 85023c3d19..016dd918c2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ecran de pornire"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Setați imaginea de fundal"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Nu s-a putut încărca imaginea"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Nu s-a putut încărca imaginea ca fundal"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d selectate"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d selectat"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d selectate"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Imaginea de fundal %1$d din %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"S-a selectat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ștergeți"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Alegeți imaginea"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Imagini de fundal"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Decupați imaginea de fundal"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplicația nu este instalată."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgeturi"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgeturi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c8a2287eb8..8d0984da29 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Главный экран"</string>
     <string name="uid_name" msgid="7820867637514617527">"Основные приложения Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Установить как обои"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Не удалось загрузить изображение"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Не удалось загрузить изображение"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Выбрано: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Выбрано: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Выбрано: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Обои %1$d из %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Удалить"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Выбрать изображение"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Обои"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Обрезать обои"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Приложение удалено"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Виджеты"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Виджеты"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 77fd07df4e..3a4b03348a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Plocha"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nastaviť tapetu"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Obrázok nie je možné načítať"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Obrázok nie je možné načítať ako tapetu"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Počet vybratých položiek: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Počet vybratých položiek: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Počet vybratých položiek: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Tapeta %1$d z %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Vybratá položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Odstrániť"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Vybrať obrázok"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Tapety"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Orezanie tapety"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikácia nie je nainštalovaná."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Miniaplikácie"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Miniaplikácie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 28392fe4cb..68086dbc1c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Začetni zaslon"</string>
     <string name="uid_name" msgid="7820867637514617527">"Osnovne aplikacije sistema Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Nastavi ozadje"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Slike ni bilo mogoče naložiti"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Slike ni bilo mogoče naložiti kot ozadja"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Št. izbranih: %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Št. izbranih: %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Št. izbranih: %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Ozadje %1$d od %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Izbrano: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Izbriši"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Izberi sliko"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Ozadja"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Obrezovanje ozadja"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Aplikacija ni nameščena."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Pripomočki"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Pripomočki"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 82c825b374..6ab175069d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Почетна"</string>
     <string name="uid_name" msgid="7820867637514617527">"Основне Android апликације"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Подеси позадину"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Није могуће учитати слику"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Није могуће учитати слику као позадину"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Изабранo je %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Изабрана je %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Изабранo je %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Позадина %1$d од %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Изабрано је <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Избриши"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Изабери слику"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Позадине"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Опсецање позадине"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Апликација није инсталирана."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Виџети"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Виџети"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9d9c544007..c6dcb18ff3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Startskärm"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Ange bakgrund"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Det gick inte att läsa in bilden"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Det gick inte att läsa in bilden som bakgrund"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d har valts"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d har valts"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d har valts"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Bakgrund %1$d av %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> har valts"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Ta bort"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Välj bild"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Bakgrunder"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Beskär bakgrund"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Appen är inte installerad."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widgetar"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widgetar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d83fc16871..e0ae27924d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Mwanzo"</string>
     <string name="uid_name" msgid="7820867637514617527">"Programu Msingi za Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Weka mandhari"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Haikuweza kupakia picha"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Haikuweza kupakia picha kama mandhari"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d zimechaguliwa"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d zimechaguliwa"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d zimechaguliwa"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Mandhari %1$d ya %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> iliyochaguliwa"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Futa"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Chukua picha"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Mandhari"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Punguza mandhari"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Programu haijasakinishwa."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Wijeti"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Wijeti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9d78b3bdac..0a9ea784dc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"หน้าแรก"</string>
     <string name="uid_name" msgid="7820867637514617527">"แอปหลักของแอนดรอยด์"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"ตั้งค่าวอลเปเปอร์"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"ไม่สามารถโหลดรูปภาพ"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"ไม่สามารถโหลดรูปภาพเป็นวอลเปเปอร์"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"เลือกไว้ %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"เลือกไว้ %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"เลือกไว้ %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"วอลเปเปอร์ %1$d จาก %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"เลือก <xliff:g id="LABEL">%1$s</xliff:g> แล้ว"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"ลบ"</string>
-    <string name="pick_image" msgid="1272073934062909527">"เลือกภาพ"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"วอลเปเปอร์"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"ครอบตัดวอลล์เปเปอร์"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"ไม่ได้ติดตั้งแอป"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"วิดเจ็ต"</string>
     <string name="widget_adder" msgid="3201040140710381657">"วิดเจ็ต"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index bdc23637d9..41de1c02c7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Home"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Core Apps"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Itakda ang wallpaper"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Hindi ma-load ang larawan"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Hindi ma-load ang larawan bilang wallpaper"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d ang napili"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d ang napili"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d ang napili"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Wallpaper %1$d ng %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Napili ang <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Tanggalin"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Pumili ng larawan"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Mga Wallpaper"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"I-crop ang wallpaper"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Hindi naka-install ang app."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Mga Widget"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Mga Widget"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e2fbf21253..e77d76b8e8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ana ekran"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android Çekirdek Uygulamaları"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Duvar kağıdını ayarla"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Resim yüklenemedi"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Resim duvar kağıdı olarak yüklenemedi"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d tane seçildi"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d tane seçildi"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d tane seçildi"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Duvar kağıdı %1$d / %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> seçildi"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Sil"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Resim seç"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Duvar Kağıtları"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Duvar kağıdını kırp"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Uygulama yüklü değil."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Widget\'lar"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Widget\'lar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6b397a051e..5a32a479e6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Головний екран"</string>
     <string name="uid_name" msgid="7820867637514617527">"Базові програми Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Установити фон"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Не вдалося завантажити зображення"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Не вдалося завантажити зображення як фоновий малюнок"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Вибрано %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Вибрано %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Вибрано %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Фоновий малюнок %1$d з %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"Вибрано <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Видалити"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Вибрати зображення"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Фонові малюнки"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Обрізати фоновий малюнок"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Програму не встановлено."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Віджети"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Віджети"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index abe4dec23c..4c15bc80e4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Màn hình chính"</string>
     <string name="uid_name" msgid="7820867637514617527">"Ứng dụng lõi Android"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Đặt hình nền"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Không thể tải hình ảnh"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Không thể tải hình ảnh làm hình nền"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"Đã chọn %1$d"</item>
-    <item quantity="one" msgid="142482526010824029">"Đã chọn %1$d"</item>
-    <item quantity="other" msgid="1418352074806573570">"Đã chọn %1$d"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Hình nền %1$d / %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> được chọn"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Xóa"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Chọn hình ảnh"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Hình nền"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Cắt hình nền"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Ứng dụng chưa được cài đặt."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Tiện ích con"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Tiện ích con"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d8d260d4ea..8a6d9c64c0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"主屏"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 核心应用"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"设置壁纸"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"无法加载图片"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"无法加载要设为壁纸的图片"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"已选择%1$d项"</item>
-    <item quantity="one" msgid="142482526010824029">"已选择%1$d项"</item>
-    <item quantity="other" msgid="1418352074806573570">"已选择%1$d项"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"第%1$d张壁纸，共%2$d张"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"已选择<xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"删除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"选择图片"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"壁纸"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"剪裁壁纸"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"未安装该应用。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"小部件"</string>
     <string name="widget_adder" msgid="3201040140710381657">"小部件"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 56ea177256..9d1e305799 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"主畫面"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 核心應用程式"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"設定桌布"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"無法載入圖片"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"無法載入圖片設為桌布"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"已選取 %1$d 個"</item>
-    <item quantity="one" msgid="142482526010824029">"已選取 %1$d 個"</item>
-    <item quantity="other" msgid="1418352074806573570">"已選取 %1$d 個"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"第 %1$d 張桌布，共 %2$d 張"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"已選取「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"刪除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"選擇圖片"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"桌布"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"裁剪桌布"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"尚未安裝應用程式。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"小工具"</string>
     <string name="widget_adder" msgid="3201040140710381657">"小工具"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0520c9d649..6d82cf80e0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"主螢幕"</string>
     <string name="uid_name" msgid="7820867637514617527">"Android 核心應用程式"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"設定桌布"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"無法載入圖片"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"無法載入您要設為桌布的圖片"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"已選取 %1$d 個項目"</item>
-    <item quantity="one" msgid="142482526010824029">"已選取 %1$d 個項目"</item>
-    <item quantity="other" msgid="1418352074806573570">"已選取 %1$d 個項目"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"第 %1$d 張桌布，共 %2$d 張"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"刪除"</string>
-    <string name="pick_image" msgid="1272073934062909527">"選擇圖片"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"桌布"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"裁剪桌布"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"應用程式未安裝。"</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"小工具"</string>
     <string name="widget_adder" msgid="3201040140710381657">"小工具"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dafb95d177..2cde50a328 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -23,20 +23,6 @@
     <string name="home" msgid="7658288663002113681">"Ikhaya"</string>
     <string name="uid_name" msgid="7820867637514617527">"Izinhlelo zokusebenza ze-Android Core"</string>
     <string name="folder_name" msgid="7371454440695724752"></string>
-    <string name="wallpaper_instructions" msgid="563973358787555519">"Setha isithombe sangemuva"</string>
-    <string name="image_load_fail" msgid="2821429163328561136">"Ayikwazanga ukulayisha isithombe"</string>
-    <string name="wallpaper_load_fail" msgid="1261270681127096352">"Ayikwazanga ukulayisha isithombe njengesithombe sangemuva"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="7464587177007785408">"%1$d khethiwe"</item>
-    <item quantity="one" msgid="142482526010824029">"%1$d khethiwe"</item>
-    <item quantity="other" msgid="1418352074806573570">"%1$d khethiwe"</item>
-  </plurals>
-    <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"Isithombe sangemuva se-%1$d of %2$d"</string>
-    <string name="announce_selection" msgid="8338254712932127413">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhethiwe"</string>
-    <string name="wallpaper_delete" msgid="8095005658756613921">"Susa"</string>
-    <string name="pick_image" msgid="1272073934062909527">"Thatha isithombe"</string>
-    <string name="pick_wallpaper" msgid="8179698221502010609">"Izithombe zangemuva"</string>
-    <string name="crop_wallpaper" msgid="8334345984491368009">"Nqampuna isithombe sangemuva"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"Uhlelo lokusebenza alufakiwe."</string>
     <string name="widgets_tab_label" msgid="2921133187116603919">"Amawijethi"</string>
     <string name="widget_adder" msgid="3201040140710381657">"Amawijethi"</string>

From dff0bfeb901e767ca9b57f9b8051c7fd077626e9 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Tue, 17 Dec 2013 15:20:50 -0800
Subject: [PATCH 081/147] Do not allow duplicate shortcuts when ALL_APPS is
 disabled.

When DISABLE_ALL_APPS is true, we want to have only one shortcut for each activityexposed via the Application's manifest.
We ignore INSTALL_SHORTCUT broadcasts which have launch intents with ACTION_MAIN and CATEGORY_LAUNCHER.
Applications can still create shortcuts pointing to an already exposed component if they provide data or extras in the intent.

Change-Id: I0b05283ea6c522d197e0262c2997f7298e08740b
---
 .../android/launcher3/DeleteDropTarget.java   | 15 ++-------
 .../launcher3/InstallShortcutReceiver.java    | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index a8ac0746c8..c76425a5ed 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -266,19 +266,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
     private boolean isUninstallFromWorkspace(DragObject d) {
         if (AppsCustomizePagedView.DISABLE_ALL_APPS && isWorkspaceOrFolderApplication(d)) {
             ShortcutInfo shortcut = (ShortcutInfo) d.dragInfo;
-            if (shortcut.intent != null && shortcut.intent.getComponent() != null) {
-                Set<String> categories = shortcut.intent.getCategories();
-                boolean includesLauncherCategory = false;
-                if (categories != null) {
-                    for (String category : categories) {
-                        if (category.equals(Intent.CATEGORY_LAUNCHER)) {
-                            includesLauncherCategory = true;
-                            break;
-                        }
-                    }
-                }
-                return includesLauncherCategory;
-            }
+            // Only allow manifest shortcuts to initiate an un-install.
+            return !InstallShortcutReceiver.isValidShortcutLaunchIntent(shortcut.intent);
         }
         return false;
     }
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 140106af9c..1ff94720ba 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -24,6 +24,7 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
 import android.widget.Toast;
@@ -223,6 +224,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
         if (intent == null) {
             return;
         }
+
         // This name is only used for comparisons and notifications, so fall back to activity name
         // if not supplied
         String name = ensureValidName(context, intent,
@@ -269,6 +271,12 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
                 //final Intent data = pendingInfo.data;
                 final Intent intent = pendingInfo.launchIntent;
                 final String name = pendingInfo.name;
+
+                if (AppsCustomizePagedView.DISABLE_ALL_APPS && !isValidShortcutLaunchIntent(intent)) {
+                    if (DBG) Log.d(TAG, "Ignoring shortcut with launchIntent:" + intent);
+                    continue;
+                }
+
                 final boolean exists = LauncherModel.shortcutExists(context, name, intent);
                 //final boolean allowDuplicate = data.getBooleanExtra(Launcher.EXTRA_SHORTCUT_DUPLICATE, true);
 
@@ -301,6 +309,30 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
         }
     }
 
+    /**
+     * Returns true if the intent is a valid launch intent for a shortcut.
+     * This is used to identify shortcuts which are different from the ones exposed by the
+     * applications' manifest file.
+     *
+     * When DISABLE_ALL_APPS is true, shortcuts exposed via the app's manifest should never be
+     * duplicated or removed(unless the app is un-installed).
+     *
+     * @param launchIntent The intent that will be launched when the shortcut is clicked.
+     */
+    static boolean isValidShortcutLaunchIntent(Intent launchIntent) {
+        if (launchIntent != null
+                && Intent.ACTION_MAIN.equals(launchIntent.getAction())
+                && launchIntent.getComponent() != null
+                && launchIntent.getCategories() != null
+                && launchIntent.getCategories().size() == 1
+                && launchIntent.hasCategory(Intent.CATEGORY_LAUNCHER)
+                && launchIntent.getExtras() == null
+                && TextUtils.isEmpty(launchIntent.getDataString())) {
+            return false;
+        }
+        return true;
+    }
+
     private static ShortcutInfo getShortcutInfo(Context context, Intent data,
                                                 Intent launchIntent) {
         if (launchIntent.getAction() == null) {

From 2fd318246fbf8639cdaf901798f267fb027fff12 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 18 Dec 2013 14:11:40 -0500
Subject: [PATCH 082/147] support multiple files and fix logcat smippets for
 launcher_protoutil

plus some code cleanup

Change-Id: I09b4a6aedbb1251a65d379464d830da694d38a38
---
 util/com/android/launcher3/DecoderRing.java | 307 +++++++++++---------
 1 file changed, 171 insertions(+), 136 deletions(-)

diff --git a/util/com/android/launcher3/DecoderRing.java b/util/com/android/launcher3/DecoderRing.java
index 6ad6bc5a55..7098e189dd 100644
--- a/util/com/android/launcher3/DecoderRing.java
+++ b/util/com/android/launcher3/DecoderRing.java
@@ -15,7 +15,6 @@
  */
 package com.android.launcher3;
 
-import com.android.launcher3.backup.BackupProtos;
 import com.android.launcher3.backup.BackupProtos.CheckedMessage;
 import com.android.launcher3.backup.BackupProtos.Favorite;
 import com.android.launcher3.backup.BackupProtos.Key;
@@ -35,6 +34,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.System;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.zip.CRC32;
 
 import javax.xml.bind.DatatypeConverter;
@@ -46,7 +47,7 @@ import javax.xml.bind.DatatypeConverter;
  * <P>When using com.android.internal.backup.LocalTransport, the file names are base64-encoded Key
  * protocol buffers with a prefix, that have been base64-encoded again by the transport:
  * <pre>
- *     echo TDpDQUlnL0pxVTVnOD0= | base64 -D | dd bs=1 skip=2 | base64 -D | launcher_protoutil -k
+ *     echo "TDpDQUlnL0pxVTVnOD0=" | launcher_protoutil -k
  * </pre>
  *
  * <P>This tool understands these file names and will use the embedded Key to detect the type and
@@ -56,13 +57,19 @@ import javax.xml.bind.DatatypeConverter;
  * </pre>
  *
  * <P>With payload debugging enabled, base64-encoded protocol buffers will be written to the logs.
- * Copy the encoded log snippet into a file, and specify the type explicitly:
+ * Copy the encoded snippet from the log, and specify the type explicitly, with the Logs flags:
  * <pre>
- *    base64 -D icon.log > icon.bin
- *    launcher_protoutil -i icon.bin
+ *    echo "CAEYLiCJ9JKsDw==" | launcher_protoutil -L -k
+ * </pre>
+ * For backup payloads it is more convenient to copy the log snippet to a file:
+ * <pre>
+ *    launcher_protoutil -L -f favorite.log
  * </pre>
  */
 class DecoderRing {
+
+    public static final String STANDARD_IN = "**stdin**";
+
     private static Class[] TYPES = {
             Key.class,
             Favorite.class,
@@ -74,24 +81,25 @@ class DecoderRing {
 
     public static void main(String[ ] args)
             throws Exception {
-        File source = null;
-        Class type = null;
+        Class defaultType = null;
         boolean extractImages = false;
+        boolean fromLogs = false;
         int skip = 0;
+        List<File> files = new LinkedList<File>();
 
         for (int i = 0; i < args.length; i++) {
             if ("-k".equals(args[i])) {
-                type = Key.class;
+                defaultType = Key.class;
             } else if ("-f".equals(args[i])) {
-                type = Favorite.class;
+                defaultType = Favorite.class;
             } else if ("-j".equals(args[i])) {
-                type = Journal.class;
+                defaultType = Journal.class;
             } else if ("-i".equals(args[i])) {
-                type = Resource.class;
+                defaultType = Resource.class;
             } else if ("-s".equals(args[i])) {
-                type = Screen.class;
+                defaultType = Screen.class;
             } else if ("-w".equals(args[i])) {
-                type = Widget.class;
+                defaultType = Widget.class;
             } else if ("-S".equals(args[i])) {
                 if ((i + 1) < args.length) {
                     skip = Integer.valueOf(args[++i]);
@@ -100,154 +108,180 @@ class DecoderRing {
                 }
             } else if ("-x".equals(args[i])) {
                 extractImages = true;
+            } else if ("-L".equals(args[i])) {
+                fromLogs = true;
             } else if (args[i] != null && !args[i].startsWith("-")) {
-                source = new File(args[i]);
+                files.add(new File(args[i]));
             } else {
                 System.err.println("Unsupported flag: " + args[i]);
                 usage(args);
             }
         }
 
-        if (type == null) {
-            if (source == null) {
-                usage(args);
-            } else {
-                Key key = new Key();
-                try {
-                    byte[] rawKey = DatatypeConverter.parseBase64Binary(source.getName());
-                    if (rawKey[0] != 'L' || rawKey[1] != ':') {
-                        System.err.println("you must specify the payload type. " +
-                                source.getName() + " is not a launcher backup key.");
-                        System.exit(1);
-                    }
-                    String encodedPayload = new String(rawKey, 2, rawKey.length - 2);
-                    byte[] keyProtoData = DatatypeConverter.parseBase64Binary(encodedPayload);
-                    key = Key.parseFrom(keyProtoData);
-                } catch (InvalidProtocolBufferNanoException protoException) {
-                    System.err.println("failed to extract key from filename: " + protoException);
-                    System.exit(1);
-                } catch (IllegalArgumentException base64Exception) {
-                    System.err.println("failed to extract key from filename: " + base64Exception);
-                    System.exit(1);
-                }
-                // keys are self-checked
-                if (key.checksum != checkKey(key)) {
-                    System.err.println("key ckecksum failed");
-                    System.exit(1);
-                }
-                type = TYPES[key.type];
-                System.err.println("This is a " + type.getSimpleName() + " backup");
-            }
+        if (defaultType == null && files.isEmpty()) {
+            // can't infer file type without the key
+            usage(args);
         }
 
-        // read in the bytes
-        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-        BufferedInputStream input = null;
-        if (source == null) {
-            input = new BufferedInputStream(System.in);
-        } else {
+        if (files.size() > 1) {
+            System.err.println("Explicit type ignored for multiple files.");
+            defaultType = null;
+        }
+
+        if (files.isEmpty()) {
+            files.add(new File(STANDARD_IN));
+        }
+
+        for (File source : files) {
+            Class type = null;
+            if (defaultType == null) {
+                Key key = decodeKey(source.getName().getBytes(), fromLogs);
+                type = TYPES[key.type];
+                System.err.println("This is a " + type.getSimpleName() + " backup");
+            } else {
+                type = defaultType;
+            }
+
+            // read in the bytes
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            BufferedInputStream input = null;
+            if (source.getName() == STANDARD_IN) {
+                input = new BufferedInputStream(System.in);
+            } else {
+                try {
+                    input = new BufferedInputStream(new FileInputStream(source));
+                } catch (FileNotFoundException e) {
+                    System.err.println("failed to open file: " + source + ", " + e);
+                    System.exit(1);
+                }
+            }
+            byte[] buffer = new byte[1024];
             try {
-                input = new BufferedInputStream(new FileInputStream(source));
-            } catch (FileNotFoundException e) {
-                System.err.println("failed to open file: " + source + ", " + e);
+                while (input.available() > 0) {
+                    int n = input.read(buffer);
+                    int offset = 0;
+                    if (skip > 0) {
+                        offset = Math.min(skip, n);
+                        n -= offset;
+                        skip -= offset;
+                    }
+                    if (n > 0) {
+                        byteStream.write(buffer, offset, n);
+                    }
+                }
+            } catch (IOException e) {
+                System.err.println("failed to read input: " + e);
                 System.exit(1);
             }
-        }
-        byte[] buffer = new byte[1024];
-        try {
-            while (input.available() > 0) {
-                int n = input.read(buffer);
-                int offset = 0;
-                if (skip > 0) {
-                    offset = Math.min(skip, n);
-                    n -= offset;
-                    skip -= offset;
+
+            MessageNano proto = null;
+            byte[] payload = byteStream.toByteArray();
+            if (type == Key.class) {
+                proto = decodeKey(payload, fromLogs);
+            } else {
+                proto = decodeBackupData(payload, type, fromLogs);
+            }
+
+            // Generic string output
+            System.out.println(proto.toString());
+
+            if (extractImages) {
+                String prefix = "stdin";
+                if (source != null) {
+                    prefix = source.getName();
                 }
-                if (n > 0) {
-                    byteStream.write(buffer, offset, n);
+                // save off the icon bits in a file for inspection
+                if (proto instanceof Resource) {
+                    Resource icon = (Resource) proto;
+                    writeImageData(icon.data, prefix + ".png");
+                }
+
+                // save off the icon bits in a file for inspection
+                if (proto instanceof Favorite) {
+                    Favorite favorite = (Favorite) proto;
+                    if (favorite.iconType == ICON_TYPE_BITMAP) {
+                        writeImageData(favorite.icon, prefix + ".png");
+                    }
+                }
+
+                // save off the widget icon and preview bits in files for inspection
+                if (proto instanceof Widget) {
+                    Widget widget = (Widget) proto;
+                    if (widget.icon != null) {
+                        writeImageData(widget.icon.data, prefix + "_icon.png");
+                    }
+                    if (widget.preview != null) {
+                        writeImageData(widget.preview.data, prefix + "_preview.png");
+                    }
                 }
             }
-        } catch (IOException e) {
-            System.err.println("failed to read input: " + e);
+        }
+        System.exit(0);
+    }
+
+    // In logcat, backup data is base64 encoded, but in localtransport files it is raw
+    private static MessageNano decodeBackupData(byte[] payload, Class type, boolean fromLogs)
+            throws InstantiationException, IllegalAccessException {
+        MessageNano proto;// other types are wrapped in a checksum message
+        CheckedMessage wrapper = new CheckedMessage();
+        try {
+            if (fromLogs) {
+                payload = DatatypeConverter.parseBase64Binary(new String(payload));
+            }
+            MessageNano.mergeFrom(wrapper, payload);
+        } catch (InvalidProtocolBufferNanoException e) {
+            System.err.println("failed to parse wrapper: " + e);
             System.exit(1);
         }
 
-        MessageNano proto = null;
-        if (type == Key.class) {
-            Key key = new Key();
-            try {
-                key = Key.parseFrom(byteStream.toByteArray());
-            } catch (InvalidProtocolBufferNanoException e) {
-                System.err.println("failed to parse proto: " + e);
-                System.exit(1);
-            }
-            // keys are self-checked
-            if (key.checksum != checkKey(key)) {
-                System.err.println("key checksum failed");
-                System.exit(1);
-            }
-            proto = key;
-        } else {
-            // other types are wrapped in a checksum message
-            CheckedMessage wrapper = new CheckedMessage();
-            try {
-                MessageNano.mergeFrom(wrapper, byteStream.toByteArray());
-            } catch (InvalidProtocolBufferNanoException e) {
-                System.err.println("failed to parse wrapper: " + e);
-                System.exit(1);
-            }
-            CRC32 checksum = new CRC32();
-            checksum.update(wrapper.payload);
-            if (wrapper.checksum != checksum.getValue()) {
-                System.err.println("wrapper checksum failed");
-                System.exit(1);
-            }
-            // decode the actual message
-            proto = (MessageNano) type.newInstance();
-            try {
-                MessageNano.mergeFrom(proto, wrapper.payload);
-            } catch (InvalidProtocolBufferNanoException e) {
-                System.err.println("failed to parse proto: " + e);
-                System.exit(1);
-            }
+        CRC32 checksum = new CRC32();
+        checksum.update(wrapper.payload);
+        if (wrapper.checksum != checksum.getValue()) {
+            System.err.println("wrapper checksum failed");
+            System.exit(1);
         }
 
-        // Generic string output
-        System.out.println(proto.toString());
+        // decode the actual message
+        proto = (MessageNano) type.newInstance();
+        try {
+            MessageNano.mergeFrom(proto, wrapper.payload);
+        } catch (InvalidProtocolBufferNanoException e) {
+            System.err.println("failed to parse proto: " + e);
+            System.exit(1);
+        }
+        return proto;
+    }
 
-        if (extractImages) {
-            String prefix = "stdin";
-            if (source != null) {
-                prefix = source.getName();
-            }
-            // save off the icon bits in a file for inspection
-            if (proto instanceof Resource) {
-                Resource icon = (Resource) proto;
-                writeImageData(icon.data, prefix + ".png");
-            }
-
-            // save off the icon bits in a file for inspection
-            if (proto instanceof Favorite) {
-                Favorite favorite = (Favorite) proto;
-                if (favorite.iconType == ICON_TYPE_BITMAP) {
-                    writeImageData(favorite.icon, prefix + ".png");
-                }
-            }
-
-            // save off the widget icon and preview bits in files for inspection
-            if (proto instanceof Widget) {
-                Widget widget = (Widget) proto;
-                if (widget.icon != null) {
-                    writeImageData(widget.icon.data, prefix + "_icon.png");
-                }
-                if (widget.preview != null) {
-                    writeImageData(widget.preview.data, prefix + "_preview.png");
+    // In logcat, keys are base64 encoded with no prefix.
+    // The localtransport adds a prefix and the base64 encodes the whole thing again.
+    private static Key decodeKey(byte[] payload, boolean fromLogs) {
+        Key key = new Key();
+        try {
+            String encodedKey = new String(payload);
+            if (!fromLogs) {
+                byte[] rawKey = DatatypeConverter.parseBase64Binary(encodedKey);
+                if (rawKey[0] != 'L' || rawKey[1] != ':') {
+                    System.err.println(encodedKey + " is not a launcher backup key.");
+                    System.exit(1);
                 }
+                encodedKey = new String(rawKey, 2, rawKey.length - 2);
             }
+            byte[] keyProtoData = DatatypeConverter.parseBase64Binary(encodedKey);
+            key = Key.parseFrom(keyProtoData);
+        } catch (InvalidProtocolBufferNanoException protoException) {
+            System.err.println("failed to extract key from filename: " + protoException);
+            System.exit(1);
+        } catch (IllegalArgumentException base64Exception) {
+            System.err.println("failed to extract key from filename: " + base64Exception);
+            System.exit(1);
         }
 
-        // success
-        System.exit(0);
+        // keys are self-checked
+        if (key.checksum != checkKey(key)) {
+            System.err.println("key ckecksum failed");
+            System.exit(1);
+        }
+        return key;
     }
 
     private static void writeImageData(byte[] data, String path) {
@@ -289,6 +323,7 @@ class DecoderRing {
         System.err.println("\t-w\tdecode a widget");
         System.err.println("\t-S b\tskip b bytes");
         System.err.println("\t-x\textract image data to files");
+        System.err.println("\t-l\texpect data from logcat, instead of the local transport");
         System.err.println("\tfilename\tread from filename, not stdin");
         System.exit(1);
     }

From deade303d1d141f395b1b5ae5314b210faf5baa1 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Wed, 18 Dec 2013 23:09:31 -0800
Subject: [PATCH 083/147] Import translations. DO NOT MERGE

Change-Id: I3e93fc7096badc195c25f3456c13217ab2786b6f
Auto-generated-cl: translation import
---
 WallpaperPicker/res/values-am/strings.xml     |  2 +-
 WallpaperPicker/res/values-cs/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-es-rUS/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fa/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fr-rCA/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hi/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-in/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-it/strings.xml     |  4 +--
 WallpaperPicker/res/values-ja/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ka-rGE/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-lo-rLA/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ms-rMY/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-nb/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ru/strings.xml     |  6 ++--
 WallpaperPicker/res/values-sk/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sv/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sw/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-tr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rCN/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rHK/strings.xml |  2 +-
 WallpaperPicker/res/values-zu/strings.xml     | 36 +++++++++++++++++++
 res/values-de/strings.xml                     |  2 +-
 24 files changed, 692 insertions(+), 8 deletions(-)
 create mode 100644 WallpaperPicker/res/values-cs/strings.xml
 create mode 100644 WallpaperPicker/res/values-es-rUS/strings.xml
 create mode 100644 WallpaperPicker/res/values-fa/strings.xml
 create mode 100644 WallpaperPicker/res/values-fr-rCA/strings.xml
 create mode 100644 WallpaperPicker/res/values-fr/strings.xml
 create mode 100644 WallpaperPicker/res/values-hi/strings.xml
 create mode 100644 WallpaperPicker/res/values-in/strings.xml
 create mode 100644 WallpaperPicker/res/values-ja/strings.xml
 create mode 100644 WallpaperPicker/res/values-ka-rGE/strings.xml
 create mode 100644 WallpaperPicker/res/values-lo-rLA/strings.xml
 create mode 100644 WallpaperPicker/res/values-ms-rMY/strings.xml
 create mode 100644 WallpaperPicker/res/values-nb/strings.xml
 create mode 100644 WallpaperPicker/res/values-sk/strings.xml
 create mode 100644 WallpaperPicker/res/values-sl/strings.xml
 create mode 100644 WallpaperPicker/res/values-sv/strings.xml
 create mode 100644 WallpaperPicker/res/values-sw/strings.xml
 create mode 100644 WallpaperPicker/res/values-tr/strings.xml
 create mode 100644 WallpaperPicker/res/values-zh-rCN/strings.xml
 create mode 100644 WallpaperPicker/res/values-zu/strings.xml

diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml
index e4bcadbed8..3941616341 100644
--- a/WallpaperPicker/res/values-am/strings.xml
+++ b/WallpaperPicker/res/values-am/strings.xml
@@ -32,5 +32,5 @@
     <string name="wallpaper_delete" msgid="1459353972739215344">"ሰርዝ"</string>
     <string name="pick_image" msgid="6704438906027442697">"ምስል ይምረጡ"</string>
     <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>
-    <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይቁረጡ"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይከርክሙ"</string>
 </resources>
diff --git a/WallpaperPicker/res/values-cs/strings.xml b/WallpaperPicker/res/values-cs/strings.xml
new file mode 100644
index 0000000000..a07b9eda2a
--- /dev/null
+++ b/WallpaperPicker/res/values-cs/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nastavit jako tapetu"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Obrázek nelze načíst."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Obrázek nelze načíst jako tapetu."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Vybráno: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Vybráno: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Vybráno: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Vybrána položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Smazat"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vybrat obrázek"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Oříznutí tapety"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-es-rUS/strings.xml b/WallpaperPicker/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000000..768385b9ee
--- /dev/null
+++ b/WallpaperPicker/res/values-es-rUS/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Establecer como fondo de pantalla"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"No se pudo cargar la imagen."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"No se pudo cargar la imagen como fondo de pantalla."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d seleccionado"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d seleccionado"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d seleccionados"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Elegir imagen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fa/strings.xml b/WallpaperPicker/res/values-fa/strings.xml
new file mode 100644
index 0000000000..eb330b515c
--- /dev/null
+++ b/WallpaperPicker/res/values-fa/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"تنظیم کاغذدیواری"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"تصویر بارگیری نشد"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"تصویر به عنوان کاغذدیواری بارگیری نشد"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"‏%1$d انتخاب شد"</item>
+    <item quantity="one" msgid="8409622005831789373">"‏%1$d انتخاب شد"</item>
+    <item quantity="other" msgid="479468347731745357">"‏%1$d انتخاب شد"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏کاغذدیواری %1$d از %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> انتخاب شده است"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف"</string>
+    <string name="pick_image" msgid="6704438906027442697">"انتخاب تصویر"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"کاغذدیواری‌ها"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"برش کاغذدیواری"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fr-rCA/strings.xml b/WallpaperPicker/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000000..e95670678a
--- /dev/null
+++ b/WallpaperPicker/res/values-fr-rCA/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Définir le fond d\'écran"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Impossible de charger l\'image"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossible de charger l\'image comme fond d\'écran"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d sélectionné"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d sélectionné"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d sélectionné(s)"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fond d\'écran %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Sélection : <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Choisir une image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml
new file mode 100644
index 0000000000..ea07db1e54
--- /dev/null
+++ b/WallpaperPicker/res/values-fr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Définir comme fond d\'écran"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Impossible de charger l\'image."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossible de charger l\'image comme fond d\'écran."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d élément sélectionné"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d élément sélectionné"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d éléments sélectionnés"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fond d\'écran %1$d sur %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> sélectionné"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Sélectionner une image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hi/strings.xml b/WallpaperPicker/res/values-hi/strings.xml
new file mode 100644
index 0000000000..fcb252eb55
--- /dev/null
+++ b/WallpaperPicker/res/values-hi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"वॉलपेपर सेट करें"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"चित्र लोड नहीं किया जा सका"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"चित्र को वॉलपेपर के रूप में लोड नहीं किया जा सका"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d चयनित"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d चयनित"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d चयनित"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"वॉलपेपर %2$d में से %1$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"चयनित <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"हटाएं"</string>
+    <string name="pick_image" msgid="6704438906027442697">"चित्र चुनें"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"वॉलपेपर"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"वॉलपेपर काटें"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-in/strings.xml b/WallpaperPicker/res/values-in/strings.xml
new file mode 100644
index 0000000000..f216cf3436
--- /dev/null
+++ b/WallpaperPicker/res/values-in/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Setel wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Tidak dapat memuat gambar"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Tidak dapat memuat gambar sebagai wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d dipilih"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d dipilih"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d dipilih"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d dari %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> terpilih"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Hapus"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pilih gambar"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpaper"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Pangkas wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml
index fcd49bd291..c29946f85a 100644
--- a/WallpaperPicker/res/values-it/strings.xml
+++ b/WallpaperPicker/res/values-it/strings.xml
@@ -23,9 +23,9 @@
     <string name="image_load_fail" msgid="7538534580694411837">"Impossibile caricare l\'immagine"</string>
     <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossibile caricare l\'immagine come sfondo"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9015111147509924344">"%1$d selezionato"</item>
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selezionati"</item>
     <item quantity="one" msgid="8409622005831789373">"%1$d selezionato"</item>
-    <item quantity="other" msgid="479468347731745357">"%1$d selezionato"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selezionati"</item>
   </plurals>
     <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Sfondo %1$d di %2$d"</string>
     <string name="announce_selection" msgid="123723511662250539">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
diff --git a/WallpaperPicker/res/values-ja/strings.xml b/WallpaperPicker/res/values-ja/strings.xml
new file mode 100644
index 0000000000..80b0944531
--- /dev/null
+++ b/WallpaperPicker/res/values-ja/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"壁紙を設定"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"画像を読み込めませんでした"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"画像を壁紙として読み込めませんでした"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d個選択済み"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d個選択済み"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d個選択済み"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"壁紙: %1$d/%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"選択: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"削除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"画像を選択"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"壁紙"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"壁紙のトリミング"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ka-rGE/strings.xml b/WallpaperPicker/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000000..2f59712d8b
--- /dev/null
+++ b/WallpaperPicker/res/values-ka-rGE/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"ფონის დაყენება"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"სურათი ვერ ჩაიტვირთა."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"სურათი ფონად ვერ ჩაიტვირთა."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"არჩეულია %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"არჩეულია %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"არჩეულია %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ფონი %1$d %2$d-დან"</string>
+    <string name="announce_selection" msgid="123723511662250539">"არჩეული <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"წაშლა"</string>
+    <string name="pick_image" msgid="6704438906027442697">"სურათის ამორჩევა"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"ფონები"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ფონის ჩამოჭრა"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-lo-rLA/strings.xml b/WallpaperPicker/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000000..e468591113
--- /dev/null
+++ b/WallpaperPicker/res/values-lo-rLA/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"ຕັ້ງເປັນພາບພື້ນຫຼັງ"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"ບໍ່ສາມາດໂຫຼດຮູບໄດ້"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ບໍ່ສາມາດໂຫຼດຮູບເປັນພາບພື້ນຫຼັງໄດ້"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"ເລືອກ %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"ເລືອກ %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"ເລືອກ %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ພາບພື້ນຫຼັງ %1$d ໃນ %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"ເລືອກ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"ລຶບ"</string>
+    <string name="pick_image" msgid="6704438906027442697">"ເລືອກ​ຮູບ​ພາບ"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"ພາບພື້ນຫຼັງ"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ຕັດພາບພື້ນຫຼັງ"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ms-rMY/strings.xml b/WallpaperPicker/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000000..950f4d0e1d
--- /dev/null
+++ b/WallpaperPicker/res/values-ms-rMY/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Tetapkan kertas dinding"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Tidak dapat memuatkan imej"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Tidak dapat memuatkan imej sebagai kertas dinding"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d dipilih"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d dipilih"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d dipilih"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Kertas dinding %1$d daripada %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Memilih <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Padam"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pilih imej"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Kertas dinding"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Pangkas kertas dinding"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-nb/strings.xml b/WallpaperPicker/res/values-nb/strings.xml
new file mode 100644
index 0000000000..3589e4bc86
--- /dev/null
+++ b/WallpaperPicker/res/values-nb/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Angi bakgrunn"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kunne ikke laste inn bildet"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kunne ikke laste inn bildet som bakgrunn"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d valgt"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d valgt"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d valgt"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Bakgrunn %1$d av %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Valgt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Slett"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Velg bilde"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Bakgrunner"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskjær bakgrunnen"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml
index 2ba2af2a5d..ff43ce8f64 100644
--- a/WallpaperPicker/res/values-ru/strings.xml
+++ b/WallpaperPicker/res/values-ru/strings.xml
@@ -23,9 +23,9 @@
     <string name="image_load_fail" msgid="7538534580694411837">"Не удалось загрузить изображение"</string>
     <string name="wallpaper_load_fail" msgid="4800700444605404650">"Не удалось загрузить изображение"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9015111147509924344">"%1$d"</item>
-    <item quantity="one" msgid="8409622005831789373">"%1$d"</item>
-    <item quantity="other" msgid="479468347731745357">"%1$d"</item>
+    <item quantity="zero" msgid="9015111147509924344">"Выбрано: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Выбрано: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Выбрано: %1$d"</item>
   </plurals>
     <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Обои %1$d из %2$d"</string>
     <string name="announce_selection" msgid="123723511662250539">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
diff --git a/WallpaperPicker/res/values-sk/strings.xml b/WallpaperPicker/res/values-sk/strings.xml
new file mode 100644
index 0000000000..33477a124a
--- /dev/null
+++ b/WallpaperPicker/res/values-sk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nastaviť tapetu"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Obrázok nie je možné načítať"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Obrázok nie je možné načítať ako tapetu"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Počet vybratých položiek: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Počet vybratých položiek: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Počet vybratých položiek: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Vybratá položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Odstrániť"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vybrať obrázok"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Orezanie tapety"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sl/strings.xml b/WallpaperPicker/res/values-sl/strings.xml
new file mode 100644
index 0000000000..06a508a8c5
--- /dev/null
+++ b/WallpaperPicker/res/values-sl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nastavi ozadje"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Slike ni bilo mogoče naložiti"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Slike ni bilo mogoče naložiti kot ozadje"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Št. izbranih: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Št. izbranih: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Št. izbranih: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. ozadje od %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Izbrano: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Izberi sliko"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ozadja"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Obrezovanje ozadja"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sv/strings.xml b/WallpaperPicker/res/values-sv/strings.xml
new file mode 100644
index 0000000000..57db3a64d3
--- /dev/null
+++ b/WallpaperPicker/res/values-sv/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ange bakgrund"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Det gick inte att läsa in bilden"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Det gick inte att läsa in bilden som bakgrund"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d har valts"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d har valts"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d har valts"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Bakgrund %1$d av %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> har valts"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ta bort"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Välj bild"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Bakgrunder"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskär bakgrund"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sw/strings.xml b/WallpaperPicker/res/values-sw/strings.xml
new file mode 100644
index 0000000000..edea3de5b1
--- /dev/null
+++ b/WallpaperPicker/res/values-sw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Weka mandhari"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Haikuweza kupakia picha"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Haikuweza kupakia picha iwe mandhari"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d zimechaguliwa"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d zimechaguliwa"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d zimechaguliwa"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Mandhari %1$d ya %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> iliyochaguliwa"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Futa"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Chagua picha"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Mandhari"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Punguza mandhari"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-tr/strings.xml b/WallpaperPicker/res/values-tr/strings.xml
new file mode 100644
index 0000000000..3d03c6be8d
--- /dev/null
+++ b/WallpaperPicker/res/values-tr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Duvar kağıdını ayarla"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Resim yüklenemedi"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Resim duvar kağıdı olarak yüklenemedi"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d tane seçildi"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d tane seçildi"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d tane seçildi"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d duvar kağıdı arasından duvar kağıdı %1$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seçildi"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Sil"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Resim seç"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Duvar kağıtları"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Duvar kağıdını kırp"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rCN/strings.xml b/WallpaperPicker/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..1def9ed41b
--- /dev/null
+++ b/WallpaperPicker/res/values-zh-rCN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"设置壁纸"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"无法加载图片"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"无法加载要设为壁纸的图片"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"已选择%1$d项"</item>
+    <item quantity="one" msgid="8409622005831789373">"已选择%1$d项"</item>
+    <item quantity="other" msgid="479468347731745357">"已选择%1$d项"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第%1$d张壁纸，共%2$d张"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已选择<xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"删除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"选择图片"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"壁纸"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"剪裁壁纸"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rHK/strings.xml b/WallpaperPicker/res/values-zh-rHK/strings.xml
index e7a12c1baf..66ba0af180 100644
--- a/WallpaperPicker/res/values-zh-rHK/strings.xml
+++ b/WallpaperPicker/res/values-zh-rHK/strings.xml
@@ -28,7 +28,7 @@
     <item quantity="other" msgid="479468347731745357">"已選取 %1$d 張"</item>
   </plurals>
     <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
-    <string name="announce_selection" msgid="123723511662250539">"已選取「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
     <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
     <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
     <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
diff --git a/WallpaperPicker/res/values-zu/strings.xml b/WallpaperPicker/res/values-zu/strings.xml
new file mode 100644
index 0000000000..c7d3f33d1a
--- /dev/null
+++ b/WallpaperPicker/res/values-zu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Setha isithombe sangemuva"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Ayikwazanga ukulayisha isithombe"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Ayikwazanga ukulayisha isithombe njengesithombe sangemuva"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d khethiwe"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d khethiwe"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d khethiwe"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Isithombe sangemuva esingu-%1$d kwezingu-%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhethiwe"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Susa"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Khetha isithombe"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Izithombe zangemuva"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Nqampuna isithombe sangemuva"</string>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 249af37f34..4d70318bbc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,7 +84,7 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startbildschirm %1$d von %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Willkommen!"</string>
+    <string name="first_run_cling_title" msgid="7257389003637362144">"Hallo!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>

From d4d3d08741b2c183dbcba1fa25ca100783bfe1ee Mon Sep 17 00:00:00 2001
From: Sandeep Siddhartha <sansid@google.com>
Date: Thu, 26 Dec 2013 15:42:52 -0800
Subject: [PATCH 084/147] Allow changing search bar hint in the cling
 on-the-fly

- This allows GEL to initially supply an empty string if hotword isn't
  active, and later on update the cling if and when the hotword becomes
  active.
- This isn't expensive as it'll only be called if Launcher first calls
  getFirstRunClingSearchBarHint, i.e. once every fresh install/clear
  data

Bug: 11116105
Change-Id: Ia963bb62d7b331afd0c34adfa6c4b6bdbac48349
---
 src/com/android/launcher3/Launcher.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a8dd99795a..802f5d022a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4418,6 +4418,20 @@ public class Launcher extends Activity
         }
     }
 
+    /**
+     * Called when the SearchBar hint should be changed.
+     *
+     * @param hint the hint to be displayed in the search bar.
+     */
+    protected void onSearchBarHintChanged(String hint) {
+        Cling cling = (Cling) findViewById(R.id.first_run_cling);
+        if (cling != null && cling.getVisibility() == View.VISIBLE && !hint.isEmpty()) {
+            TextView sbHint = (TextView) cling.findViewById(R.id.search_bar_hint);
+            sbHint.setText(hint);
+            sbHint.setVisibility(View.VISIBLE);
+        }
+    }
+
     protected String getFirstRunClingSearchBarHint() {
         return "";
     }

From cff2d6a2d904b7d88096650021aa428cfdc08632 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 26 Dec 2013 17:19:12 -0800
Subject: [PATCH 085/147] Import translations. DO NOT MERGE

Change-Id: I5cbd143e531cfe8f1d131f0d7c91008758337013
Auto-generated-cl: translation import
---
 res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b95d482700..c72576efa5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -98,7 +98,7 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startbildschirm %1$d von %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Willkommen!"</string>
+    <string name="first_run_cling_title" msgid="7257389003637362144">"Hallo!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>

From 37749ea37032043687c7dab552d961ba6245bd08 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 26 Dec 2013 17:20:10 -0800
Subject: [PATCH 086/147] Import translations. DO NOT MERGE

Change-Id: I9ced3c60b831f09e8436f562d8c1fef1e2aa6156
Auto-generated-cl: translation import
---
 WallpaperPicker/res/values-am/strings.xml     |  2 +-
 WallpaperPicker/res/values-cs/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-es-rUS/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fa/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fr-rCA/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-fr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-hi/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-in/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-it/strings.xml     |  4 +--
 WallpaperPicker/res/values-ja/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ka-rGE/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-lo-rLA/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ms-rMY/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-nb/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-ru/strings.xml     |  6 ++--
 WallpaperPicker/res/values-sk/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sl/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sv/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-sw/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-tr/strings.xml     | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rCN/strings.xml | 36 +++++++++++++++++++
 WallpaperPicker/res/values-zh-rHK/strings.xml |  2 +-
 WallpaperPicker/res/values-zu/strings.xml     | 36 +++++++++++++++++++
 res/values-de/strings.xml                     |  2 +-
 24 files changed, 692 insertions(+), 8 deletions(-)
 create mode 100644 WallpaperPicker/res/values-cs/strings.xml
 create mode 100644 WallpaperPicker/res/values-es-rUS/strings.xml
 create mode 100644 WallpaperPicker/res/values-fa/strings.xml
 create mode 100644 WallpaperPicker/res/values-fr-rCA/strings.xml
 create mode 100644 WallpaperPicker/res/values-fr/strings.xml
 create mode 100644 WallpaperPicker/res/values-hi/strings.xml
 create mode 100644 WallpaperPicker/res/values-in/strings.xml
 create mode 100644 WallpaperPicker/res/values-ja/strings.xml
 create mode 100644 WallpaperPicker/res/values-ka-rGE/strings.xml
 create mode 100644 WallpaperPicker/res/values-lo-rLA/strings.xml
 create mode 100644 WallpaperPicker/res/values-ms-rMY/strings.xml
 create mode 100644 WallpaperPicker/res/values-nb/strings.xml
 create mode 100644 WallpaperPicker/res/values-sk/strings.xml
 create mode 100644 WallpaperPicker/res/values-sl/strings.xml
 create mode 100644 WallpaperPicker/res/values-sv/strings.xml
 create mode 100644 WallpaperPicker/res/values-sw/strings.xml
 create mode 100644 WallpaperPicker/res/values-tr/strings.xml
 create mode 100644 WallpaperPicker/res/values-zh-rCN/strings.xml
 create mode 100644 WallpaperPicker/res/values-zu/strings.xml

diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml
index e4bcadbed8..3941616341 100644
--- a/WallpaperPicker/res/values-am/strings.xml
+++ b/WallpaperPicker/res/values-am/strings.xml
@@ -32,5 +32,5 @@
     <string name="wallpaper_delete" msgid="1459353972739215344">"ሰርዝ"</string>
     <string name="pick_image" msgid="6704438906027442697">"ምስል ይምረጡ"</string>
     <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>
-    <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይቁረጡ"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"የግድግዳ ወረቀት ይከርክሙ"</string>
 </resources>
diff --git a/WallpaperPicker/res/values-cs/strings.xml b/WallpaperPicker/res/values-cs/strings.xml
new file mode 100644
index 0000000000..a07b9eda2a
--- /dev/null
+++ b/WallpaperPicker/res/values-cs/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nastavit jako tapetu"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Obrázek nelze načíst."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Obrázek nelze načíst jako tapetu."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Vybráno: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Vybráno: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Vybráno: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Vybrána položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Smazat"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vybrat obrázek"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Oříznutí tapety"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-es-rUS/strings.xml b/WallpaperPicker/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000000..768385b9ee
--- /dev/null
+++ b/WallpaperPicker/res/values-es-rUS/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Establecer como fondo de pantalla"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"No se pudo cargar la imagen."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"No se pudo cargar la imagen como fondo de pantalla."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d seleccionado"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d seleccionado"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d seleccionados"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Elegir imagen"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fa/strings.xml b/WallpaperPicker/res/values-fa/strings.xml
new file mode 100644
index 0000000000..eb330b515c
--- /dev/null
+++ b/WallpaperPicker/res/values-fa/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"تنظیم کاغذدیواری"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"تصویر بارگیری نشد"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"تصویر به عنوان کاغذدیواری بارگیری نشد"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"‏%1$d انتخاب شد"</item>
+    <item quantity="one" msgid="8409622005831789373">"‏%1$d انتخاب شد"</item>
+    <item quantity="other" msgid="479468347731745357">"‏%1$d انتخاب شد"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏کاغذدیواری %1$d از %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> انتخاب شده است"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف"</string>
+    <string name="pick_image" msgid="6704438906027442697">"انتخاب تصویر"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"کاغذدیواری‌ها"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"برش کاغذدیواری"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fr-rCA/strings.xml b/WallpaperPicker/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000000..e95670678a
--- /dev/null
+++ b/WallpaperPicker/res/values-fr-rCA/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Définir le fond d\'écran"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Impossible de charger l\'image"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossible de charger l\'image comme fond d\'écran"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d sélectionné"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d sélectionné"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d sélectionné(s)"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fond d\'écran %1$d de %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Sélection : <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Choisir une image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml
new file mode 100644
index 0000000000..ea07db1e54
--- /dev/null
+++ b/WallpaperPicker/res/values-fr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Définir comme fond d\'écran"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Impossible de charger l\'image."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossible de charger l\'image comme fond d\'écran."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d élément sélectionné"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d élément sélectionné"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d éléments sélectionnés"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fond d\'écran %1$d sur %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> sélectionné"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Sélectionner une image"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-hi/strings.xml b/WallpaperPicker/res/values-hi/strings.xml
new file mode 100644
index 0000000000..fcb252eb55
--- /dev/null
+++ b/WallpaperPicker/res/values-hi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"वॉलपेपर सेट करें"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"चित्र लोड नहीं किया जा सका"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"चित्र को वॉलपेपर के रूप में लोड नहीं किया जा सका"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d चयनित"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d चयनित"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d चयनित"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"वॉलपेपर %2$d में से %1$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"चयनित <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"हटाएं"</string>
+    <string name="pick_image" msgid="6704438906027442697">"चित्र चुनें"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"वॉलपेपर"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"वॉलपेपर काटें"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-in/strings.xml b/WallpaperPicker/res/values-in/strings.xml
new file mode 100644
index 0000000000..f216cf3436
--- /dev/null
+++ b/WallpaperPicker/res/values-in/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Setel wallpaper"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Tidak dapat memuat gambar"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Tidak dapat memuat gambar sebagai wallpaper"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d dipilih"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d dipilih"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d dipilih"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d dari %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> terpilih"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Hapus"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pilih gambar"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpaper"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Pangkas wallpaper"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml
index fcd49bd291..c29946f85a 100644
--- a/WallpaperPicker/res/values-it/strings.xml
+++ b/WallpaperPicker/res/values-it/strings.xml
@@ -23,9 +23,9 @@
     <string name="image_load_fail" msgid="7538534580694411837">"Impossibile caricare l\'immagine"</string>
     <string name="wallpaper_load_fail" msgid="4800700444605404650">"Impossibile caricare l\'immagine come sfondo"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9015111147509924344">"%1$d selezionato"</item>
+    <item quantity="zero" msgid="9015111147509924344">"%1$d selezionati"</item>
     <item quantity="one" msgid="8409622005831789373">"%1$d selezionato"</item>
-    <item quantity="other" msgid="479468347731745357">"%1$d selezionato"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d selezionati"</item>
   </plurals>
     <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Sfondo %1$d di %2$d"</string>
     <string name="announce_selection" msgid="123723511662250539">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
diff --git a/WallpaperPicker/res/values-ja/strings.xml b/WallpaperPicker/res/values-ja/strings.xml
new file mode 100644
index 0000000000..80b0944531
--- /dev/null
+++ b/WallpaperPicker/res/values-ja/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"壁紙を設定"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"画像を読み込めませんでした"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"画像を壁紙として読み込めませんでした"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d個選択済み"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d個選択済み"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d個選択済み"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"壁紙: %1$d/%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"選択: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"削除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"画像を選択"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"壁紙"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"壁紙のトリミング"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ka-rGE/strings.xml b/WallpaperPicker/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000000..2f59712d8b
--- /dev/null
+++ b/WallpaperPicker/res/values-ka-rGE/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"ფონის დაყენება"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"სურათი ვერ ჩაიტვირთა."</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"სურათი ფონად ვერ ჩაიტვირთა."</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"არჩეულია %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"არჩეულია %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"არჩეულია %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ფონი %1$d %2$d-დან"</string>
+    <string name="announce_selection" msgid="123723511662250539">"არჩეული <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"წაშლა"</string>
+    <string name="pick_image" msgid="6704438906027442697">"სურათის ამორჩევა"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"ფონები"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ფონის ჩამოჭრა"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-lo-rLA/strings.xml b/WallpaperPicker/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000000..e468591113
--- /dev/null
+++ b/WallpaperPicker/res/values-lo-rLA/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"ຕັ້ງເປັນພາບພື້ນຫຼັງ"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"ບໍ່ສາມາດໂຫຼດຮູບໄດ້"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ບໍ່ສາມາດໂຫຼດຮູບເປັນພາບພື້ນຫຼັງໄດ້"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"ເລືອກ %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"ເລືອກ %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"ເລືອກ %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ພາບພື້ນຫຼັງ %1$d ໃນ %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"ເລືອກ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"ລຶບ"</string>
+    <string name="pick_image" msgid="6704438906027442697">"ເລືອກ​ຮູບ​ພາບ"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"ພາບພື້ນຫຼັງ"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"ຕັດພາບພື້ນຫຼັງ"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ms-rMY/strings.xml b/WallpaperPicker/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000000..950f4d0e1d
--- /dev/null
+++ b/WallpaperPicker/res/values-ms-rMY/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Tetapkan kertas dinding"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Tidak dapat memuatkan imej"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Tidak dapat memuatkan imej sebagai kertas dinding"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d dipilih"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d dipilih"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d dipilih"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Kertas dinding %1$d daripada %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Memilih <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Padam"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Pilih imej"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Kertas dinding"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Pangkas kertas dinding"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-nb/strings.xml b/WallpaperPicker/res/values-nb/strings.xml
new file mode 100644
index 0000000000..3589e4bc86
--- /dev/null
+++ b/WallpaperPicker/res/values-nb/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Angi bakgrunn"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Kunne ikke laste inn bildet"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kunne ikke laste inn bildet som bakgrunn"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d valgt"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d valgt"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d valgt"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Bakgrunn %1$d av %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Valgt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Slett"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Velg bilde"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Bakgrunner"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskjær bakgrunnen"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml
index 2ba2af2a5d..ff43ce8f64 100644
--- a/WallpaperPicker/res/values-ru/strings.xml
+++ b/WallpaperPicker/res/values-ru/strings.xml
@@ -23,9 +23,9 @@
     <string name="image_load_fail" msgid="7538534580694411837">"Не удалось загрузить изображение"</string>
     <string name="wallpaper_load_fail" msgid="4800700444605404650">"Не удалось загрузить изображение"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9015111147509924344">"%1$d"</item>
-    <item quantity="one" msgid="8409622005831789373">"%1$d"</item>
-    <item quantity="other" msgid="479468347731745357">"%1$d"</item>
+    <item quantity="zero" msgid="9015111147509924344">"Выбрано: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Выбрано: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Выбрано: %1$d"</item>
   </plurals>
     <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Обои %1$d из %2$d"</string>
     <string name="announce_selection" msgid="123723511662250539">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
diff --git a/WallpaperPicker/res/values-sk/strings.xml b/WallpaperPicker/res/values-sk/strings.xml
new file mode 100644
index 0000000000..33477a124a
--- /dev/null
+++ b/WallpaperPicker/res/values-sk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nastaviť tapetu"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Obrázok nie je možné načítať"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Obrázok nie je možné načítať ako tapetu"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Počet vybratých položiek: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Počet vybratých položiek: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Počet vybratých položiek: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Vybratá položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Odstrániť"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Vybrať obrázok"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Orezanie tapety"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sl/strings.xml b/WallpaperPicker/res/values-sl/strings.xml
new file mode 100644
index 0000000000..06a508a8c5
--- /dev/null
+++ b/WallpaperPicker/res/values-sl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Nastavi ozadje"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Slike ni bilo mogoče naložiti"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Slike ni bilo mogoče naložiti kot ozadje"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"Št. izbranih: %1$d"</item>
+    <item quantity="one" msgid="8409622005831789373">"Št. izbranih: %1$d"</item>
+    <item quantity="other" msgid="479468347731745357">"Št. izbranih: %1$d"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. ozadje od %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"Izbrano: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Izberi sliko"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Ozadja"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Obrezovanje ozadja"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sv/strings.xml b/WallpaperPicker/res/values-sv/strings.xml
new file mode 100644
index 0000000000..57db3a64d3
--- /dev/null
+++ b/WallpaperPicker/res/values-sv/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Ange bakgrund"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Det gick inte att läsa in bilden"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Det gick inte att läsa in bilden som bakgrund"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d har valts"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d har valts"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d har valts"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Bakgrund %1$d av %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> har valts"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Ta bort"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Välj bild"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Bakgrunder"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskär bakgrund"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-sw/strings.xml b/WallpaperPicker/res/values-sw/strings.xml
new file mode 100644
index 0000000000..edea3de5b1
--- /dev/null
+++ b/WallpaperPicker/res/values-sw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Weka mandhari"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Haikuweza kupakia picha"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Haikuweza kupakia picha iwe mandhari"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d zimechaguliwa"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d zimechaguliwa"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d zimechaguliwa"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Mandhari %1$d ya %2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> iliyochaguliwa"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Futa"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Chagua picha"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Mandhari"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Punguza mandhari"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-tr/strings.xml b/WallpaperPicker/res/values-tr/strings.xml
new file mode 100644
index 0000000000..3d03c6be8d
--- /dev/null
+++ b/WallpaperPicker/res/values-tr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Duvar kağıdını ayarla"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Resim yüklenemedi"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Resim duvar kağıdı olarak yüklenemedi"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d tane seçildi"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d tane seçildi"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d tane seçildi"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d duvar kağıdı arasından duvar kağıdı %1$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seçildi"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Sil"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Resim seç"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Duvar kağıtları"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Duvar kağıdını kırp"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rCN/strings.xml b/WallpaperPicker/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..1def9ed41b
--- /dev/null
+++ b/WallpaperPicker/res/values-zh-rCN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"设置壁纸"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"无法加载图片"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"无法加载要设为壁纸的图片"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"已选择%1$d项"</item>
+    <item quantity="one" msgid="8409622005831789373">"已选择%1$d项"</item>
+    <item quantity="other" msgid="479468347731745357">"已选择%1$d项"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第%1$d张壁纸，共%2$d张"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已选择<xliff:g id="LABEL">%1$s</xliff:g>"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"删除"</string>
+    <string name="pick_image" msgid="6704438906027442697">"选择图片"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"壁纸"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"剪裁壁纸"</string>
+</resources>
diff --git a/WallpaperPicker/res/values-zh-rHK/strings.xml b/WallpaperPicker/res/values-zh-rHK/strings.xml
index e7a12c1baf..66ba0af180 100644
--- a/WallpaperPicker/res/values-zh-rHK/strings.xml
+++ b/WallpaperPicker/res/values-zh-rHK/strings.xml
@@ -28,7 +28,7 @@
     <item quantity="other" msgid="479468347731745357">"已選取 %1$d 張"</item>
   </plurals>
     <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
-    <string name="announce_selection" msgid="123723511662250539">"已選取「<xliff:g id="LABEL">%1$s</xliff:g>」"</string>
+    <string name="announce_selection" msgid="123723511662250539">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
     <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
     <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
     <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
diff --git a/WallpaperPicker/res/values-zu/strings.xml b/WallpaperPicker/res/values-zu/strings.xml
new file mode 100644
index 0000000000..c7d3f33d1a
--- /dev/null
+++ b/WallpaperPicker/res/values-zu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+* Copyright (C) 2013 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
+*
+*      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
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wallpaper_instructions" msgid="3524143401182707094">"Setha isithombe sangemuva"</string>
+    <string name="image_load_fail" msgid="7538534580694411837">"Ayikwazanga ukulayisha isithombe"</string>
+    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Ayikwazanga ukulayisha isithombe njengesithombe sangemuva"</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="zero" msgid="9015111147509924344">"%1$d khethiwe"</item>
+    <item quantity="one" msgid="8409622005831789373">"%1$d khethiwe"</item>
+    <item quantity="other" msgid="479468347731745357">"%1$d khethiwe"</item>
+  </plurals>
+    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Isithombe sangemuva esingu-%1$d kwezingu-%2$d"</string>
+    <string name="announce_selection" msgid="123723511662250539">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhethiwe"</string>
+    <string name="wallpaper_delete" msgid="1459353972739215344">"Susa"</string>
+    <string name="pick_image" msgid="6704438906027442697">"Khetha isithombe"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Izithombe zangemuva"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Nqampuna isithombe sangemuva"</string>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 249af37f34..4d70318bbc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,7 +84,7 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startbildschirm %1$d von %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Willkommen!"</string>
+    <string name="first_run_cling_title" msgid="7257389003637362144">"Hallo!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>

From 5f7099af8573c2229427318acd551b92efae02a3 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Thu, 2 Jan 2014 15:54:57 -0800
Subject: [PATCH 087/147] Allow scrolling folders in when all apps is disabled.

Allows for more items to be added into a folder.
Allows for scrolling by letting the content area inside the scroll view to be taller.
The height of content area was capped in https://googleplex-android-review.git.corp.google.com/#/c/387583/

Change-Id: I8d7950ac9c155e26c5a299c17ae6a2bbf829dce6
---
 src/com/android/launcher3/CellLayout.java |  2 +-
 src/com/android/launcher3/Folder.java     | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index fa6ce96314..2436a51a36 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -199,7 +199,7 @@ public class CellLayout extends ViewGroup {
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CellLayout, defStyle, 0);
 
         mCellWidth = mCellHeight = -1;
-        mFixedCellHeight = mFixedCellHeight = -1;
+        mFixedCellWidth = mFixedCellHeight = -1;
         mWidthGap = mOriginalWidthGap = 0;
         mHeightGap = mOriginalHeightGap = 0;
         mMaxGap = Integer.MAX_VALUE;
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index f292821f48..ca82bd1a71 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -145,8 +145,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
 
         Resources res = getResources();
         mMaxCountX = (int) grid.numColumns;
-        mMaxCountY = (int) grid.numRows;
-        mMaxNumItems = mMaxCountX * mMaxCountY;
+        // Allow scrolling folders when DISABLE_ALL_APPS is true.
+        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+            mMaxCountY = mMaxNumItems = Integer.MAX_VALUE;
+        } else {
+            mMaxCountY = (int) grid.numRows;
+            mMaxNumItems = mMaxCountX * mMaxCountY;
+        }
 
         mInputMethodManager = (InputMethodManager)
                 getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -1009,7 +1014,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         int contentAreaHeightSpec = MeasureSpec.makeMeasureSpec(getContentAreaHeight(),
                 MeasureSpec.EXACTLY);
 
-        mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight());
+        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+            // Don't cap the height of the content to allow scrolling.
+            mContent.setFixedSize(getContentAreaWidth(), mContent.getDesiredHeight());
+        } else {
+            mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight());
+        }
+
         mScrollView.measure(contentAreaWidthSpec, contentAreaHeightSpec);
         mFolderName.measure(contentAreaWidthSpec,
                 MeasureSpec.makeMeasureSpec(mFolderNameHeight, MeasureSpec.EXACTLY));

From 83b0da1aed13b20562039ea00d68791beb46a090 Mon Sep 17 00:00:00 2001
From: Yura <yura@google.com>
Date: Tue, 7 Jan 2014 18:15:46 +0000
Subject: [PATCH 088/147] Removed paddingStart and paddingEnd when they are the
 same.

This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.

Bug: 8166178
Change-Id: Ic0ea256aabb68b654a3942dd19dd30e67f1b2af9
---
 res/layout-sw720dp/market_button.xml |  4 ++--
 res/layout/add_list_item.xml         |  4 ++--
 res/layout/appwidget_error.xml       |  4 ++--
 res/layout/market_button.xml         |  4 ++--
 res/values-land/styles.xml           |  4 ++--
 res/values-sw600dp/styles.xml        |  4 ++--
 res/values-sw720dp/styles.xml        | 12 ++++++------
 res/values/styles.xml                | 16 ++++++++--------
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/res/layout-sw720dp/market_button.xml b/res/layout-sw720dp/market_button.xml
index f1e99599e3..7eaeafac3c 100644
--- a/res/layout-sw720dp/market_button.xml
+++ b/res/layout-sw720dp/market_button.xml
@@ -18,8 +18,8 @@
     style="@style/MarketButton"
     android:onClick="onClickAppMarketButton"
     android:gravity="center"
-    android:paddingStart="32dp"
-    android:paddingEnd="32dp"
+    android:paddingLeft="32dp"
+    android:paddingRight="32dp"
     android:drawablePadding="10dp"
     android:background="@drawable/tab_widget_indicator_selector"
     android:text="@string/market"
diff --git a/res/layout/add_list_item.xml b/res/layout/add_list_item.xml
index 0ae0113302..e937d7bc1d 100644
--- a/res/layout/add_list_item.xml
+++ b/res/layout/add_list_item.xml
@@ -21,5 +21,5 @@
     android:textAppearance="?android:attr/textAppearanceLarge"
     android:gravity="center_vertical"
     android:drawablePadding="14dip"
-    android:paddingStart="15dip"
-    android:paddingEnd="15dip" />
+    android:paddingLeft="15dip"
+    android:paddingRight="15dip" />
diff --git a/res/layout/appwidget_error.xml b/res/layout/appwidget_error.xml
index f5a9148196..03d4ae424c 100644
--- a/res/layout/appwidget_error.xml
+++ b/res/layout/appwidget_error.xml
@@ -19,8 +19,8 @@
     android:layout_height="wrap_content"
     android:paddingTop="10dip"
     android:paddingBottom="10dip"
-    android:paddingStart="20dip"
-    android:paddingEnd="20dip"
+    android:paddingLeft="20dip"
+    android:paddingRight="20dip"
     android:gravity="center"
     android:background="@drawable/bg_appwidget_error"
     android:textAppearance="?android:attr/textAppearanceMediumInverse"
diff --git a/res/layout/market_button.xml b/res/layout/market_button.xml
index 4a718c3d61..41e6ec7cc6 100644
--- a/res/layout/market_button.xml
+++ b/res/layout/market_button.xml
@@ -18,8 +18,8 @@
     style="@style/MarketButton"
     android:onClick="onClickAppMarketButton"
     android:gravity="center"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:background="@drawable/tab_widget_indicator_selector"
     android:contentDescription="@string/market"
     android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index d18a57b955..fa3801d601 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -36,8 +36,8 @@
         <item name="android:gravity">center</item>
         <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
         <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
-        <item name="android:paddingStart">@dimen/toolbar_button_horizontal_padding</item>
-        <item name="android:paddingEnd">@dimen/toolbar_button_horizontal_padding</item>
+        <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item>
+        <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item>
         <item name="android:shadowColor">#DD000000</item>
         <item name="android:shadowDx">0.0</item>
         <item name="android:shadowDy">1.0</item>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 375430417d..200c0a0bde 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -23,8 +23,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingBottom">15dp</item>
-        <item name="android:paddingStart">35dp</item>
-        <item name="android:paddingEnd">35dp</item>
+        <item name="android:paddingLeft">35dp</item>
+        <item name="android:paddingRight">35dp</item>
         <item name="android:text">@string/cling_dismiss</item>
         <item name="android:textStyle">bold</item>
         <item name="android:background">@drawable/cling_button_bg</item>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index e1f9ab45af..b3afae399e 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -24,8 +24,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingBottom">15dp</item>
-        <item name="android:paddingStart">35dp</item>
-        <item name="android:paddingEnd">35dp</item>
+        <item name="android:paddingLeft">35dp</item>
+        <item name="android:paddingRight">35dp</item>
         <item name="android:text">@string/cling_dismiss</item>
         <item name="android:textSize">20sp</item>
         <item name="android:textStyle">bold</item>
@@ -52,8 +52,8 @@
 
 <!-- Workspace -->
     <style name="TabIndicator.AppsCustomize">
-        <item name="android:paddingStart">32dp</item>
-        <item name="android:paddingEnd">32dp</item>
+        <item name="android:paddingLeft">32dp</item>
+        <item name="android:paddingRight">32dp</item>
         <item name="android:textSize">14sp</item>
         <item name="android:maxWidth">240dp</item>
     </style>
@@ -75,8 +75,8 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
-        <item name="android:paddingStart">60dp</item>
-        <item name="android:paddingEnd">60dp</item>
+        <item name="android:paddingLeft">60dp</item>
+        <item name="android:paddingRight">60dp</item>
         <item name="android:textColor">#FFFFFFFF</item>
         <item name="android:textSize">16sp</item>
         <item name="android:shadowColor">#393939</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4aad5ebfaf..ed531f03a3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,8 +23,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">15dp</item>
         <item name="android:paddingBottom">15dp</item>
-        <item name="android:paddingStart">50dp</item>
-        <item name="android:paddingEnd">50dp</item>
+        <item name="android:paddingLeft">50dp</item>
+        <item name="android:paddingRight">50dp</item>
         <item name="android:text">@string/cling_dismiss</item>
         <item name="android:textColor">#ffffff</item>
         <item name="android:textStyle">bold</item>
@@ -109,8 +109,8 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
-        <item name="android:paddingStart">25dp</item>
-        <item name="android:paddingEnd">25dp</item>
+        <item name="android:paddingLeft">25dp</item>
+        <item name="android:paddingRight">25dp</item>
         <item name="android:textColor">#FFFFFFFF</item>
         <item name="android:textSize">16sp</item>
         <item name="android:singleLine">true</item>
@@ -125,8 +125,8 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:gravity">center</item>
-        <item name="android:paddingStart">20dp</item>
-        <item name="android:paddingEnd">20dp</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
         <item name="android:background">@drawable/tab_widget_indicator_selector</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">12sp</item>
@@ -140,8 +140,8 @@
     </style>
 
     <style name="MarketButton">
-        <item name="android:paddingStart">5dp</item>
-        <item name="android:paddingEnd">5dp</item>
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">5dp</item>
         <item name="android:textColor">@color/workspace_all_apps_and_delete_zone_text_color</item>
         <item name="android:textSize">18sp</item>
         <item name="android:shadowColor">@color/workspace_all_apps_and_delete_zone_text_shadow_color</item>

From 693fbc7f1737d89f11f9ab81558c109f0883ab0e Mon Sep 17 00:00:00 2001
From: Mihail Dumitrescu <mdumitrescu@google.com>
Date: Fri, 3 Jan 2014 12:40:22 +0000
Subject: [PATCH 089/147] Remove a non-obvious fall through in a switch
 statement.

This CL does not modify the result of calling onInterceptHoverEvent()
assuming isEventOverFolder() has no side effects. The only change is
that isEventOverFolder will now be called once rather than twice when
action == MotionEvent.ACTION_HOVER_ENTER and isOverFolder == true.

Change-Id: Icc28ab880cf5094e49f51d72035891e924cb2031
---
 src/com/android/launcher3/DragLayer.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java
index 56886a19c4..8726f30c18 100644
--- a/src/com/android/launcher3/DragLayer.java
+++ b/src/com/android/launcher3/DragLayer.java
@@ -224,22 +224,19 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
                             sendTapOutsideFolderAccessibilityEvent(currentFolder.isEditingName());
                             mHoverPointClosesFolder = true;
                             return true;
-                        } else if (isOverFolder) {
-                            mHoverPointClosesFolder = false;
-                        } else {
-                            return true;
                         }
+                        mHoverPointClosesFolder = false;
+                        break;
                     case MotionEvent.ACTION_HOVER_MOVE:
                         isOverFolder = isEventOverFolder(currentFolder, ev);
                         if (!isOverFolder && !mHoverPointClosesFolder) {
                             sendTapOutsideFolderAccessibilityEvent(currentFolder.isEditingName());
                             mHoverPointClosesFolder = true;
                             return true;
-                        } else if (isOverFolder) {
-                            mHoverPointClosesFolder = false;
-                        } else {
+                        } else if (!isOverFolder) {
                             return true;
                         }
+                        mHoverPointClosesFolder = false;
                 }
             }
         }

From 14c6a3f510528ea36529712a9be4f5c9b07655ac Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 7 Jan 2014 14:12:27 -0500
Subject: [PATCH 090/147] KEYCODE_MENU: hide all apps when entering overview
 mode

Bug: 12165618
Change-Id: I7ee652012c7f7b8e6fab3d9d1f99cf22484f3182
---
 src/com/android/launcher3/Launcher.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 802f5d022a..c05769cfa2 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1972,9 +1972,7 @@ public class Launcher extends Activity
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        if (!mWorkspace.isInOverviewMode()) {
-            mWorkspace.enterOverviewMode();
-        }
+        showOverviewMode(true);
         return false;
     }
 

From 3ee4a474f2a1a76682b1b1ec261d6c68f3b7349d Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 6 Jan 2014 15:53:37 -0800
Subject: [PATCH 091/147] Accounting for new Package event extras when updating
 forward-locked apps. (Bug 11855584)

Change-Id: I983c82a74690a9031d18d456ff43dc8750081871
---
 src/com/android/launcher3/LauncherModel.java | 28 +++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b4f7f5dbd7..b2cfb2456a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1088,15 +1088,29 @@ public class LauncherModel extends BroadcastReceiver {
             }
 
         } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
-            // First, schedule to add these apps back in.
+            final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
             String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
-            enqueuePackageUpdated(new PackageUpdatedTask(PackageUpdatedTask.OP_ADD, packages));
-            // Then, rebind everything.
-            startLoaderFromBackground();
+            if (!replacing) {
+                enqueuePackageUpdated(new PackageUpdatedTask(PackageUpdatedTask.OP_ADD, packages));
+                if (mAppsCanBeOnRemoveableStorage) {
+                    // Only rebind if we support removable storage.  It catches the case where
+                    // apps on the external sd card need to be reloaded
+                    startLoaderFromBackground();
+                }
+            } else {
+                // If we are replacing then just update the packages in the list
+                enqueuePackageUpdated(new PackageUpdatedTask(PackageUpdatedTask.OP_UPDATE,
+                        packages));
+            }
         } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
-            String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
-            enqueuePackageUpdated(new PackageUpdatedTask(
-                        PackageUpdatedTask.OP_UNAVAILABLE, packages));
+            final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+            if (!replacing) {
+                String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
+                enqueuePackageUpdated(new PackageUpdatedTask(
+                            PackageUpdatedTask.OP_UNAVAILABLE, packages));
+            }
+            // else, we are replacing the packages, so ignore this event and wait for
+            // EXTERNAL_APPLICATIONS_AVAILABLE to update the packages at that time
         } else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
             // If we have changed locale we need to clear out the labels in all apps/workspace.
             forceReload();

From f0efa2fb4fa01139c30fce30c9c070446ab5c95a Mon Sep 17 00:00:00 2001
From: Yura <yura@google.com>
Date: Wed, 8 Jan 2014 11:24:34 +0000
Subject: [PATCH 092/147] Moved paddingStart to -v17 folder.

This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.

Bug: 8166178
Change-Id: I84879257c4e463879fd6bfc322514d30c469ca30
---
 res/layout-port/search_bar.xml       | 4 ++--
 res/layout-sw720dp/search_bar.xml    | 4 ++--
 res/layout/apps_customize_widget.xml | 3 ++-
 res/values-v17/styles.xml            | 9 +++++++++
 res/values/styles.xml                | 6 ++++++
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 res/values-v17/styles.xml

diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 1c96ca380a..e993f78478 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -22,7 +22,7 @@
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
    <com.android.launcher3.HolographicLinearLayout
-        style="@style/SearchButton"
+        style="@style/SearchButton.WithPaddingStart"
         launcher:sourceImageViewId="@+id/search_button"
         android:id="@+id/search_button_container"
         android:layout_width="match_parent"
@@ -31,7 +31,6 @@
         android:layout_centerVertical="true"
         android:layout_alignParentStart="true"
         android:layout_toStartOf="@+id/voice_button_container"
-        android:paddingStart="8dp"
         android:onClick="onClickSearchButton"
         android:focusable="true"
         android:clickable="true"
@@ -57,6 +56,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
         android:paddingEnd="8dp"
+        android:paddingRight="8dp"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
index 69dd61aa2e..3276f3f170 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/search_bar.xml
@@ -20,7 +20,7 @@
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
    <com.android.launcher3.HolographicLinearLayout
-        style="@style/SearchButton"
+        style="@style/SearchButton.WithPaddingStart"
         launcher:sourceImageViewId="@+id/search_button"
         android:id="@+id/search_button_container"
         android:layout_width="match_parent"
@@ -29,7 +29,6 @@
         android:layout_centerVertical="true"
         android:layout_alignParentStart="true"
         android:layout_toStartOf="@+id/voice_button_container"
-        android:paddingStart="8dp"
         android:onClick="onClickSearchButton"
         android:focusable="true"
         android:clickable="true"
@@ -55,6 +54,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
         android:paddingEnd="8dp"
+        android:paddingRight="8dp"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index f2d2342662..7c98b4a9b7 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -28,12 +28,13 @@
     <!-- The preview of the widget or shortcut. -->
     <com.android.launcher3.PagedViewWidgetImageView
         android:id="@+id/widget_preview"
+        style="@style/PagedViewWidgetImageView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:paddingTop="@dimen/app_widget_preview_padding_top"
-        android:paddingStart="@dimen/app_widget_preview_padding_left"
         android:paddingEnd="@dimen/app_widget_preview_padding_right"
+        android:paddingRight="@dimen/app_widget_preview_padding_right"
         android:scaleType="matrix"
         android:background="@drawable/screenpanel" />
     <LinearLayout
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
new file mode 100644
index 0000000000..71c4bfa66c
--- /dev/null
+++ b/res/values-v17/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="PagedViewWidgetImageView">
+        <item name="android:paddingStart">@dimen/app_widget_preview_padding_left</item>
+    </style>
+    <style name="SearchButton.WithPaddingStart">
+        <item name="android:paddingStart">8dp</item>
+    </style>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ed531f03a3..c9834f8b5e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -155,4 +155,10 @@
     </style>
     <style name="CustomClingText">
     </style>
+    <style name="PagedViewWidgetImageView">
+        <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item>
+    </style>
+    <style name="SearchButton.WithPaddingStart">
+        <item name="android:paddingLeft">8dp</item>
+    </style>
 </resources>

From 8b51b173209a9627157172f22fa23fa36065b061 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 6 Jan 2014 14:33:50 -0800
Subject: [PATCH 093/147] Move saved wallpaper images from cache directory to
 data directory

Bug: 12028275

Change-Id: Ia8fdd0ea50a4dad34e560287c50ae3fcc6d09cf9
---
 .../android/launcher3/SavedWallpaperImages.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
index 58add7022d..44bfdf1f9d 100644
--- a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
+++ b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
@@ -85,6 +85,9 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter {
     }
 
     public SavedWallpaperImages(Activity context) {
+        // We used to store the saved images in the cache directory, but that meant they'd get
+        // deleted sometimes-- move them to the data directory
+        ImageDb.moveFromCacheDirectoryIfNecessary(context);
         mDb = new ImageDb(context);
         mContext = context;
         mLayoutInflater = context.getLayoutInflater();
@@ -215,11 +218,20 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter {
         Context mContext;
 
         public ImageDb(Context context) {
-            super(context, new File(context.getCacheDir(), DB_NAME).getPath(), null, DB_VERSION);
+            super(context, context.getDatabasePath(DB_NAME).getPath(), null, DB_VERSION);
             // Store the context for later use
             mContext = context;
         }
 
+        public static void moveFromCacheDirectoryIfNecessary(Context context) {
+            // We used to store the saved images in the cache directory, but that meant they'd get
+            // deleted sometimes-- move them to the data directory
+            File oldSavedImagesFile = new File(context.getCacheDir(), ImageDb.DB_NAME);
+            File savedImagesFile = context.getDatabasePath(ImageDb.DB_NAME);
+            if (oldSavedImagesFile.exists()) {
+                oldSavedImagesFile.renameTo(savedImagesFile);
+            }
+        }
         @Override
         public void onCreate(SQLiteDatabase database) {
             database.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (" +

From 6e27f642ae66dd1920b25b527fced7268943d11a Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 10 Dec 2013 13:40:30 +0100
Subject: [PATCH 094/147] Recover when widget preview database is deleted

Bug: 12109621

Change-Id: I8d59700d31d6856d6151b965786c87585801317b
---
 .../android/launcher3/LauncherAppState.java   |  9 ++-
 .../launcher3/WidgetPreviewLoader.java        | 67 +++++++++++++------
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 84a1d04118..d27cedcfc7 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -83,7 +83,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
         mIsScreenLarge = isScreenLarge(sContext.getResources());
         mScreenDensity = sContext.getResources().getDisplayMetrics().density;
 
-        mWidgetPreviewCacheDb = new WidgetPreviewLoader.CacheDb(sContext);
+        recreateWidgetPreviewDb();
         mIconCache = new IconCache(sContext);
 
         mAppFilter = AppFilter.loadByName(sContext.getString(R.string.app_filter_class));
@@ -113,6 +113,13 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
         resolver.registerContentObserver(LauncherSettings.Favorites.CONTENT_URI, true,
                 mFavoritesObserver);
     }
+    
+    public void recreateWidgetPreviewDb() {
+        if (mWidgetPreviewCacheDb != null) {
+            mWidgetPreviewCacheDb.close();
+        }
+        mWidgetPreviewCacheDb = new WidgetPreviewLoader.CacheDb(sContext);
+    }
 
     /**
      * Call from Application.onTerminate(), which is not guaranteed to ever be called.
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 7e1ad6d761..3db0b51ade 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -10,6 +10,7 @@ import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDiskIOException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -164,6 +165,12 @@ public class WidgetPreviewLoader {
             editor.commit();
         }
     }
+    
+    public void recreateDb() {
+        LauncherAppState app = LauncherAppState.getInstance();
+        app.recreateWidgetPreviewDb();
+        mDb = app.getWidgetPreviewCacheDb();
+    }
 
     public void setPreviewSize(int previewWidth, int previewHeight,
             PagedViewCellLayout widgetSpacingLayout) {
@@ -347,13 +354,20 @@ public class WidgetPreviewLoader {
         preview.compress(Bitmap.CompressFormat.PNG, 100, stream);
         values.put(CacheDb.COLUMN_PREVIEW_BITMAP, stream.toByteArray());
         values.put(CacheDb.COLUMN_SIZE, mSize);
-        db.insert(CacheDb.TABLE_NAME, null, values);
+        try {
+            db.insert(CacheDb.TABLE_NAME, null, values);
+        } catch (SQLiteDiskIOException e) {
+            recreateDb();
+        }
     }
 
     private void clearDb() {
         SQLiteDatabase db = mDb.getWritableDatabase();
         // Delete everything
-        db.delete(CacheDb.TABLE_NAME, null, null);
+        try {
+            db.delete(CacheDb.TABLE_NAME, null, null);
+        } catch (SQLiteDiskIOException e) {
+        }
     }
 
     public static void removePackageFromDb(final CacheDb cacheDb, final String packageName) {
@@ -363,13 +377,17 @@ public class WidgetPreviewLoader {
         new AsyncTask<Void, Void, Void>() {
             public Void doInBackground(Void ... args) {
                 SQLiteDatabase db = cacheDb.getWritableDatabase();
-                db.delete(CacheDb.TABLE_NAME,
-                        CacheDb.COLUMN_NAME + " LIKE ? OR " +
-                        CacheDb.COLUMN_NAME + " LIKE ?", // SELECT query
-                        new String[] {
-                            WIDGET_PREFIX + packageName + "/%",
-                            SHORTCUT_PREFIX + packageName + "/%"} // args to SELECT query
-                            );
+                try {
+                    db.delete(CacheDb.TABLE_NAME,
+                            CacheDb.COLUMN_NAME + " LIKE ? OR " +
+                            CacheDb.COLUMN_NAME + " LIKE ?", // SELECT query
+                            new String[] {
+                                    WIDGET_PREFIX + packageName + "/%",
+                                    SHORTCUT_PREFIX + packageName + "/%"
+                            } // args to SELECT query
+                    );
+                } catch (SQLiteDiskIOException e) {
+                }
                 synchronized(sInvalidPackages) {
                     sInvalidPackages.remove(packageName);
                 }
@@ -382,9 +400,12 @@ public class WidgetPreviewLoader {
         new AsyncTask<Void, Void, Void>() {
             public Void doInBackground(Void ... args) {
                 SQLiteDatabase db = cacheDb.getWritableDatabase();
-                db.delete(CacheDb.TABLE_NAME,
-                        CacheDb.COLUMN_NAME + " = ? ", // SELECT query
-                        new String[] { objectName }); // args to SELECT query
+                try {
+                    db.delete(CacheDb.TABLE_NAME,
+                            CacheDb.COLUMN_NAME + " = ? ", // SELECT query
+                            new String[] { objectName }); // args to SELECT query
+                } catch (SQLiteDiskIOException e) {
+                }
                 return null;
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
@@ -396,14 +417,20 @@ public class WidgetPreviewLoader {
                     CacheDb.COLUMN_SIZE + " = ?";
         }
         SQLiteDatabase db = mDb.getReadableDatabase();
-        Cursor result = db.query(CacheDb.TABLE_NAME,
-                new String[] { CacheDb.COLUMN_PREVIEW_BITMAP }, // cols to return
-                mCachedSelectQuery, // select query
-                new String[] { name, mSize }, // args to select query
-                null,
-                null,
-                null,
-                null);
+        Cursor result;
+        try {
+            result = db.query(CacheDb.TABLE_NAME,
+                    new String[] { CacheDb.COLUMN_PREVIEW_BITMAP }, // cols to return
+                    mCachedSelectQuery, // select query
+                    new String[] { name, mSize }, // args to select query
+                    null,
+                    null,
+                    null,
+                    null);
+        } catch (SQLiteDiskIOException e) {
+            recreateDb();
+            return null;
+        }
         if (result.getCount() > 0) {
             result.moveToFirst();
             byte[] blob = result.getBlob(0);

From 33f4c2df28228f93d96e9b1d1bfad52d715d917b Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Thu, 9 Jan 2014 11:54:15 -0500
Subject: [PATCH 095/147] first backup should save things from the beginning of
 time

Bug: 12455866
Change-Id: Ie9a97ed4110e7b1ded21f609179b5d6ee7f0ead5
---
 src/com/android/launcher3/LauncherBackupHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 2a5ed69615..a081c21911 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -297,7 +297,7 @@ public class LauncherBackupHelper implements BackupHelper {
                 Key key = getKey(Key.FAVORITE, id);
                 keys.add(key);
                 currentIds.add(keyToBackupKey(key));
-                if (updateTime > in.t) {
+                if (updateTime >= in.t) {
                     byte[] blob = packFavorite(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }
@@ -365,7 +365,7 @@ public class LauncherBackupHelper implements BackupHelper {
                 Key key = getKey(Key.SCREEN, id);
                 keys.add(key);
                 currentIds.add(keyToBackupKey(key));
-                if (updateTime > in.t) {
+                if (updateTime >= in.t) {
                     byte[] blob = packScreen(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }

From 8661761cb691d9bed446b87d55a4fa7043a3aa95 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Thu, 9 Jan 2014 11:08:37 -0500
Subject: [PATCH 096/147] better support for multiple files

don't exit on error, just log.
new verbose flag to print more information

Change-Id: I5c4895a837cb8a31901aabceade3ab976abf4af0
---
 util/com/android/launcher3/DecoderRing.java | 29 ++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/util/com/android/launcher3/DecoderRing.java b/util/com/android/launcher3/DecoderRing.java
index 7098e189dd..86431d9b7b 100644
--- a/util/com/android/launcher3/DecoderRing.java
+++ b/util/com/android/launcher3/DecoderRing.java
@@ -86,6 +86,7 @@ class DecoderRing {
         boolean fromLogs = false;
         int skip = 0;
         List<File> files = new LinkedList<File>();
+        boolean verbose = false;
 
         for (int i = 0; i < args.length; i++) {
             if ("-k".equals(args[i])) {
@@ -108,6 +109,8 @@ class DecoderRing {
                 }
             } else if ("-x".equals(args[i])) {
                 extractImages = true;
+            } else if ("-v".equals(args[i])) {
+                verbose = true;
             } else if ("-L".equals(args[i])) {
                 fromLogs = true;
             } else if (args[i] != null && !args[i].startsWith("-")) {
@@ -123,7 +126,7 @@ class DecoderRing {
             usage(args);
         }
 
-        if (files.size() > 1) {
+        if (files.size() > 1 && defaultType != null) {
             System.err.println("Explicit type ignored for multiple files.");
             defaultType = null;
         }
@@ -136,8 +139,13 @@ class DecoderRing {
             Class type = null;
             if (defaultType == null) {
                 Key key = decodeKey(source.getName().getBytes(), fromLogs);
-                type = TYPES[key.type];
-                System.err.println("This is a " + type.getSimpleName() + " backup");
+                if (key != null) {
+                    type = TYPES[key.type];
+                    if (verbose) {
+                        System.err.println(source.getName() + " is a " + type.getSimpleName());
+                        System.out.println(key.toString());
+                    }
+                }
             } else {
                 type = defaultType;
             }
@@ -178,12 +186,14 @@ class DecoderRing {
             byte[] payload = byteStream.toByteArray();
             if (type == Key.class) {
                 proto = decodeKey(payload, fromLogs);
-            } else {
+            } else if (type != null) {
                 proto = decodeBackupData(payload, type, fromLogs);
             }
 
             // Generic string output
-            System.out.println(proto.toString());
+            if (proto != null) {
+                System.out.println(proto.toString());
+            }
 
             if (extractImages) {
                 String prefix = "stdin";
@@ -262,7 +272,7 @@ class DecoderRing {
                 byte[] rawKey = DatatypeConverter.parseBase64Binary(encodedKey);
                 if (rawKey[0] != 'L' || rawKey[1] != ':') {
                     System.err.println(encodedKey + " is not a launcher backup key.");
-                    System.exit(1);
+                    return null;
                 }
                 encodedKey = new String(rawKey, 2, rawKey.length - 2);
             }
@@ -270,16 +280,16 @@ class DecoderRing {
             key = Key.parseFrom(keyProtoData);
         } catch (InvalidProtocolBufferNanoException protoException) {
             System.err.println("failed to extract key from filename: " + protoException);
-            System.exit(1);
+            return null;
         } catch (IllegalArgumentException base64Exception) {
             System.err.println("failed to extract key from filename: " + base64Exception);
-            System.exit(1);
+            return null;
         }
 
         // keys are self-checked
         if (key.checksum != checkKey(key)) {
             System.err.println("key ckecksum failed");
-            System.exit(1);
+            return null;
         }
         return key;
     }
@@ -323,6 +333,7 @@ class DecoderRing {
         System.err.println("\t-w\tdecode a widget");
         System.err.println("\t-S b\tskip b bytes");
         System.err.println("\t-x\textract image data to files");
+        System.err.println("\t-v\tprint key type data, as well as payload");
         System.err.println("\t-l\texpect data from logcat, instead of the local transport");
         System.err.println("\tfilename\tread from filename, not stdin");
         System.exit(1);

From b54a5989a21bef4e6bac304591ca4030bfbe709d Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 8 Jan 2014 15:21:04 -0800
Subject: [PATCH 097/147] Adding optional first run activity to Launcher

Change-Id: I146927d8a065f1cf5ef5cec41c8fb4f9ad09d25c
---
 src/com/android/launcher3/Alarm.java          |  4 --
 src/com/android/launcher3/Launcher.java       | 54 +++++++++++++++----
 .../android/launcher3/OnAlarmListener.java    |  5 ++
 3 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 src/com/android/launcher3/OnAlarmListener.java

diff --git a/src/com/android/launcher3/Alarm.java b/src/com/android/launcher3/Alarm.java
index 91f9bd0913..e9f1fd963a 100644
--- a/src/com/android/launcher3/Alarm.java
+++ b/src/com/android/launcher3/Alarm.java
@@ -78,7 +78,3 @@ public class Alarm implements Runnable{
         return mAlarmPending;
     }
 }
-
-interface OnAlarmListener {
-    public void onAlarm(Alarm alarm);
-}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c05769cfa2..269f53baaa 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -187,6 +187,9 @@ public class Launcher extends Activity
     // Type: int[]
     private static final String RUNTIME_STATE_VIEW_IDS = "launcher.view_ids";
 
+
+    static final String FIRST_RUN_ACTIVITY_DISPLAYED = "launcher.first_run_activity_displayed";
+
     private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
     private static final String TOOLBAR_SEARCH_ICON_METADATA_NAME =
             "com.android.launcher.toolbar_search_icon";
@@ -476,6 +479,7 @@ public class Launcher extends Activity
         // On large interfaces, we want the screen to auto-rotate based on the current orientation
         unlockScreenOrientation(true);
 
+        showFirstRunActivity();
         showFirstRunCling();
     }
 
@@ -497,6 +501,21 @@ public class Launcher extends Activity
     protected void addCustomContentToLeft() {
     }
 
+    /**
+     * To be overridden by subclasses to indicate that there is an activity to launch
+     * before showing the standard launcher experience.
+     */
+    protected boolean hasFirstRunActivity() {
+        return false;
+    }
+
+    /**
+     * To be overridden by subclasses to launch any first run activity
+     */
+    protected Intent getFirstRunActivity() {
+        return null;
+    }
+
     /**
      * Invoked by subclasses to signal a change to the {@link #addCustomContentToLeft} value to
      * ensure the custom content page is added or removed if necessary.
@@ -4206,6 +4225,10 @@ public class Launcher extends Activity
         }
     }
 
+    private boolean shouldRunFirstRunActivity() {
+        return !ActivityManager.isRunningInTestHarness();
+    }
+
     /* Cling related */
     private boolean isClingsEnabled() {
         if (DISABLE_CLINGS) {
@@ -4274,15 +4297,9 @@ public class Launcher extends Activity
             final Runnable cleanUpClingCb = new Runnable() {
                 public void run() {
                     cling.cleanup();
-                    // We should update the shared preferences on a background thread
-                    new AsyncTask<Void, Void, Void>() {
-                        public Void doInBackground(Void ... args) {
-                            SharedPreferences.Editor editor = mSharedPrefs.edit();
-                            editor.putBoolean(flag, true);
-                            editor.commit();
-                            return null;
-                        }
-                    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+                    SharedPreferences.Editor editor = mSharedPrefs.edit();
+                    editor.putBoolean(flag, true);
+                    editor.apply();
                     if (postAnimationCb != null) {
                         postAnimationCb.run();
                     }
@@ -4379,10 +4396,29 @@ public class Launcher extends Activity
         }
     }
 
+    public void showFirstRunActivity() {
+        if (shouldRunFirstRunActivity() && hasFirstRunActivity()
+                && !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false)) {
+            Intent firstRunIntent = getFirstRunActivity();
+            if (firstRunIntent != null) {
+                startActivity(firstRunIntent);
+                markFirstRunActivityShown();
+            }
+        }
+    }
+
+    private void markFirstRunActivityShown() {
+        SharedPreferences.Editor editor = mSharedPrefs.edit();
+        editor.putBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, true);
+        editor.apply();
+    }
+
     public void showFirstRunCling() {
         if (isClingsEnabled() &&
                 !mSharedPrefs.getBoolean(Cling.FIRST_RUN_CLING_DISMISSED_KEY, false) &&
                 !skipCustomClingIfNoAccounts() ) {
+
+
             // If we're not using the default workspace layout, replace workspace cling
             // with a custom workspace cling (usually specified in an overlay)
             // For now, only do this on tablets
diff --git a/src/com/android/launcher3/OnAlarmListener.java b/src/com/android/launcher3/OnAlarmListener.java
new file mode 100644
index 0000000000..b5ef83e839
--- /dev/null
+++ b/src/com/android/launcher3/OnAlarmListener.java
@@ -0,0 +1,5 @@
+package com.android.launcher3;
+
+public interface OnAlarmListener {
+    public void onAlarm(Alarm alarm);
+}

From 16f3ea870aac47292cd6cbe1a4b4343173097aa9 Mon Sep 17 00:00:00 2001
From: Nilesh Agrawal <nileshagrawal@google.com>
Date: Thu, 9 Jan 2014 17:14:01 -0800
Subject: [PATCH 098/147] Allow DISABLE_ALL_APPS to be set using a system
 property.

 - Moving the property to LauncherAppState
 - The property is only read on dogfood builds.

The property can be set using setprop or /data/local.prop

Change-Id: I14c7354efb12edb93f97e81687a6f920cc634e9a
---
 res/values/config.xml                         |  3 ++
 .../launcher3/AppsCustomizePagedView.java     | 14 ++++----
 src/com/android/launcher3/BuildInfo.java      | 32 +++++++++++++++++++
 .../android/launcher3/DeleteDropTarget.java   | 10 +++---
 src/com/android/launcher3/DeviceProfile.java  |  2 +-
 src/com/android/launcher3/DynamicGrid.java    |  2 +-
 src/com/android/launcher3/Folder.java         |  4 +--
 src/com/android/launcher3/Hotseat.java        |  8 ++---
 .../launcher3/InstallShortcutReceiver.java    |  2 +-
 src/com/android/launcher3/Launcher.java       | 13 ++++----
 .../android/launcher3/LauncherAppState.java   | 10 +++++-
 src/com/android/launcher3/LauncherModel.java  |  4 +--
 .../android/launcher3/LauncherProvider.java   |  2 +-
 13 files changed, 74 insertions(+), 32 deletions(-)
 create mode 100644 src/com/android/launcher3/BuildInfo.java

diff --git a/res/values/config.xml b/res/values/config.xml
index 2a08216624..b512ffe67b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -94,4 +94,7 @@
          filter the activities shown in the launcher. Can be empty. -->
     <string name="app_filter_class" translatable="false"></string>
 
+    <!-- Name of a subclass of com.android.launcher3.BuildInfo used to
+         get build information. Can be empty. -->
+    <string name="build_info_class" translatable="false"></string>
 </resources>
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 2865bc5d5c..37cdb9e137 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -199,8 +199,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
     private AccelerateInterpolator mAlphaInterpolator = new AccelerateInterpolator(0.9f);
     private DecelerateInterpolator mLeftScreenAlphaInterpolator = new DecelerateInterpolator(4);
 
-    public static boolean DISABLE_ALL_APPS = false;
-
     // Previews & outlines
     ArrayList<AppsCustomizeAsyncTask> mRunningTasks;
     private static final int sPageSleepDelay = 200;
@@ -427,7 +425,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         int width = MeasureSpec.getSize(widthMeasureSpec);
         int height = MeasureSpec.getSize(heightMeasureSpec);
         if (!isDataReady()) {
-            if ((DISABLE_ALL_APPS || !mApps.isEmpty()) && !mWidgets.isEmpty()) {
+            if ((LauncherAppState.isDisableAllApps() || !mApps.isEmpty()) && !mWidgets.isEmpty()) {
                 setDataIsReady();
                 setMeasuredDimension(width, height);
                 onDataReady(width, height);
@@ -1558,7 +1556,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
     }
 
     public void setApps(ArrayList<AppInfo> list) {
-        if (!DISABLE_ALL_APPS) {
+        if (!LauncherAppState.isDisableAllApps()) {
             mApps = list;
             Collections.sort(mApps, LauncherModel.getAppNameComparator());
             updatePageCountsAndInvalidateData();
@@ -1576,7 +1574,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         }
     }
     public void addApps(ArrayList<AppInfo> list) {
-        if (!DISABLE_ALL_APPS) {
+        if (!LauncherAppState.isDisableAllApps()) {
             addAppsWithoutInvalidate(list);
             updatePageCountsAndInvalidateData();
         }
@@ -1604,7 +1602,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         }
     }
     public void removeApps(ArrayList<AppInfo> appInfos) {
-        if (!DISABLE_ALL_APPS) {
+        if (!LauncherAppState.isDisableAllApps()) {
             removeAppsWithoutInvalidate(appInfos);
             updatePageCountsAndInvalidateData();
         }
@@ -1613,7 +1611,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         // We remove and re-add the updated applications list because it's properties may have
         // changed (ie. the title), and this will ensure that the items will be in their proper
         // place in the list.
-        if (!DISABLE_ALL_APPS) {
+        if (!LauncherAppState.isDisableAllApps()) {
             removeAppsWithoutInvalidate(list);
             addAppsWithoutInvalidate(list);
             updatePageCountsAndInvalidateData();
@@ -1727,4 +1725,4 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
 
         return String.format(getContext().getString(stringId), page + 1, count);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/BuildInfo.java b/src/com/android/launcher3/BuildInfo.java
new file mode 100644
index 0000000000..b49ee0d9b8
--- /dev/null
+++ b/src/com/android/launcher3/BuildInfo.java
@@ -0,0 +1,32 @@
+package com.android.launcher3;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+public class BuildInfo {
+    private static final boolean DBG = false;
+    private static final String TAG = "BuildInfo";
+
+    public boolean isDogfoodBuild() {
+        return false;
+    }
+
+    public static BuildInfo loadByName(String className) {
+        if (TextUtils.isEmpty(className)) return new BuildInfo();
+
+        if (DBG) Log.d(TAG, "Loading BuildInfo: " + className);
+        try {
+            Class<?> cls = Class.forName(className);
+            return (BuildInfo) cls.newInstance();
+        } catch (ClassNotFoundException e) {
+            Log.e(TAG, "Bad BuildInfo class", e);
+        } catch (InstantiationException e) {
+            Log.e(TAG, "Bad BuildInfo class", e);
+        } catch (IllegalAccessException e) {
+            Log.e(TAG, "Bad BuildInfo class", e);
+        } catch (ClassCastException e) {
+            Log.e(TAG, "Bad BuildInfo class", e);
+        }
+        return new BuildInfo();
+    }
+}
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index c76425a5ed..75d906bc20 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -146,12 +146,12 @@ public class DeleteDropTarget extends ButtonDropTarget {
                 return true;
             }
 
-            if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+            if (!LauncherAppState.isDisableAllApps() &&
                     item.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
                 return true;
             }
 
-            if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+            if (!LauncherAppState.isDisableAllApps() &&
                     item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
                     item instanceof AppInfo) {
                 AppInfo appInfo = (AppInfo) info;
@@ -160,7 +160,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
 
             if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
                 item instanceof ShortcutInfo) {
-                if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+                if (LauncherAppState.isDisableAllApps()) {
                     ShortcutInfo shortcutInfo = (ShortcutInfo) info;
                     return (shortcutInfo.flags & AppInfo.DOWNLOADED_FLAG) != 0;
                 } else {
@@ -174,7 +174,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
     @Override
     public void onDragStart(DragSource source, Object info, int dragAction) {
         boolean isVisible = true;
-        boolean useUninstallLabel = !AppsCustomizePagedView.DISABLE_ALL_APPS &&
+        boolean useUninstallLabel = !LauncherAppState.isDisableAllApps() &&
                 isAllAppsApplication(source, info);
         boolean useDeleteLabel = !useUninstallLabel && source.supportsDeleteDropTarget();
 
@@ -264,7 +264,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
     }
 
     private boolean isUninstallFromWorkspace(DragObject d) {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS && isWorkspaceOrFolderApplication(d)) {
+        if (LauncherAppState.isDisableAllApps() && isWorkspaceOrFolderApplication(d)) {
             ShortcutInfo shortcut = (ShortcutInfo) d.dragInfo;
             // Only allow manifest shortcuts to initiate an un-install.
             return !InstallShortcutReceiver.isValidShortcutLaunchIntent(shortcut.intent);
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 67b0933c9a..a236b84db8 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -126,7 +126,7 @@ public class DeviceProfile {
     DeviceProfile(String n, float w, float h, float r, float c,
                   float is, float its, float hs, float his) {
         // Ensure that we have an odd number of hotseat items (since we need to place all apps)
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS && hs % 2 == 0) {
+        if (!LauncherAppState.isDisableAllApps() && hs % 2 == 0) {
             throw new RuntimeException("All Device Profiles must have an odd number of hotseat spaces");
         }
 
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 22928ccf3a..3aced1faea 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -56,7 +56,7 @@ public class DynamicGrid {
         DisplayMetrics dm = resources.getDisplayMetrics();
         ArrayList<DeviceProfile> deviceProfiles =
                 new ArrayList<DeviceProfile>();
-        boolean hasAA = !AppsCustomizePagedView.DISABLE_ALL_APPS;
+        boolean hasAA = !LauncherAppState.isDisableAllApps();
         DEFAULT_ICON_SIZE_PX = pxFromDp(DEFAULT_ICON_SIZE_DP, dm);
         // Our phone profiles include the bar sizes in each orientation
         deviceProfiles.add(new DeviceProfile("Super Short Stubby",
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 758ee5baba..a98d121a6c 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -146,7 +146,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         Resources res = getResources();
         mMaxCountX = (int) grid.numColumns;
         // Allow scrolling folders when DISABLE_ALL_APPS is true.
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             mMaxCountY = mMaxNumItems = Integer.MAX_VALUE;
         } else {
             mMaxCountY = (int) grid.numRows;
@@ -1018,7 +1018,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         int contentAreaHeightSpec = MeasureSpec.makeMeasureSpec(getContentAreaHeight(),
                 MeasureSpec.EXACTLY);
 
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             // Don't cap the height of the content to allow scrolling.
             mContent.setFixedSize(getContentAreaWidth(), mContent.getDesiredHeight());
         } else {
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 094e188c77..59d60e3812 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -95,7 +95,7 @@ public class Hotseat extends FrameLayout {
         return hasVerticalHotseat() ? (mContent.getCountY() - (rank + 1)) : 0;
     }
     public boolean isAllAppsButtonRank(int rank) {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             return false;
         } else {
             return rank == mAllAppsButtonRank;
@@ -142,7 +142,7 @@ public class Hotseat extends FrameLayout {
     void resetLayout() {
         mContent.removeAllViewsInLayout();
 
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (!LauncherAppState.isDisableAllApps()) {
             // Add the Apps button
             Context context = getContext();
 
@@ -189,7 +189,7 @@ public class Hotseat extends FrameLayout {
     void addAllAppsFolder(IconCache iconCache,
             ArrayList<AppInfo> allApps, ArrayList<ComponentName> onWorkspace,
             Launcher launcher, Workspace workspace) {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             FolderInfo fi = new FolderInfo();
 
             fi.cellX = getCellXFromOrder(mAllAppsButtonRank);
@@ -219,7 +219,7 @@ public class Hotseat extends FrameLayout {
     }
 
     void addAppsToAllAppsFolder(ArrayList<AppInfo> apps) {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             View v = mContent.getChildAt(getCellXFromOrder(mAllAppsButtonRank), getCellYFromOrder(mAllAppsButtonRank));
             FolderIcon fi = null;
 
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 1ff94720ba..7ab4e0477c 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -272,7 +272,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
                 final Intent intent = pendingInfo.launchIntent;
                 final String name = pendingInfo.name;
 
-                if (AppsCustomizePagedView.DISABLE_ALL_APPS && !isValidShortcutLaunchIntent(intent)) {
+                if (LauncherAppState.isDisableAllApps() && !isValidShortcutLaunchIntent(intent)) {
                     if (DBG) Log.d(TAG, "Ignoring shortcut with launchIntent:" + intent);
                     continue;
                 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c05769cfa2..8ef28de711 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -155,6 +155,7 @@ public class Launcher extends Activity
     // adb shell setprop log.tag.PROPERTY_NAME [VERBOSE | SUPPRESS]
     static final String FORCE_ENABLE_ROTATION_PROPERTY = "launcher_force_rotate";
     static final String DUMP_STATE_PROPERTY = "launcher_dump_state";
+    static final String DISABLE_ALL_APPS_PROPERTY = "launcher_noallapps";
 
     // The Intent extra that defines whether to ignore the launch animation
     static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =
@@ -365,7 +366,7 @@ public class Launcher extends Activity
 
     private Stats mStats;
 
-    private static boolean isPropertyEnabled(String propertyName) {
+    static boolean isPropertyEnabled(String propertyName) {
         return Log.isLoggable(propertyName, Log.VERBOSE);
     }
 
@@ -2906,7 +2907,7 @@ public class Launcher extends Activity
         // Shrink workspaces away if going to AppsCustomize from workspace
         Animator workspaceAnim =
                 mWorkspace.getChangeStateAnimation(Workspace.State.SMALL, animated);
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS
+        if (!LauncherAppState.isDisableAllApps()
                 || contentType == AppsCustomizePagedView.ContentType.Widgets) {
             // Set the content type for the all apps/widgets space
             mAppsCustomizeTabHost.setContentTypeImmediate(contentType);
@@ -3777,7 +3778,7 @@ public class Launcher extends Activity
         // Remove the extra empty screen
         mWorkspace.removeExtraEmptyScreen(false, null);
 
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+        if (!LauncherAppState.isDisableAllApps() &&
                 addedApps != null && mAppsCustomizeContent != null) {
             mAppsCustomizeContent.addApps(addedApps);
         }
@@ -4044,7 +4045,7 @@ public class Launcher extends Activity
      * Implementation of the method from LauncherModel.Callbacks.
      */
     public void bindAllApplications(final ArrayList<AppInfo> apps) {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             if (mIntentsOnWorkspaceFromUpgradePath != null) {
                 if (LauncherModel.UPGRADE_USE_MORE_APPS_FOLDER) {
                     getHotseat().addAllAppsFolder(mIconCache, apps,
@@ -4084,7 +4085,7 @@ public class Launcher extends Activity
             mWorkspace.updateShortcuts(apps);
         }
 
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+        if (!LauncherAppState.isDisableAllApps() &&
                 mAppsCustomizeContent != null) {
             mAppsCustomizeContent.updateApps(apps);
         }
@@ -4121,7 +4122,7 @@ public class Launcher extends Activity
         mDragController.onAppsRemoved(packageNames, appInfos);
 
         // Update AllApps
-        if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+        if (!LauncherAppState.isDisableAllApps() &&
                 mAppsCustomizeContent != null) {
             mAppsCustomizeContent.removeApps(appInfos);
         }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 84a1d04118..5e41fcad05 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -30,9 +30,10 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
     private static final String TAG = "LauncherAppState";
     private static final String SHARED_PREFERENCES_KEY = "com.android.launcher3.prefs";
 
+    private final AppFilter mAppFilter;
+    private final BuildInfo mBuildInfo;
     private LauncherModel mModel;
     private IconCache mIconCache;
-    private AppFilter mAppFilter;
     private WidgetPreviewLoader.CacheDb mWidgetPreviewCacheDb;
     private boolean mIsScreenLarge;
     private float mScreenDensity;
@@ -87,6 +88,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
         mIconCache = new IconCache(sContext);
 
         mAppFilter = AppFilter.loadByName(sContext.getString(R.string.app_filter_class));
+        mBuildInfo = BuildInfo.loadByName(sContext.getString(R.string.build_info_class));
         mModel = new LauncherModel(this, mIconCache, mAppFilter);
 
         // Register intent receivers
@@ -230,4 +232,10 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
     public void onAvailableSizeChanged(DeviceProfile grid) {
         Utilities.setIconSize(grid.iconSizePx);
     }
+
+    public static boolean isDisableAllApps() {
+        // Returns false on non-dogfood builds.
+        return getInstance().mBuildInfo.isDogfoodBuild() &&
+                Launcher.isPropertyEnabled(Launcher.DISABLE_ALL_APPS_PROPERTY);
+    }
 }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b2cfb2456a..0c716a1f08 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1466,7 +1466,7 @@ public class LauncherModel extends BroadcastReceiver {
                 sBgDbIconCache.clear();
             }
 
-            if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+            if (LauncherAppState.isDisableAllApps()) {
                 // Ensure that all the applications that are in the system are
                 // represented on the home screen.
                 if (!UPGRADE_USE_MORE_APPS_FOLDER || !isUpgrade) {
@@ -2564,7 +2564,7 @@ public class LauncherModel extends BroadcastReceiver {
             if (added != null) {
                 // Ensure that we add all the workspace applications to the db
                 Callbacks cb = mCallbacks != null ? mCallbacks.get() : null;
-                if (!AppsCustomizePagedView.DISABLE_ALL_APPS) {
+                if (!LauncherAppState.isDisableAllApps()) {
                     addAndBindAddedApps(context, new ArrayList<ItemInfo>(), cb, added);
                 } else {
                     final ArrayList<ItemInfo> addedInfos = new ArrayList<ItemInfo>(added);
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 28efd01487..1fb58cc991 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -288,7 +288,7 @@ public class LauncherProvider extends ContentProvider {
     }
 
     private static int getDefaultWorkspaceResourceId() {
-        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+        if (LauncherAppState.isDisableAllApps()) {
             return R.xml.default_workspace_no_all_apps;
         } else {
             return R.xml.default_workspace;

From 0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Fri, 10 Jan 2014 13:24:55 -0500
Subject: [PATCH 099/147] Quick patch for b/12446428.

Bug: 12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0
---
 src/com/android/launcher3/Folder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 758ee5baba..a9a161ab80 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1107,7 +1107,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 if (getItemCount() <= 1) {
                     // Remove the folder
                     LauncherModel.deleteItemFromDatabase(mLauncher, mInfo);
-                    cellLayout.removeView(mFolderIcon);
+                    if (cellLayout != null) {
+                        // b/12446428 -- sometimes the cell layout has already gone away?
+                        cellLayout.removeView(mFolderIcon);
+                    }
                     if (mFolderIcon instanceof DropTarget) {
                         mDragController.removeDropTarget((DropTarget) mFolderIcon);
                     }

From d502404a44fb7c4ea739622d7f8bdd2a764d97a1 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Thu, 9 Jan 2014 15:01:33 -0500
Subject: [PATCH 100/147] New launcher2 icon migration algorithm.

The user will be able to request "icon migration", which is
not a direct mapping of the old workspace, but rather
follows this heuristic for bringing the user's favorite
icons (by dint of their existence on the workspace) into
Launcher3:

Workspace shortcuts are placed in lexicographic order on the workspace
starting at screen 0 (leaving the bottom row of screen 0 empty to make
sure there's room to move things around). Folders are preserved and
their contents sorted. Duplicate icons (that is, shortcuts
with the same intent, pursuant to some cleanups) are removed.

Hotseat icons are migrated in their original place, unless their new
location is not accommodated by the hotseat (i.e. the L3 hotseat is
too small on this device), in which case they're treated like any
other shortcut and tossed into the workspace.

To test, turn on Launcher.ENABLE_DEBUG_INTENTS and then:

$ adb shell am broadcast -a com.android.launcher3.action.DELETE_DATABASE
$ adb shell am broadcast -a com.android.launcher3.action.MIGRATE_DATABASE

Bug: 12416411
Change-Id: Ia5c56f36c11455867ea20a39f70210f595020a87
---
 AndroidManifest.xml                           |   1 +
 src/com/android/launcher3/Launcher.java       |  20 ++
 src/com/android/launcher3/LauncherModel.java  |  32 ++-
 .../android/launcher3/LauncherProvider.java   | 224 +++++++++++++++++-
 4 files changed, 271 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e27e6f27c..36fa4c190a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
+    <uses-sdk android:targetSdkVersion="19" android:minSdkVersion="16"/>
 
     <permission
         android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE"
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c05769cfa2..ceb31b001d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -130,6 +130,8 @@ public class Launcher extends Activity
     static final boolean DEBUG_RESUME_TIME = false;
     static final boolean DEBUG_DUMP_LOG = false;
 
+    static final boolean ENABLE_DEBUG_INTENTS = false; // allow DebugIntents to run
+
     private static final int REQUEST_CREATE_SHORTCUT = 1;
     private static final int REQUEST_CREATE_APPWIDGET = 5;
     private static final int REQUEST_PICK_APPLICATION = 6;
@@ -1551,6 +1553,15 @@ public class Launcher extends Activity
             } else if (Intent.ACTION_USER_PRESENT.equals(action)) {
                 mUserPresent = true;
                 updateRunning();
+            } else if (ENABLE_DEBUG_INTENTS && DebugIntents.DELETE_DATABASE.equals(action)) {
+                mModel.resetLoadedState(false, true);
+                mModel.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+                        LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE);
+            } else if (ENABLE_DEBUG_INTENTS && DebugIntents.MIGRATE_DATABASE.equals(action)) {
+                mModel.resetLoadedState(false, true);
+                mModel.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+                        LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE
+                                | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS);
             }
         }
     };
@@ -1563,6 +1574,10 @@ public class Launcher extends Activity
         final IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_SCREEN_OFF);
         filter.addAction(Intent.ACTION_USER_PRESENT);
+        if (ENABLE_DEBUG_INTENTS) {
+            filter.addAction(DebugIntents.DELETE_DATABASE);
+            filter.addAction(DebugIntents.MIGRATE_DATABASE);
+        }
         registerReceiver(mReceiver, filter);
         FirstFrameAnimatorHelper.initializeDrawListener(getWindow().getDecorView());
         mAttached = true;
@@ -4667,3 +4682,8 @@ interface LauncherTransitionable {
     void onLauncherTransitionStep(Launcher l, float t);
     void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace);
 }
+
+interface DebugIntents {
+    static final String DELETE_DATABASE = "com.android.launcher3.action.DELETE_DATABASE";
+    static final String MIGRATE_DATABASE = "com.android.launcher3.action.MIGRATE_DATABASE";
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b2cfb2456a..460ab5db2f 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -75,6 +75,10 @@ public class LauncherModel extends BroadcastReceiver {
     // false = strew non-workspace apps across the workspace on upgrade
     public static final boolean UPGRADE_USE_MORE_APPS_FOLDER = false;
 
+    public static final int LOADER_FLAG_NONE = 0;
+    public static final int LOADER_FLAG_CLEAR_WORKSPACE = 1 << 0;
+    public static final int LOADER_FLAG_MIGRATE_SHORTCUTS = 1 << 1;
+
     private static final int ITEMS_CHUNK = 6; // batch size for the workspace icons
     private static final long INVALID_SCREEN_ID = -1L;
     private final boolean mAppsCanBeOnRemoveableStorage;
@@ -1193,6 +1197,10 @@ public class LauncherModel extends BroadcastReceiver {
     }
 
     public void startLoader(boolean isLaunching, int synchronousBindPage) {
+        startLoader(isLaunching, synchronousBindPage, LOADER_FLAG_NONE);
+    }
+
+    public void startLoader(boolean isLaunching, int synchronousBindPage, int loadFlags) {
         synchronized (mLock) {
             if (DEBUG_LOADERS) {
                 Log.d(TAG, "startLoader isLaunching=" + isLaunching);
@@ -1207,7 +1215,7 @@ public class LauncherModel extends BroadcastReceiver {
                 // If there is already one running, tell it to stop.
                 // also, don't downgrade isLaunching if we're already running
                 isLaunching = isLaunching || stopLoaderLocked();
-                mLoaderTask = new LoaderTask(mApp.getContext(), isLaunching);
+                mLoaderTask = new LoaderTask(mApp.getContext(), isLaunching, loadFlags);
                 if (synchronousBindPage != PagedView.INVALID_RESTORE_PAGE
                         && mAllAppsLoaded && mWorkspaceLoaded) {
                     mLoaderTask.runBindSynchronousPage(synchronousBindPage);
@@ -1298,13 +1306,15 @@ public class LauncherModel extends BroadcastReceiver {
         private boolean mIsLoadingAndBindingWorkspace;
         private boolean mStopped;
         private boolean mLoadAndBindStepFinished;
+        private int mFlags;
 
         private HashMap<Object, CharSequence> mLabelCache;
 
-        LoaderTask(Context context, boolean isLaunching) {
+        LoaderTask(Context context, boolean isLaunching, int flags) {
             mContext = context;
             mIsLaunching = isLaunching;
             mLabelCache = new HashMap<Object, CharSequence>();
+            mFlags = flags;
         }
 
         boolean isLaunching() {
@@ -1651,7 +1661,7 @@ public class LauncherModel extends BroadcastReceiver {
             }
         }
 
-        /** Returns whether this is an upgradge path */
+        /** Returns whether this is an upgrade path */
         private boolean loadWorkspace() {
             // Log to disk
             Launcher.addDumpLog(TAG, "11683562 - loadWorkspace()", true);
@@ -1669,8 +1679,20 @@ public class LauncherModel extends BroadcastReceiver {
             int countX = (int) grid.numColumns;
             int countY = (int) grid.numRows;
 
-            // Make sure the default workspace is loaded, if needed
-            LauncherAppState.getLauncherProvider().loadDefaultFavoritesIfNecessary(0);
+            if ((mFlags & LOADER_FLAG_CLEAR_WORKSPACE) != 0) {
+                Launcher.addDumpLog(TAG, "loadWorkspace: resetting launcher database", true);
+                LauncherAppState.getLauncherProvider().deleteDatabase();
+            }
+
+            if ((mFlags & LOADER_FLAG_MIGRATE_SHORTCUTS) != 0) {
+                // append the user's Launcher2 shortcuts
+                Launcher.addDumpLog(TAG, "loadWorkspace: migrating from launcher2", true);
+                LauncherAppState.getLauncherProvider().migrateLauncher2Shortcuts();
+            } else {
+                // Make sure the default workspace is loaded
+                Launcher.addDumpLog(TAG, "loadWorkspace: loading default favorites", false);
+                LauncherAppState.getLauncherProvider().loadDefaultFavoritesIfNecessary(0);
+            }
 
             // Check if we need to do any upgrade-path logic
             // (Includes having just imported default favorites)
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 28efd01487..3cacd6c704 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -55,9 +55,11 @@ import com.android.launcher3.config.ProviderConfig;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 public class LauncherProvider extends ContentProvider {
@@ -72,7 +74,7 @@ public class LauncherProvider extends ContentProvider {
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
     // Should we attempt to load anything from the com.android.launcher2 provider?
-    static final boolean IMPORT_LAUNCHER2_DATABASE = true;
+    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";
@@ -133,6 +135,9 @@ public class LauncherProvider extends ContentProvider {
 
     private static long dbInsertAndCheck(DatabaseHelper helper,
             SQLiteDatabase db, String table, String nullColumnHack, ContentValues values) {
+        if (values == null) {
+            throw new RuntimeException("Error: attempting to insert null values");
+        }
         if (!values.containsKey(LauncherSettings.Favorites._ID)) {
             throw new RuntimeException("Error: attempting to add item without specifying an id");
         }
@@ -287,6 +292,11 @@ public class LauncherProvider extends ContentProvider {
         }
     }
 
+    public void migrateLauncher2Shortcuts() {
+        mOpenHelper.migrateLauncher2Shortcuts(mOpenHelper.getWritableDatabase(),
+                LauncherSettings.Favorites.OLD_CONTENT_URI);
+    }
+
     private static int getDefaultWorkspaceResourceId() {
         if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
             return R.xml.default_workspace_no_all_apps;
@@ -306,6 +316,15 @@ public class LauncherProvider extends ContentProvider {
         return !isTablet && IMPORT_LAUNCHER2_DATABASE;
     }
 
+    public void deleteDatabase() {
+        // Are you sure? (y/n)
+        final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        final String dbFile = db.getPath();
+        mOpenHelper.close();
+        SQLiteDatabase.deleteDatabase(new File(dbFile));
+        mOpenHelper = new DatabaseHelper(getContext());
+    }
+
     private static class DatabaseHelper extends SQLiteOpenHelper {
         private static final String TAG_FAVORITES = "favorites";
         private static final String TAG_FAVORITE = "favorite";
@@ -1431,6 +1450,209 @@ public class LauncherProvider extends ContentProvider {
             }
             return id;
         }
+
+        public void migrateLauncher2Shortcuts(SQLiteDatabase db, Uri uri) {
+            final ContentResolver resolver = mContext.getContentResolver();
+            Cursor c = null;
+            int count = 0;
+            int curScreen = 0;
+
+            try {
+                c = resolver.query(uri, null, null, null, "title ASC");
+            } catch (Exception e) {
+                // Ignore
+            }
+
+
+            // We already have a favorites database in the old provider
+            if (c != null) {
+                try {
+                    if (c.getCount() > 0) {
+                        final int idIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites._ID);
+                        final int intentIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.INTENT);
+                        final int titleIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE);
+                        final int iconTypeIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_TYPE);
+                        final int iconIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON);
+                        final int iconPackageIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_PACKAGE);
+                        final int iconResourceIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_RESOURCE);
+                        final int containerIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CONTAINER);
+                        final int itemTypeIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ITEM_TYPE);
+                        final int screenIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SCREEN);
+                        final int cellXIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX);
+                        final int cellYIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY);
+                        final int uriIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.URI);
+                        final int displayModeIndex
+                                = c.getColumnIndexOrThrow(LauncherSettings.Favorites.DISPLAY_MODE);
+
+                        int i = 0;
+                        int curX = 0;
+                        int curY = 0;
+
+                        final LauncherAppState app = LauncherAppState.getInstance();
+                        final DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+                        final int width = (int) grid.numColumns;
+                        final int height = (int) grid.numRows;
+                        final int hotseatWidth = (int) grid.numHotseatIcons;
+
+                        final HashSet<String> seenIntents = new HashSet<String>(c.getCount());
+
+                        final ContentValues[] rows = new ContentValues[c.getCount()];
+
+                        while (c.moveToNext()) {
+                            final int itemType = c.getInt(itemTypeIndex);
+                            if (itemType != Favorites.ITEM_TYPE_APPLICATION
+                                    && itemType != Favorites.ITEM_TYPE_SHORTCUT
+                                    && itemType != Favorites.ITEM_TYPE_FOLDER) {
+                                continue;
+                            }
+
+                            final int cellX = c.getInt(cellXIndex);
+                            final int cellY = c.getInt(cellYIndex);
+                            final int screen = c.getInt(screenIndex);
+                            int container = c.getInt(containerIndex);
+                            final String intentStr = c.getString(intentIndex);
+                            Launcher.addDumpLog(TAG, "migrating \""
+                                + c.getString(titleIndex) + "\": " + intentStr, true);
+
+                            if (itemType != Favorites.ITEM_TYPE_FOLDER) {
+                                if (TextUtils.isEmpty(intentStr)) {
+                                    // no intent? no icon
+                                    Launcher.addDumpLog(TAG, "skipping empty intent", true);
+                                    continue;
+                                } else {
+                                    try {
+                                        // Canonicalize
+                                        final Intent intent = Intent.parseUri(intentStr, 0);
+                                        // the Play Store sets the package parameter, but Launcher
+                                        // does not, so we clear that out to keep them the same
+                                        intent.setPackage(null);
+                                        final String key = intent.toUri(0);
+                                        if (seenIntents.contains(key)) {
+                                            Launcher.addDumpLog(TAG, "skipping duplicate", true);
+                                            continue;
+                                        } else {
+                                            seenIntents.add(key);
+                                        }
+                                    } catch (URISyntaxException e) {
+                                        // bogus intent?
+                                        Launcher.addDumpLog(TAG,
+                                                "skipping invalid intent uri", true);
+                                        continue;
+                                    }
+                                }
+                            }
+
+                            ContentValues values = new ContentValues(c.getColumnCount());
+                            values.put(LauncherSettings.Favorites._ID, c.getInt(idIndex));
+                            values.put(LauncherSettings.Favorites.INTENT, intentStr);
+                            values.put(LauncherSettings.Favorites.TITLE, c.getString(titleIndex));
+                            values.put(LauncherSettings.Favorites.ICON_TYPE,
+                                    c.getInt(iconTypeIndex));
+                            values.put(LauncherSettings.Favorites.ICON, c.getBlob(iconIndex));
+                            values.put(LauncherSettings.Favorites.ICON_PACKAGE,
+                                    c.getString(iconPackageIndex));
+                            values.put(LauncherSettings.Favorites.ICON_RESOURCE,
+                                    c.getString(iconResourceIndex));
+                            values.put(LauncherSettings.Favorites.ITEM_TYPE, itemType);
+                            values.put(LauncherSettings.Favorites.APPWIDGET_ID, -1);
+                            values.put(LauncherSettings.Favorites.URI, c.getString(uriIndex));
+                            values.put(LauncherSettings.Favorites.DISPLAY_MODE,
+                                    c.getInt(displayModeIndex));
+
+                            if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
+                                    && screen >= hotseatWidth) {
+                                // no room for you in the hotseat? it's off to the desktop with you
+                                container = Favorites.CONTAINER_DESKTOP;
+                            }
+
+                            if (container != LauncherSettings.Favorites.CONTAINER_DESKTOP) {
+                                // In a folder or in the hotseat, preserve position
+                                values.put(LauncherSettings.Favorites.SCREEN, screen);
+                                values.put(LauncherSettings.Favorites.CELLX, cellX);
+                                values.put(LauncherSettings.Favorites.CELLY, cellY);
+                            } else {
+                                values.put(LauncherSettings.Favorites.SCREEN, curScreen);
+                                values.put(LauncherSettings.Favorites.CELLX, curX);
+                                values.put(LauncherSettings.Favorites.CELLY, curY);
+                                curX = (curX + 1) % width;
+                                if (curX == 0) {
+                                    curY = (curY + 1);
+                                }
+                                // Leave the last row of icons blank on screen 0
+                                if (curScreen == 0 && curY == height - 1 || curY == height) {
+                                    curScreen = (int) generateNewScreenId();
+                                    curY = 0;
+                                }
+                            }
+
+                            values.put(LauncherSettings.Favorites.CONTAINER, container);
+
+                            rows[i++] = values;
+                        }
+
+                        if (i > 0) {
+                            db.beginTransaction();
+                            try {
+                                final int N = rows.length;
+                                for (i = 0; i < N; i++) {
+                                    if (rows[i] == null) continue;
+                                    if (dbInsertAndCheck(this, db, TABLE_FAVORITES, null, rows[i])
+                                            < 0) {
+                                        return;
+                                    } else {
+                                        count++;
+                                    }
+                                }
+                                db.setTransactionSuccessful();
+                            } finally {
+                                db.endTransaction();
+                            }
+                        }
+
+                        db.beginTransaction();
+                        try {
+                            for (i=0; i<=curScreen; i++) {
+                                final ContentValues values = new ContentValues();
+                                values.put(LauncherSettings.WorkspaceScreens._ID, i);
+                                values.put(LauncherSettings.WorkspaceScreens.SCREEN_RANK, i);
+                                if (dbInsertAndCheck(this, db, TABLE_WORKSPACE_SCREENS, null, values)
+                                        < 0) {
+                                    return;
+                                }
+                            }
+                            db.setTransactionSuccessful();
+                        } finally {
+                            db.endTransaction();
+                        }
+                    }
+                } finally {
+                    c.close();
+                }
+            }
+
+            Launcher.addDumpLog(TAG, "migrated " + count + " icons from Launcher2 into "
+                    + (curScreen+1) + " screens", true);
+
+            // ensure that new screens are created to hold these icons
+            setFlagJustLoadedOldDb();
+
+            // Update max IDs; very important since we just grabbed IDs from another database
+            mMaxItemId = initializeMaxItemId(db);
+            mMaxScreenId = initializeMaxScreenId(db);
+            if (LOGD) Log.d(TAG, "mMaxItemId: " + mMaxItemId + " mMaxScreenId: " + mMaxScreenId);
+        }
     }
 
     /**

From a694524047fda0a51dede4eefb1201a598d2d3a7 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 8 Jan 2014 14:04:34 -0800
Subject: [PATCH 101/147] Adding migration Clings. (Bug 11973614)

- Refactoring Launcher cling code out to LauncherClings.

Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
---
 proguard.flags                                |   3 +
 res/layout-port/launcher.xml                  |  10 +
 res/layout-port/migration_cling.xml           |  93 ++++
 res/layout-port/migration_workspace_cling.xml |  70 +++
 res/values/strings.xml                        |   8 +
 .../launcher3/AppsCustomizeTabHost.java       |   2 +-
 src/com/android/launcher3/Cling.java          |  79 +++-
 src/com/android/launcher3/DeviceProfile.java  |   8 +
 src/com/android/launcher3/DragLayer.java      |   3 +-
 src/com/android/launcher3/Folder.java         |   4 +-
 src/com/android/launcher3/Launcher.java       | 419 ++++-------------
 src/com/android/launcher3/LauncherClings.java | 444 ++++++++++++++++++
 src/com/android/launcher3/LauncherModel.java  |  13 +-
 src/com/android/launcher3/Workspace.java      |   4 +-
 14 files changed, 812 insertions(+), 348 deletions(-)
 create mode 100644 res/layout-port/migration_cling.xml
 create mode 100644 res/layout-port/migration_workspace_cling.xml
 create mode 100644 src/com/android/launcher3/LauncherClings.java

diff --git a/proguard.flags b/proguard.flags
index 9b59b217ec..a922e919d2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -8,6 +8,9 @@
   public void onClickAllAppsButton(android.view.View);
   public void onClickAppMarketButton(android.view.View);
   public void dismissFirstRunCling(android.view.View);
+  public void dismissMigrationClingCopyApps(android.view.View);
+  public void dismissMigrationClingUseDefault(android.view.View);
+  public void dismissMigrationWorkspaceCling(android.view.View);
   public void dismissWorkspaceCling(android.view.View);
   public void dismissAllAppsCling(android.view.View);
 }
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 2b3cf81a48..74005348cf 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -73,6 +73,16 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
+        <include layout="@layout/migration_cling"
+            android:id="@+id/migration_cling"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+        <include layout="@layout/migration_workspace_cling"
+            android:id="@+id/migration_workspace_cling"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
         <include layout="@layout/workspace_cling"
             android:id="@+id/workspace_cling"
             android:layout_width="match_parent"
diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml
new file mode 100644
index 0000000000..36bbab8daf
--- /dev/null
+++ b/res/layout-port/migration_cling.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_portrait">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:orientation="vertical">
+            <TextView
+                style="@style/ClingAltTitleText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:layout_marginBottom="10dp"
+                android:gravity="center"
+                android:text="@string/first_run_cling_title" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_up" />
+            <LinearLayout
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/migration_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/migration_cling_description" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginBottom="25dp"
+            android:orientation="vertical">
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migration_cling_copy_apps"
+                android:onClick="dismissMigrationClingCopyApps" />
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migration_cling_use_default"
+                android:onClick="dismissMigrationClingUseDefault" />
+        </LinearLayout>
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-port/migration_workspace_cling.xml b/res/layout-port/migration_workspace_cling.xml
new file mode 100644
index 0000000000..bc5e22ff12
--- /dev/null
+++ b/res/layout-port/migration_workspace_cling.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_workspace_portrait">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/migration_workspace_cling_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:orientation="vertical">
+            <LinearLayout
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_move_item" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_down" />
+        </LinearLayout>
+
+        <Button
+            style="@style/ClingButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15dp"
+            android:layout_marginRight="20dp"
+            android:layout_gravity="bottom|right"
+            android:onClick="dismissMigrationWorkspaceCling" />
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 361be7b3cc..09120d086c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -216,6 +216,14 @@ s -->
     <string name="first_run_cling_search_bar_hint"></string>
     <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->
     <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string>
+    <!-- The title text for the migration cling [CHAR_LIMIT=30] -->
+    <string name="migration_cling_title">Copy your apps?</string>
+    <!-- The description of what migration does [CHAR_LIMIT=60] -->
+    <string name="migration_cling_description">Import apps and folders from your old Home screens?</string>
+    <!-- The description of the button to migrate apps from another launcher [CHAR_LIMIT=30] -->
+    <string name="migration_cling_copy_apps">COPY APPS</string>
+    <!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] -->
+    <string name="migration_cling_use_default">USE DEFAULT</string>
     <!-- The title text for the workspace cling [CHAR_LIMIT=30] -->
     <string name="workspace_cling_title">Organize your space</string>
     <!-- The description of how to use the workspace [CHAR_LIMIT=70] -->
diff --git a/src/com/android/launcher3/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java
index 697bd7ecff..bb7f045cec 100644
--- a/src/com/android/launcher3/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher3/AppsCustomizeTabHost.java
@@ -407,7 +407,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
         }
 
         // Dismiss the workspace cling
-        l.dismissWorkspaceCling(null);
+        l.getLauncherClings().dismissWorkspaceCling(null);
     }
 
     @Override
diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java
index 3af427139e..185b49b088 100644
--- a/src/com/android/launcher3/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -37,10 +37,6 @@ import android.widget.TextView;
 public class Cling extends FrameLayout implements Insettable, View.OnClickListener,
         View.OnLongClickListener, View.OnTouchListener {
 
-    static final String FIRST_RUN_CLING_DISMISSED_KEY = "cling_gel.first_run.dismissed";
-    static final String WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.workspace.dismissed";
-    static final String FOLDER_CLING_DISMISSED_KEY = "cling_gel.folder.dismissed";
-
     private static String FIRST_RUN_PORTRAIT = "first_run_portrait";
     private static String FIRST_RUN_LANDSCAPE = "first_run_landscape";
 
@@ -49,6 +45,12 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
     private static String WORKSPACE_LARGE = "workspace_large";
     private static String WORKSPACE_CUSTOM = "workspace_custom";
 
+    private static String MIGRATION_PORTRAIT = "migration_portrait";
+    private static String MIGRATION_LANDSCAPE = "migration_landscape";
+
+    private static String MIGRATION_WORKSPACE_PORTRAIT = "migration_workspace_portrait";
+    private static String MIGRATION_WORKSPACE_LANDSCAPE = "migration_workspace_landscape";
+
     private static String FOLDER_PORTRAIT = "folder_portrait";
     private static String FOLDER_LANDSCAPE = "folder_landscape";
     private static String FOLDER_LARGE = "folder_large";
@@ -57,6 +59,8 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
     private static float WORKSPACE_INNER_CIRCLE_RADIUS_DPS = 50;
     private static float WORKSPACE_OUTER_CIRCLE_RADIUS_DPS = 60;
     private static float WORKSPACE_CIRCLE_Y_OFFSET_DPS = 30;
+    private static float MIGRATION_WORKSPACE_INNER_CIRCLE_RADIUS_DPS = 42;
+    private static float MIGRATION_WORKSPACE_OUTER_CIRCLE_RADIUS_DPS = 46;
 
     private Launcher mLauncher;
     private boolean mIsInitialized;
@@ -70,6 +74,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
     private Rect mFocusedHotseatAppBounds;
 
     private Paint mErasePaint;
+    private Paint mBorderPaint;
     private Paint mBubblePaint;
     private Paint mDotPaint;
 
@@ -112,6 +117,10 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
             mErasePaint.setAlpha(0);
             mErasePaint.setAntiAlias(true);
 
+            mBorderPaint = new Paint();
+            mBorderPaint.setColor(0xFFFFFFFF);
+            mBorderPaint.setAntiAlias(true);
+
             int circleColor = getResources().getColor(
                     R.color.first_run_cling_circle_background_color);
             mBubblePaint = new Paint();
@@ -166,13 +175,30 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         }
     }
 
+    void updateMigrationWorkspaceBubblePosition() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        mLauncher.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        // Get the page indicator bounds
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+        Rect pageIndicatorBounds = grid.getWorkspacePageIndicatorBounds(mInsets);
+
+        View bubble = findViewById(R.id.migration_workspace_cling_bubble);
+        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) bubble.getLayoutParams();
+        lp.bottomMargin = grid.heightPx - pageIndicatorBounds.top;
+        bubble.requestLayout();
+    }
+
     void show(boolean animate, int duration) {
         setVisibility(View.VISIBLE);
         setLayerType(View.LAYER_TYPE_HARDWARE, null);
         if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) ||
                 mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
                 mDrawIdentifier.equals(WORKSPACE_LARGE) ||
-                mDrawIdentifier.equals(WORKSPACE_CUSTOM)) {
+                mDrawIdentifier.equals(WORKSPACE_CUSTOM) ||
+                mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
             View content = getContent();
             content.setAlpha(0f);
             content.animate()
@@ -218,7 +244,9 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
 
     void hide(final int duration, final Runnable postCb) {
         if (mDrawIdentifier.equals(FIRST_RUN_PORTRAIT) ||
-                mDrawIdentifier.equals(FIRST_RUN_LANDSCAPE)) {
+                mDrawIdentifier.equals(FIRST_RUN_LANDSCAPE) ||
+                mDrawIdentifier.equals(MIGRATION_PORTRAIT) ||
+                mDrawIdentifier.equals(MIGRATION_LANDSCAPE)) {
             View content = getContent();
             content.animate()
                 .alpha(0f)
@@ -340,7 +368,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                 intent.setComponent(mFocusedHotseatAppComponent);
                 intent.addCategory(Intent.CATEGORY_LAUNCHER);
                 mLauncher.startActivity(intent, null);
-                mLauncher.dismissWorkspaceCling(this);
+                mLauncher.getLauncherClings().dismissWorkspaceCling(this);
             }
         }
     }
@@ -350,7 +378,11 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) ||
                 mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
                 mDrawIdentifier.equals(WORKSPACE_LARGE)) {
-            mLauncher.dismissWorkspaceCling(null);
+            mLauncher.getLauncherClings().dismissWorkspaceCling(null);
+            return true;
+        } else if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
+            mLauncher.getLauncherClings().dismissMigrationWorkspaceCling(null);
             return true;
         }
         return false;
@@ -361,6 +393,11 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         if (mIsInitialized) {
             canvas.save();
 
+            // Get the page indicator bounds
+            LauncherAppState app = LauncherAppState.getInstance();
+            DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+            Rect pageIndicatorBounds = grid.getWorkspacePageIndicatorBounds(mInsets);
+
             // Get the background override if there is one
             if (mBackground == null) {
                 if (mDrawIdentifier.equals(WORKSPACE_CUSTOM)) {
@@ -378,7 +415,9 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                 mBackground.draw(canvas);
             } else if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) ||
                     mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
-                    mDrawIdentifier.equals(WORKSPACE_LARGE)) {
+                    mDrawIdentifier.equals(WORKSPACE_LARGE) ||
+                    mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                    mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
                 // Initialize the draw buffer (to allow punching through)
                 eraseBg = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(),
                         Bitmap.Config.ARGB_8888);
@@ -412,11 +451,13 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                     mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
                     mDrawIdentifier.equals(WORKSPACE_LARGE)) {
                 int offset = DynamicGrid.pxFromDp(WORKSPACE_CIRCLE_Y_OFFSET_DPS, metrics);
-                mErasePaint.setAlpha((int) (128));
+                // Draw the outer circle
+                mErasePaint.setAlpha(128);
                 eraseCanvas.drawCircle(metrics.widthPixels / 2,
                         metrics.heightPixels / 2 - offset,
                         DynamicGrid.pxFromDp(WORKSPACE_OUTER_CIRCLE_RADIUS_DPS, metrics),
                         mErasePaint);
+                // Draw the inner circle
                 mErasePaint.setAlpha(0);
                 eraseCanvas.drawCircle(metrics.widthPixels / 2,
                         metrics.heightPixels / 2 - offset,
@@ -434,8 +475,24 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                     mFocusedHotseatApp.setAlpha((int) (255 * alpha));
                     mFocusedHotseatApp.draw(canvas);
                 }
+            } else if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                    mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
+                int offset = DynamicGrid.pxFromDp(WORKSPACE_CIRCLE_Y_OFFSET_DPS, metrics);
+                // Draw the outer circle
+                eraseCanvas.drawCircle(pageIndicatorBounds.centerX(),
+                        pageIndicatorBounds.centerY(),
+                        DynamicGrid.pxFromDp(MIGRATION_WORKSPACE_OUTER_CIRCLE_RADIUS_DPS, metrics),
+                        mBorderPaint);
+                // Draw the inner circle
+                mErasePaint.setAlpha(0);
+                eraseCanvas.drawCircle(pageIndicatorBounds.centerX(),
+                        pageIndicatorBounds.centerY(),
+                        DynamicGrid.pxFromDp(MIGRATION_WORKSPACE_INNER_CIRCLE_RADIUS_DPS, metrics),
+                        mErasePaint);
+                canvas.drawBitmap(eraseBg, 0, 0, null);
+                eraseCanvas.setBitmap(null);
+                eraseBg = null;
             }
-
             canvas.restore();
         }
 
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 67b0933c9a..b6c394cdbc 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -475,6 +475,14 @@ public class DeviceProfile {
         return bounds;
     }
 
+    /** Returns the bounds of the workspace page indicators. */
+    Rect getWorkspacePageIndicatorBounds(Rect insets) {
+        Rect workspacePadding = getWorkspacePadding();
+        int pageIndicatorTop = heightPx - insets.bottom - workspacePadding.bottom;
+        return new Rect(workspacePadding.left, pageIndicatorTop,
+                widthPx - workspacePadding.right, pageIndicatorTop + pageIndicatorHeightPx);
+    }
+
     /** Returns the workspace padding in the specified orientation */
     Rect getWorkspacePadding() {
         return getWorkspacePadding(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java
index 8726f30c18..ab0469d53f 100644
--- a/src/com/android/launcher3/DragLayer.java
+++ b/src/com/android/launcher3/DragLayer.java
@@ -168,7 +168,8 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
         }
 
         Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
-        if (currentFolder != null && !mLauncher.isFolderClingVisible() && intercept) {
+        if (currentFolder != null && !mLauncher.getLauncherClings().isFolderClingVisible() &&
+                intercept) {
             if (currentFolder.isEditingName()) {
                 if (!isEventOverFolderTextRegion(currentFolder, ev)) {
                     currentFolder.dismissEditingName();
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 758ee5baba..41815b6037 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -238,7 +238,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 return false;
             }
 
-            mLauncher.dismissFolderCling(null);
+            mLauncher.getLauncherClings().dismissFolderCling(null);
 
             mLauncher.getWorkspace().onDragStartedWithItem(v);
             mLauncher.getWorkspace().beginDragShared(v, this);
@@ -466,7 +466,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             public void onAnimationEnd(Animator animation) {
                 mState = STATE_OPEN;
                 setLayerType(LAYER_TYPE_NONE, null);
-                Cling cling = mLauncher.showFirstRunFoldersCling();
+                Cling cling = mLauncher.getLauncherClings().showFoldersCling();
                 if (cling != null) {
                     cling.bringScrimToFront();
                     bringToFront();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 269f53baaa..34e8b783c4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -17,8 +17,6 @@
 
 package com.android.launcher3;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -87,7 +85,6 @@ import android.view.ViewTreeObserver;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.InputMethodManager;
@@ -115,6 +112,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+
 /**
  * Default launcher application.
  */
@@ -199,6 +197,8 @@ public class Launcher extends Activity
     public static final String SHOW_WEIGHT_WATCHER = "debug.show_mem";
     public static final boolean SHOW_WEIGHT_WATCHER_DEFAULT = false;
 
+    public static final String USER_HAS_MIGRATED = "launcher.user_migrated_from_old_data";
+
     /** The different states that Launcher can be in. */
     private enum State { NONE, WORKSPACE, APPS_CUSTOMIZE, APPS_CUSTOMIZE_SPRING_LOADED };
     private State mState = State.WORKSPACE;
@@ -207,8 +207,6 @@ public class Launcher extends Activity
     static final int APPWIDGET_HOST_ID = 1024;
     public static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT = 300;
     private static final int ON_ACTIVITY_RESULT_ANIMATION_DELAY = 500;
-    private static final int SHOW_CLING_DURATION = 250;
-    private static final int DISMISS_CLING_DURATION = 200;
 
     private static final Object sLock = new Object();
     private static int sScreen = DEFAULT_SCREEN;
@@ -229,9 +227,11 @@ public class Launcher extends Activity
 
     private Workspace mWorkspace;
     private View mLauncherView;
+    private View mPageIndicators;
     private DragLayer mDragLayer;
     private DragController mDragController;
     private View mWeightWatcher;
+    private LauncherClings mLauncherClings;
 
     private AppWidgetManager mAppWidgetManager;
     private LauncherAppWidgetHost mAppWidgetHost;
@@ -284,8 +284,6 @@ public class Launcher extends Activity
     private boolean mVisible = false;
     private boolean mHasFocus = false;
     private boolean mAttached = false;
-    private static final boolean DISABLE_CLINGS = false;
-    private static final boolean DISABLE_CUSTOM_CLINGS = true;
 
     private static LocaleConfiguration sLocaleConfiguration = null;
 
@@ -341,9 +339,6 @@ public class Launcher extends Activity
 
     private BubbleTextView mWaitingForResume;
 
-    private HideFromAccessibilityHelper mHideFromAccessibilityHelper
-        = new HideFromAccessibilityHelper();
-
     private Runnable mBuildLayersRunnable = new Runnable() {
         public void run() {
             if (mWorkspace != null) {
@@ -418,6 +413,7 @@ public class Launcher extends Activity
         mIconCache = app.getIconCache();
         mIconCache.flushInvalidIcons(grid);
         mDragController = new DragController(this);
+        mLauncherClings = new LauncherClings(this);
         mInflater = getLayoutInflater();
 
         mStats = new Stats(this);
@@ -480,7 +476,11 @@ public class Launcher extends Activity
         unlockScreenOrientation(true);
 
         showFirstRunActivity();
-        showFirstRunCling();
+        if (mModel.canMigrateFromOldLauncherDb()) {
+            mLauncherClings.showMigrationCling();
+        } else {
+            mLauncherClings.showFirstRunCling();
+        }
     }
 
     protected void onUserLeaveHint() {
@@ -673,10 +673,6 @@ public class Launcher extends Activity
         return mInflater;
     }
 
-    public DragLayer getDragLayer() {
-        return mDragLayer;
-    }
-
     boolean isDraggingEnabled() {
         // We prevent dragging when we are loading the workspace as it is possible to pick up a view
         // that is subsequently removed from the workspace in startBinding().
@@ -1227,6 +1223,7 @@ public class Launcher extends Activity
         mLauncherView = findViewById(R.id.launcher);
         mDragLayer = (DragLayer) findViewById(R.id.drag_layer);
         mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace);
+        mPageIndicators = mDragLayer.findViewById(R.id.page_indicator);
 
         mLauncherView.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
@@ -1721,6 +1718,26 @@ public class Launcher extends Activity
         Toast.makeText(this, getString(strId), Toast.LENGTH_SHORT).show();
     }
 
+    public DragLayer getDragLayer() {
+        return mDragLayer;
+    }
+
+    public Workspace getWorkspace() {
+        return mWorkspace;
+    }
+
+    public Hotseat getHotseat() {
+        return mHotseat;
+    }
+
+    public View getOverviewPanel() {
+        return mOverviewPanel;
+    }
+
+    public SearchDropTargetBar getSearchBar() {
+        return mSearchDropTargetBar;
+    }
+
     public LauncherAppWidgetHost getAppWidgetHost() {
         return mAppWidgetHost;
     }
@@ -1729,6 +1746,14 @@ public class Launcher extends Activity
         return mModel;
     }
 
+    public LauncherClings getLauncherClings() {
+        return mLauncherClings;
+    }
+
+    protected SharedPreferences getSharedPrefs() {
+        return mSharedPrefs;
+    }
+
     public void closeSystemDialogs() {
         getWindow().closeAllPanels();
 
@@ -2690,7 +2715,7 @@ public class Launcher extends Activity
             closeFolder(folder);
 
             // Dismiss the folder cling
-            dismissFolderCling(null);
+            mLauncherClings.dismissFolderCling(null);
         }
     }
 
@@ -2766,15 +2791,6 @@ public class Launcher extends Activity
         return mHotseat != null && layout != null &&
                 (layout instanceof CellLayout) && (layout == mHotseat.getLayout());
     }
-    Hotseat getHotseat() {
-        return mHotseat;
-    }
-    View getOverviewPanel() {
-        return mOverviewPanel;
-    }
-    SearchDropTargetBar getSearchBar() {
-        return mSearchDropTargetBar;
-    }
 
     /**
      * Returns the CellLayout of the specified container at the specified screen.
@@ -2791,10 +2807,6 @@ public class Launcher extends Activity
         }
     }
 
-    Workspace getWorkspace() {
-        return mWorkspace;
-    }
-
     public boolean isAllAppsVisible() {
         return (mState == State.APPS_CUSTOMIZE) || (mOnResumeState == State.APPS_CUSTOMIZE);
     }
@@ -4225,245 +4237,13 @@ public class Launcher extends Activity
         }
     }
 
-    private boolean shouldRunFirstRunActivity() {
-        return !ActivityManager.isRunningInTestHarness();
-    }
-
-    /* Cling related */
-    private boolean isClingsEnabled() {
-        if (DISABLE_CLINGS) {
-            return false;
-        }
-
-        // For now, limit only to phones
-        LauncherAppState app = LauncherAppState.getInstance();
-        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
-        if (grid.isTablet()) {
-            return false;
-        }
-        if (grid.isLandscape) {
-            return false;
-        }
-
-        // disable clings when running in a test harness
-        if(ActivityManager.isRunningInTestHarness()) return false;
-
-        // Disable clings for accessibility when explore by touch is enabled
-        final AccessibilityManager a11yManager = (AccessibilityManager) getSystemService(
-                ACCESSIBILITY_SERVICE);
-        if (a11yManager.isTouchExplorationEnabled()) {
-            return false;
-        }
-
-        // Restricted secondary users (child mode) will potentially have very few apps
-        // seeded when they start up for the first time. Clings won't work well with that
-//        boolean supportsLimitedUsers =
-//                android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
-//        Account[] accounts = AccountManager.get(this).getAccounts();
-//        if (supportsLimitedUsers && accounts.length == 0) {
-//            UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
-//            Bundle restrictions = um.getUserRestrictions();
-//            if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) {
-//               return false;
-//            }
-//        }
-        return true;
-    }
-
-    private Cling initCling(int clingId, int scrimId, boolean animate,
-                            boolean dimNavBarVisibilty) {
-        Cling cling = (Cling) findViewById(clingId);
-        View scrim = null;
-        if (scrimId > 0) {
-            scrim = findViewById(R.id.cling_scrim);
-        }
-        if (cling != null) {
-            cling.init(this, scrim);
-            cling.show(animate, SHOW_CLING_DURATION);
-
-            if (dimNavBarVisibilty) {
-                cling.setSystemUiVisibility(cling.getSystemUiVisibility() |
-                        View.SYSTEM_UI_FLAG_LOW_PROFILE);
-            }
-        }
-        return cling;
-    }
-
-    private void dismissCling(final Cling cling, final Runnable postAnimationCb,
-                              final String flag, int duration, boolean restoreNavBarVisibilty) {
-        // To catch cases where siblings of top-level views are made invisible, just check whether
-        // the cling is directly set to GONE before dismissing it.
-        if (cling != null && cling.getVisibility() != View.GONE) {
-            final Runnable cleanUpClingCb = new Runnable() {
-                public void run() {
-                    cling.cleanup();
-                    SharedPreferences.Editor editor = mSharedPrefs.edit();
-                    editor.putBoolean(flag, true);
-                    editor.apply();
-                    if (postAnimationCb != null) {
-                        postAnimationCb.run();
-                    }
-                }
-            };
-            if (duration <= 0) {
-                cleanUpClingCb.run();
-            } else {
-                cling.hide(duration, cleanUpClingCb);
-            }
-            mHideFromAccessibilityHelper.restoreImportantForAccessibility(mDragLayer);
-
-            if (restoreNavBarVisibilty) {
-                cling.setSystemUiVisibility(cling.getSystemUiVisibility() &
-                        ~View.SYSTEM_UI_FLAG_LOW_PROFILE);
-            }
-        }
-    }
-
-    private void removeCling(int id) {
-        final View cling = findViewById(id);
-        if (cling != null) {
-            final ViewGroup parent = (ViewGroup) cling.getParent();
-            parent.post(new Runnable() {
-                @Override
-                public void run() {
-                    parent.removeView(cling);
-                }
-            });
-            mHideFromAccessibilityHelper.restoreImportantForAccessibility(mDragLayer);
-        }
-    }
-
-    private boolean skipCustomClingIfNoAccounts() {
-        Cling cling = (Cling) findViewById(R.id.workspace_cling);
-        boolean customCling = cling.getDrawIdentifier().equals("workspace_custom");
-        if (customCling) {
-            AccountManager am = AccountManager.get(this);
-            if (am == null) return false;
-            Account[] accounts = am.getAccountsByType("com.google");
-            return accounts.length == 0;
-        }
-        return false;
-    }
-
-    public void updateCustomContentHintVisibility() {
-        Cling cling = (Cling) findViewById(R.id.first_run_cling);
-        String ccHintStr = getFirstRunCustomContentHint();
-
-        if (mWorkspace.hasCustomContent()) {
-            // Show the custom content hint if ccHintStr is not empty
-            if (cling != null) {
-                setCustomContentHintVisibility(cling, ccHintStr, true, true);
-            }
-        } else {
-            // Hide the custom content hint
-            if (cling != null) {
-                setCustomContentHintVisibility(cling, ccHintStr, false, true);
-            }
-        }
-    }
-
-    private void setCustomContentHintVisibility(Cling cling, String ccHintStr, boolean visible,
-                                                boolean animate) {
-        final TextView ccHint = (TextView) cling.findViewById(R.id.custom_content_hint);
-        if (ccHint != null) {
-            if (visible && !ccHintStr.isEmpty()) {
-                ccHint.setText(ccHintStr);
-                ccHint.setVisibility(View.VISIBLE);
-                if (animate) {
-                    ccHint.setAlpha(0f);
-                    ccHint.animate().alpha(1f)
-                                    .setDuration(SHOW_CLING_DURATION)
-                                    .start();
-                } else {
-                    ccHint.setAlpha(1f);
-                }
-            } else {
-                if (animate) {
-                    ccHint.animate().alpha(0f)
-                                    .setDuration(SHOW_CLING_DURATION)
-                                    .setListener(new AnimatorListenerAdapter() {
-                                        @Override
-                                        public void onAnimationEnd(Animator animation) {
-                                            ccHint.setVisibility(View.GONE);
-                                        }
-                                    })
-                                    .start();
-                } else {
-                    ccHint.setAlpha(0f);
-                    ccHint.setVisibility(View.GONE);
-                }
-            }
-        }
-    }
-
-    public void showFirstRunActivity() {
-        if (shouldRunFirstRunActivity() && hasFirstRunActivity()
-                && !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false)) {
-            Intent firstRunIntent = getFirstRunActivity();
-            if (firstRunIntent != null) {
-                startActivity(firstRunIntent);
-                markFirstRunActivityShown();
-            }
-        }
-    }
-
-    private void markFirstRunActivityShown() {
-        SharedPreferences.Editor editor = mSharedPrefs.edit();
-        editor.putBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, true);
-        editor.apply();
-    }
-
-    public void showFirstRunCling() {
-        if (isClingsEnabled() &&
-                !mSharedPrefs.getBoolean(Cling.FIRST_RUN_CLING_DISMISSED_KEY, false) &&
-                !skipCustomClingIfNoAccounts() ) {
-
-
-            // If we're not using the default workspace layout, replace workspace cling
-            // with a custom workspace cling (usually specified in an overlay)
-            // For now, only do this on tablets
-            if (!DISABLE_CUSTOM_CLINGS) {
-                if (mSharedPrefs.getInt(LauncherProvider.DEFAULT_WORKSPACE_RESOURCE_ID, 0) != 0 &&
-                        getResources().getBoolean(R.bool.config_useCustomClings)) {
-                    // Use a custom cling
-                    View cling = findViewById(R.id.workspace_cling);
-                    ViewGroup clingParent = (ViewGroup) cling.getParent();
-                    int clingIndex = clingParent.indexOfChild(cling);
-                    clingParent.removeViewAt(clingIndex);
-                    View customCling = mInflater.inflate(R.layout.custom_workspace_cling, clingParent, false);
-                    clingParent.addView(customCling, clingIndex);
-                    customCling.setId(R.id.workspace_cling);
-                }
-            }
-            Cling cling = (Cling) findViewById(R.id.first_run_cling);
-            if (cling != null) {
-                String sbHintStr = getFirstRunClingSearchBarHint();
-                String ccHintStr = getFirstRunCustomContentHint();
-                if (!sbHintStr.isEmpty()) {
-                    TextView sbHint = (TextView) cling.findViewById(R.id.search_bar_hint);
-                    sbHint.setText(sbHintStr);
-                    sbHint.setVisibility(View.VISIBLE);
-                }
-                setCustomContentHintVisibility(cling, ccHintStr, true, false);
-            }
-            initCling(R.id.first_run_cling, 0, false, true);
-        } else {
-            removeCling(R.id.first_run_cling);
-        }
-    }
-
     /**
      * Called when the SearchBar hint should be changed.
      *
      * @param hint the hint to be displayed in the search bar.
      */
     protected void onSearchBarHintChanged(String hint) {
-        Cling cling = (Cling) findViewById(R.id.first_run_cling);
-        if (cling != null && cling.getVisibility() == View.VISIBLE && !hint.isEmpty()) {
-            TextView sbHint = (TextView) cling.findViewById(R.id.search_bar_hint);
-            sbHint.setText(hint);
-            sbHint.setVisibility(View.VISIBLE);
-        }
+        mLauncherClings.updateSearchBarHint(hint);
     }
 
     protected String getFirstRunClingSearchBarHint() {
@@ -4488,80 +4268,61 @@ public class Launcher extends Activity
         return "";
     }
 
-    public void showFirstRunWorkspaceCling() {
-        // Enable the clings only if they have not been dismissed before
-        if (isClingsEnabled() &&
-                !mSharedPrefs.getBoolean(Cling.WORKSPACE_CLING_DISMISSED_KEY, false)) {
-            Cling c = initCling(R.id.workspace_cling, 0, false, true);
-
-            // Set the focused hotseat app if there is one
-            c.setFocusedHotseatApp(getFirstRunFocusedHotseatAppDrawableId(),
-                    getFirstRunFocusedHotseatAppRank(),
-                    getFirstRunFocusedHotseatAppComponentName(),
-                    getFirstRunFocusedHotseatAppBubbleTitle(),
-                    getFirstRunFocusedHotseatAppBubbleDescription());
-        } else {
-            removeCling(R.id.workspace_cling);
-        }
-    }
-    public Cling showFirstRunFoldersCling() {
-        // Enable the clings only if they have not been dismissed before
-        if (isClingsEnabled() &&
-                !mSharedPrefs.getBoolean(Cling.FOLDER_CLING_DISMISSED_KEY, false)) {
-            Cling cling = initCling(R.id.folder_cling, R.id.cling_scrim,
-                    true, true);
-            return cling;
-        } else {
-            removeCling(R.id.folder_cling);
-            return null;
-        }
-    }
-    protected SharedPreferences getSharedPrefs() {
-        return mSharedPrefs;
-    }
-    public boolean isFolderClingVisible() {
-        Cling cling = (Cling) findViewById(R.id.folder_cling);
-        if (cling != null) {
-            return cling.getVisibility() == View.VISIBLE;
-        }
-        return false;
-    }
     public void dismissFirstRunCling(View v) {
-        Cling cling = (Cling) findViewById(R.id.first_run_cling);
-        Runnable cb = new Runnable() {
-            public void run() {
-                // Show the workspace cling next
-                showFirstRunWorkspaceCling();
-            }
-        };
-        dismissCling(cling, cb, Cling.FIRST_RUN_CLING_DISMISSED_KEY,
-                DISMISS_CLING_DURATION, false);
-
-        // Fade out the search bar for the workspace cling coming up
-        mSearchDropTargetBar.hideSearchBar(true);
+        mLauncherClings.dismissFirstRunCling(v);
+    }
+    public void dismissMigrationClingCopyApps(View v) {
+        mLauncherClings.dismissMigrationClingCopyApps(v);
+    }
+    public void dismissMigrationClingUseDefault(View v) {
+        mLauncherClings.dismissMigrationClingUseDefault(v);
+    }
+    public void dismissMigrationWorkspaceCling(View v) {
+        mLauncherClings.dismissMigrationWorkspaceCling(v);
     }
     public void dismissWorkspaceCling(View v) {
-        Cling cling = (Cling) findViewById(R.id.workspace_cling);
-        Runnable cb = null;
-        if (v == null) {
-            cb = new Runnable() {
-                public void run() {
-                    mWorkspace.enterOverviewMode();
-                }
-            };
-        }
-        dismissCling(cling, cb, Cling.WORKSPACE_CLING_DISMISSED_KEY,
-                DISMISS_CLING_DURATION, true);
-
-        // Fade in the search bar
-        mSearchDropTargetBar.showSearchBar(true);
+        mLauncherClings.dismissWorkspaceCling(v);
     }
     public void dismissFolderCling(View v) {
-        Cling cling = (Cling) findViewById(R.id.folder_cling);
-        dismissCling(cling, null, Cling.FOLDER_CLING_DISMISSED_KEY,
-                DISMISS_CLING_DURATION, true);
+        mLauncherClings.dismissFolderCling(v);
     }
 
+    private boolean shouldRunFirstRunActivity() {
+        return !ActivityManager.isRunningInTestHarness();
+    }
+
+    public void showFirstRunActivity() {
+        if (shouldRunFirstRunActivity() && hasFirstRunActivity()
+                && !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false)) {
+            Intent firstRunIntent = getFirstRunActivity();
+            if (firstRunIntent != null) {
+                startActivity(firstRunIntent);
+                markFirstRunActivityShown();
+            }
+        }
+    }
+
+    private void markFirstRunActivityShown() {
+        SharedPreferences.Editor editor = mSharedPrefs.edit();
+        editor.putBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, true);
+        editor.apply();
+    }
+
+    void showWorkspaceSearchAndHotseat() {
+        mWorkspace.setAlpha(1f);
+        mHotseat.setAlpha(1f);
+        mPageIndicators.setAlpha(1f);
+        mSearchDropTargetBar.showSearchBar(false);
+    }
+
+    void hideWorkspaceSearchAndHotseat() {
+        mWorkspace.setAlpha(0f);
+        mHotseat.setAlpha(0f);
+        mPageIndicators.setAlpha(0f);
+        mSearchDropTargetBar.hideSearchBar(false);
+    }
+
+
     public ItemInfo createAppDragInfo(Intent appLaunchIntent) {
         ResolveInfo ri = getPackageManager().resolveActivity(appLaunchIntent, 0);
         if (ri == null) {
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
new file mode 100644
index 0000000000..ec0a4238fb
--- /dev/null
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright (C) 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
+ *
+ *      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
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.TextView;
+
+class LauncherClings {
+    private static final String FIRST_RUN_CLING_DISMISSED_KEY = "cling_gel.first_run.dismissed";
+    private static final String MIGRATION_CLING_DISMISSED_KEY = "cling_gel.migration.dismissed";
+    private static final String MIGRATION_WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.migration.dismissed";
+    private static final String WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.workspace.dismissed";
+    private static final String FOLDER_CLING_DISMISSED_KEY = "cling_gel.folder.dismissed";
+
+    private static final boolean DISABLE_CLINGS = false;
+    private static final boolean DISABLE_CUSTOM_CLINGS = true;
+
+    private static final int SHOW_CLING_DURATION = 250;
+    private static final int DISMISS_CLING_DURATION = 200;
+
+    private Launcher mLauncher;
+    private LayoutInflater mInflater;
+    private HideFromAccessibilityHelper mHideFromAccessibilityHelper
+            = new HideFromAccessibilityHelper();
+
+    /** Ctor */
+    public LauncherClings(Launcher launcher) {
+        mLauncher = launcher;
+        mInflater = mLauncher.getLayoutInflater();
+    }
+
+    /** Initializes a cling */
+    private Cling initCling(int clingId, int scrimId, boolean animate,
+                            boolean dimNavBarVisibilty) {
+        Cling cling = (Cling) mLauncher.findViewById(clingId);
+        View scrim = null;
+        if (scrimId > 0) {
+            scrim = mLauncher.findViewById(R.id.cling_scrim);
+        }
+        if (cling != null) {
+            cling.init(mLauncher, scrim);
+            cling.show(animate, SHOW_CLING_DURATION);
+
+            if (dimNavBarVisibilty) {
+                cling.setSystemUiVisibility(cling.getSystemUiVisibility() |
+                        View.SYSTEM_UI_FLAG_LOW_PROFILE);
+            }
+        }
+        return cling;
+    }
+
+    /** Returns whether the clings are enabled or should be shown */
+    private boolean isClingsEnabled() {
+        if (DISABLE_CLINGS) {
+            return false;
+        }
+
+        // For now, limit only to phones
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+        if (grid.isTablet()) {
+            return false;
+        }
+        if (grid.isLandscape) {
+            return false;
+        }
+
+        // disable clings when running in a test harness
+        if(ActivityManager.isRunningInTestHarness()) return false;
+
+        // Disable clings for accessibility when explore by touch is enabled
+        final AccessibilityManager a11yManager = (AccessibilityManager) mLauncher.getSystemService(
+                Launcher.ACCESSIBILITY_SERVICE);
+        if (a11yManager.isTouchExplorationEnabled()) {
+            return false;
+        }
+
+        // Restricted secondary users (child mode) will potentially have very few apps
+        // seeded when they start up for the first time. Clings won't work well with that
+        boolean supportsLimitedUsers =
+                android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
+        Account[] accounts = AccountManager.get(mLauncher).getAccounts();
+        if (supportsLimitedUsers && accounts.length == 0) {
+            UserManager um = (UserManager) mLauncher.getSystemService(Context.USER_SERVICE);
+            Bundle restrictions = um.getUserRestrictions();
+            if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /** Returns whether the folder cling is visible. */
+    public boolean isFolderClingVisible() {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.folder_cling);
+        if (cling != null) {
+            return cling.getVisibility() == View.VISIBLE;
+        }
+        return false;
+    }
+
+    private boolean skipCustomClingIfNoAccounts() {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.workspace_cling);
+        boolean customCling = cling.getDrawIdentifier().equals("workspace_custom");
+        if (customCling) {
+            AccountManager am = AccountManager.get(mLauncher);
+            if (am == null) return false;
+            Account[] accounts = am.getAccountsByType("com.google");
+            return accounts.length == 0;
+        }
+        return false;
+    }
+
+    /** Updates the first run cling custom content hint */
+    private void setCustomContentHintVisibility(Cling cling, String ccHintStr, boolean visible,
+                                                boolean animate) {
+        final TextView ccHint = (TextView) cling.findViewById(R.id.custom_content_hint);
+        if (ccHint != null) {
+            if (visible && !ccHintStr.isEmpty()) {
+                ccHint.setText(ccHintStr);
+                ccHint.setVisibility(View.VISIBLE);
+                if (animate) {
+                    ccHint.setAlpha(0f);
+                    ccHint.animate().alpha(1f)
+                            .setDuration(SHOW_CLING_DURATION)
+                            .start();
+                } else {
+                    ccHint.setAlpha(1f);
+                }
+            } else {
+                if (animate) {
+                    ccHint.animate().alpha(0f)
+                            .setDuration(SHOW_CLING_DURATION)
+                            .setListener(new AnimatorListenerAdapter() {
+                                @Override
+                                public void onAnimationEnd(Animator animation) {
+                                    ccHint.setVisibility(View.GONE);
+                                }
+                            })
+                            .start();
+                } else {
+                    ccHint.setAlpha(0f);
+                    ccHint.setVisibility(View.GONE);
+                }
+            }
+        }
+    }
+
+    /** Updates the first run cling custom content hint */
+    public void updateCustomContentHintVisibility() {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.first_run_cling);
+        String ccHintStr = mLauncher.getFirstRunCustomContentHint();
+
+        if (mLauncher.getWorkspace().hasCustomContent()) {
+            // Show the custom content hint if ccHintStr is not empty
+            if (cling != null) {
+                setCustomContentHintVisibility(cling, ccHintStr, true, true);
+            }
+        } else {
+            // Hide the custom content hint
+            if (cling != null) {
+                setCustomContentHintVisibility(cling, ccHintStr, false, true);
+            }
+        }
+    }
+
+    /** Updates the first run cling search bar hint. */
+    public void updateSearchBarHint(String hint) {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.first_run_cling);
+        if (cling != null && cling.getVisibility() == View.VISIBLE && !hint.isEmpty()) {
+            TextView sbHint = (TextView) cling.findViewById(R.id.search_bar_hint);
+            sbHint.setText(hint);
+            sbHint.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /** Shows the first run cling */
+    public void showFirstRunCling() {
+        SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
+        if (isClingsEnabled() &&
+                !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) &&
+                !skipCustomClingIfNoAccounts() ) {
+
+
+            // If we're not using the default workspace layout, replace workspace cling
+            // with a custom workspace cling (usually specified in an overlay)
+            // For now, only do this on tablets
+            if (!DISABLE_CUSTOM_CLINGS) {
+                if (sharedPrefs.getInt(LauncherProvider.DEFAULT_WORKSPACE_RESOURCE_ID, 0) != 0 &&
+                        mLauncher.getResources().getBoolean(R.bool.config_useCustomClings)) {
+                    // Use a custom cling
+                    View cling = mLauncher.findViewById(R.id.workspace_cling);
+                    ViewGroup clingParent = (ViewGroup) cling.getParent();
+                    int clingIndex = clingParent.indexOfChild(cling);
+                    clingParent.removeViewAt(clingIndex);
+                    View customCling = mInflater.inflate(R.layout.custom_workspace_cling,
+                            clingParent, false);
+                    clingParent.addView(customCling, clingIndex);
+                    customCling.setId(R.id.workspace_cling);
+                }
+            }
+            Cling cling = (Cling) mLauncher.findViewById(R.id.first_run_cling);
+            if (cling != null) {
+                String sbHintStr = mLauncher.getFirstRunClingSearchBarHint();
+                String ccHintStr = mLauncher.getFirstRunCustomContentHint();
+                if (!sbHintStr.isEmpty()) {
+                    TextView sbHint = (TextView) cling.findViewById(R.id.search_bar_hint);
+                    sbHint.setText(sbHintStr);
+                    sbHint.setVisibility(View.VISIBLE);
+                }
+                setCustomContentHintVisibility(cling, ccHintStr, true, false);
+            }
+            initCling(R.id.first_run_cling, 0, false, true);
+        } else {
+            removeCling(R.id.first_run_cling);
+        }
+    }
+
+    public void showMigrationCling() {
+        // Enable the clings only if they have not been dismissed before
+        if (isClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
+                MIGRATION_CLING_DISMISSED_KEY, false)) {
+            mLauncher.hideWorkspaceSearchAndHotseat();
+
+            Cling c = initCling(R.id.migration_cling, 0, false, true);
+            c.bringScrimToFront();
+            c.bringToFront();
+        } else {
+            removeCling(R.id.migration_cling);
+        }
+    }
+
+    public void showMigrationWorkspaceCling() {
+        // Enable the clings only if they have not been dismissed before
+        if (isClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
+                MIGRATION_WORKSPACE_CLING_DISMISSED_KEY, false)) {
+            Cling c = initCling(R.id.migration_workspace_cling, 0, false, true);
+            c.updateMigrationWorkspaceBubblePosition();
+            c.bringScrimToFront();
+            c.bringToFront();
+        } else {
+            removeCling(R.id.migration_workspace_cling);
+        }
+    }
+
+    public void showWorkspaceCling() {
+        // Enable the clings only if they have not been dismissed before
+        if (isClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
+                WORKSPACE_CLING_DISMISSED_KEY, false)) {
+            Cling c = initCling(R.id.workspace_cling, 0, false, true);
+
+            // Set the focused hotseat app if there is one
+            c.setFocusedHotseatApp(mLauncher.getFirstRunFocusedHotseatAppDrawableId(),
+                    mLauncher.getFirstRunFocusedHotseatAppRank(),
+                    mLauncher.getFirstRunFocusedHotseatAppComponentName(),
+                    mLauncher.getFirstRunFocusedHotseatAppBubbleTitle(),
+                    mLauncher.getFirstRunFocusedHotseatAppBubbleDescription());
+        } else {
+            removeCling(R.id.workspace_cling);
+        }
+    }
+    public Cling showFoldersCling() {
+        SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
+        // Enable the clings only if they have not been dismissed before
+        if (isClingsEnabled() &&
+                !sharedPrefs.getBoolean(FOLDER_CLING_DISMISSED_KEY, false) &&
+                !sharedPrefs.getBoolean(Launcher.USER_HAS_MIGRATED, false)) {
+            Cling cling = initCling(R.id.folder_cling, R.id.cling_scrim,
+                    true, true);
+            return cling;
+        } else {
+            removeCling(R.id.folder_cling);
+            return null;
+        }
+    }
+
+
+    /** Removes the cling outright from the DragLayer */
+    private void removeCling(int id) {
+        final View cling = mLauncher.findViewById(id);
+        if (cling != null) {
+            final ViewGroup parent = (ViewGroup) cling.getParent();
+            parent.post(new Runnable() {
+                @Override
+                public void run() {
+                    parent.removeView(cling);
+                }
+            });
+            mHideFromAccessibilityHelper.restoreImportantForAccessibility(mLauncher.getDragLayer());
+        }
+    }
+
+    /** Hides the specified Cling */
+    private void dismissCling(final Cling cling, final Runnable postAnimationCb,
+                              final String flag, int duration, boolean restoreNavBarVisibilty) {
+        // To catch cases where siblings of top-level views are made invisible, just check whether
+        // the cling is directly set to GONE before dismissing it.
+        if (cling != null && cling.getVisibility() != View.GONE) {
+            final Runnable cleanUpClingCb = new Runnable() {
+                public void run() {
+                    cling.cleanup();
+                    SharedPreferences.Editor editor = mLauncher.getSharedPrefs().edit();
+                    editor.putBoolean(flag, true);
+                    editor.apply();
+                    if (postAnimationCb != null) {
+                        postAnimationCb.run();
+                    }
+                }
+            };
+            if (duration <= 0) {
+                cleanUpClingCb.run();
+            } else {
+                cling.hide(duration, cleanUpClingCb);
+            }
+            mHideFromAccessibilityHelper.restoreImportantForAccessibility(mLauncher.getDragLayer());
+
+            if (restoreNavBarVisibilty) {
+                cling.setSystemUiVisibility(cling.getSystemUiVisibility() &
+                        ~View.SYSTEM_UI_FLAG_LOW_PROFILE);
+            }
+        }
+    }
+
+    public void dismissFirstRunCling(View v) {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.first_run_cling);
+        Runnable cb = new Runnable() {
+            public void run() {
+                // Show the workspace cling next
+                showWorkspaceCling();
+            }
+        };
+        dismissCling(cling, cb, FIRST_RUN_CLING_DISMISSED_KEY,
+                DISMISS_CLING_DURATION, false);
+
+        // Fade out the search bar for the workspace cling coming up
+        mLauncher.getSearchBar().hideSearchBar(true);
+    }
+
+    private void dismissMigrationCling() {
+        mLauncher.showWorkspaceSearchAndHotseat();
+        Runnable dismissCb = new Runnable() {
+            public void run() {
+                Cling cling = (Cling) mLauncher.findViewById(R.id.migration_cling);
+                Runnable cb = new Runnable() {
+                    public void run() {
+                        // Show the migration workspace cling next
+                        showMigrationWorkspaceCling();
+                    }
+                };
+                dismissCling(cling, cb, WORKSPACE_CLING_DISMISSED_KEY,
+                        DISMISS_CLING_DURATION, true);
+            }
+        };
+        mLauncher.getWorkspace().post(dismissCb);
+    }
+
+    private void dismissAnyWorkspaceCling(Cling cling, View v) {
+        Runnable cb = null;
+        if (v == null) {
+            cb = new Runnable() {
+                public void run() {
+                    mLauncher.getWorkspace().enterOverviewMode();
+                }
+            };
+        }
+        dismissCling(cling, cb, WORKSPACE_CLING_DISMISSED_KEY,
+                DISMISS_CLING_DURATION, true);
+
+        // Fade in the search bar
+        mLauncher.getSearchBar().showSearchBar(true);
+    }
+
+    public void dismissMigrationClingCopyApps(View v) {
+        // Copy the shortcuts from the old database
+        LauncherModel model = mLauncher.getModel();
+//        model.resetLoadedState(false, true);
+//        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+//                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE
+//                        | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS);
+
+        // Set the flag to skip the folder cling
+        String spKey = LauncherAppState.getSharedPreferencesKey();
+        SharedPreferences sp = mLauncher.getSharedPreferences(spKey, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+        editor.putBoolean(Launcher.USER_HAS_MIGRATED, true);
+        editor.apply();
+
+        // Disable the migration cling
+        dismissMigrationCling();
+    }
+
+    public void dismissMigrationClingUseDefault(View v) {
+        // Clear the workspace
+        LauncherModel model = mLauncher.getModel();
+//        model.resetLoadedState(false, true);
+//        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+//                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE);
+
+        // Disable the migration cling
+        dismissMigrationCling();
+    }
+
+    public void dismissMigrationWorkspaceCling(View v) {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.migration_workspace_cling);
+        dismissAnyWorkspaceCling(cling, v);
+    }
+
+    public void dismissWorkspaceCling(View v) {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.workspace_cling);
+        dismissAnyWorkspaceCling(cling, v);
+    }
+
+    public void dismissFolderCling(View v) {
+        Cling cling = (Cling) mLauncher.findViewById(R.id.folder_cling);
+        dismissCling(cling, null, FOLDER_CLING_DISMISSED_KEY,
+                DISMISS_CLING_DURATION, true);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b2cfb2456a..498d91a388 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -77,7 +77,9 @@ public class LauncherModel extends BroadcastReceiver {
 
     private static final int ITEMS_CHUNK = 6; // batch size for the workspace icons
     private static final long INVALID_SCREEN_ID = -1L;
+
     private final boolean mAppsCanBeOnRemoveableStorage;
+    private final boolean mOldContentProviderExists;
 
     private final LauncherAppState mApp;
     private final Object mLock = new Object();
@@ -181,9 +183,12 @@ public class LauncherModel extends BroadcastReceiver {
     }
 
     LauncherModel(LauncherAppState app, IconCache iconCache, AppFilter appFilter) {
-        final Context context = app.getContext();
+        Context context = app.getContext();
+        ContentResolver contentResolver = context.getContentResolver();
 
         mAppsCanBeOnRemoveableStorage = Environment.isExternalStorageRemovable();
+        mOldContentProviderExists = (contentResolver.acquireContentProviderClient(
+                LauncherSettings.Favorites.OLD_CONTENT_URI) != null);
         mApp = app;
         mBgAllAppsList = new AllAppsList(iconCache, appFilter);
         mIconCache = iconCache;
@@ -218,6 +223,10 @@ public class LauncherModel extends BroadcastReceiver {
         }
     }
 
+    boolean canMigrateFromOldLauncherDb() {
+        return mOldContentProviderExists;
+    }
+
     static boolean findNextAvailableIconSpaceInScreen(ArrayList<ItemInfo> items, int[] xy,
                                  long screen) {
         LauncherAppState app = LauncherAppState.getInstance();
@@ -1651,7 +1660,7 @@ public class LauncherModel extends BroadcastReceiver {
             }
         }
 
-        /** Returns whether this is an upgradge path */
+        /** Returns whether this is an upgrade path */
         private boolean loadWorkspace() {
             // Log to disk
             Launcher.addDumpLog(TAG, "11683562 - loadWorkspace()", true);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b6276c0f20..2ce9eb3ad4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -579,7 +579,7 @@ public class Workspace extends SmoothPagedView
         mDefaultPage = mOriginalDefaultPage + 1;
 
         // Update the custom content hint
-        mLauncher.updateCustomContentHintVisibility();
+        mLauncher.getLauncherClings().updateCustomContentHintVisibility();
         if (mRestorePage != INVALID_RESTORE_PAGE) {
             mRestorePage = mRestorePage + 1;
         } else {
@@ -608,7 +608,7 @@ public class Workspace extends SmoothPagedView
         mDefaultPage = mOriginalDefaultPage - 1;
 
         // Update the custom content hint
-        mLauncher.updateCustomContentHintVisibility();
+        mLauncher.getLauncherClings().updateCustomContentHintVisibility();
         if (mRestorePage != INVALID_RESTORE_PAGE) {
             mRestorePage = mRestorePage - 1;
         } else {

From 5317c2b7adfbfef97edc6ad9b7e007160ef689f4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 10 Jan 2014 16:46:15 -0800
Subject: [PATCH 102/147] Updating assets and text for migration cling. (Bug
 11973614)

Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
---
 res/drawable-hdpi/on_boarding_welcome.png     | Bin 0 -> 22423 bytes
 res/drawable-mdpi/on_boarding_welcome.png     | Bin 0 -> 15325 bytes
 res/drawable-xhdpi/on_boarding_welcome.png    | Bin 0 -> 34253 bytes
 res/layout-land/migration_cling.xml           | 100 ++++++++++++++++++
 res/layout-land/migration_workspace_cling.xml |  70 ++++++++++++
 res/layout-port/migration_cling.xml           |  29 +++--
 res/mipmap-xxhdpi/on_boarding_welcome.png     | Bin 0 -> 50862 bytes
 res/values/strings.xml                        |  10 +-
 src/com/android/launcher3/LauncherClings.java |  14 +--
 9 files changed, 200 insertions(+), 23 deletions(-)
 create mode 100644 res/drawable-hdpi/on_boarding_welcome.png
 create mode 100644 res/drawable-mdpi/on_boarding_welcome.png
 create mode 100644 res/drawable-xhdpi/on_boarding_welcome.png
 create mode 100644 res/layout-land/migration_cling.xml
 create mode 100644 res/layout-land/migration_workspace_cling.xml
 create mode 100644 res/mipmap-xxhdpi/on_boarding_welcome.png

diff --git a/res/drawable-hdpi/on_boarding_welcome.png b/res/drawable-hdpi/on_boarding_welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..852a0cb132f2101d704d781bba988880c25700c9
GIT binary patch
literal 22423
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/on_boarding_welcome.png b/res/drawable-mdpi/on_boarding_welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d12e8362169c7e74ba193c045821625ba663120
GIT binary patch
literal 15325
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/on_boarding_welcome.png b/res/drawable-xhdpi/on_boarding_welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c101e0dbf5f2f2afb3ccf5d36254b1fe2b00ee0
GIT binary patch
literal 34253
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
RCwKi6YD!v)l?s*-{|Bkm`r`lq

literal 0
HcmV?d00001

diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml
new file mode 100644
index 0000000000..343f43f1fb
--- /dev/null
+++ b/res/layout-land/migration_cling.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_landscape">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:gravity="center"
+                android:text="@string/first_run_cling_title"
+                android:textSize="42dp"
+                android:textColor="#FFffffff" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="0dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/on_boarding_welcome" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_up" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/migration_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/migration_cling_description" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="25dp"
+            android:layout_marginRight="25dp"
+            android:layout_marginBottom="25dp"
+            android:orientation="vertical">
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migration_cling_copy_apps"
+                android:onClick="dismissMigrationClingCopyApps" />
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migration_cling_use_default"
+                android:onClick="dismissMigrationClingUseDefault" />
+        </LinearLayout>
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml
new file mode 100644
index 0000000000..bf7075b3da
--- /dev/null
+++ b/res/layout-land/migration_workspace_cling.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_workspace_landscape">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/migration_workspace_cling_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:orientation="vertical">
+            <LinearLayout
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_move_item" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_down" />
+        </LinearLayout>
+
+        <Button
+            style="@style/ClingButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15dp"
+            android:layout_marginRight="20dp"
+            android:layout_gravity="bottom|right"
+            android:onClick="dismissMigrationWorkspaceCling" />
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml
index 36bbab8daf..1bffe6c825 100644
--- a/res/layout-port/migration_cling.xml
+++ b/res/layout-port/migration_cling.xml
@@ -29,17 +29,22 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
-            android:layout_marginStart="25dp"
-            android:layout_marginEnd="25dp"
             android:orientation="vertical">
             <TextView
-                style="@style/ClingAltTitleText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:layout_marginBottom="10dp"
                 android:gravity="center"
-                android:text="@string/first_run_cling_title" />
+                android:text="@string/first_run_cling_title"
+                android:textSize="42dp"
+                android:textColor="#FFffffff" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="0dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/on_boarding_welcome" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -47,12 +52,14 @@
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/cling_arrow_up" />
             <LinearLayout
-                android:paddingLeft="20dp"
-                android:paddingRight="20dp"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
                 android:orientation="vertical"
                 android:background="@drawable/cling">
                 <TextView
@@ -72,8 +79,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:layout_marginStart="25dp"
-            android:layout_marginEnd="25dp"
+            android:layout_marginLeft="25dp"
+            android:layout_marginRight="25dp"
             android:layout_marginBottom="25dp"
             android:orientation="vertical">
             <Button
diff --git a/res/mipmap-xxhdpi/on_boarding_welcome.png b/res/mipmap-xxhdpi/on_boarding_welcome.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b11dea0e0947a5262232690c98b765d7fcfb366
GIT binary patch
literal 50862
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

literal 0
HcmV?d00001

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09120d086c..b25b4bb3d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -207,7 +207,7 @@ s -->
 
     <!-- Clings -->
     <!-- The title text for the workspace cling [CHAR_LIMIT=30] -->
-    <string name="first_run_cling_title">Welcome!</string>
+    <string name="first_run_cling_title">Welcome</string>
     <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->
     <string name="first_run_cling_description">Make yourself at home.</string>
     <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->
@@ -217,13 +217,13 @@ s -->
     <!-- The description of how to use the workspace [CHAR_LIMIT=60] -->
     <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string>
     <!-- The title text for the migration cling [CHAR_LIMIT=30] -->
-    <string name="migration_cling_title">Copy your apps?</string>
+    <string name="migration_cling_title">Copy your app icons</string>
     <!-- The description of what migration does [CHAR_LIMIT=60] -->
-    <string name="migration_cling_description">Import apps and folders from your old Home screens?</string>
+    <string name="migration_cling_description">Import icons and folders from your old Home screens?</string>
     <!-- The description of the button to migrate apps from another launcher [CHAR_LIMIT=30] -->
-    <string name="migration_cling_copy_apps">COPY APPS</string>
+    <string name="migration_cling_copy_apps">COPY ICONS</string>
     <!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] -->
-    <string name="migration_cling_use_default">USE DEFAULT</string>
+    <string name="migration_cling_use_default">START FRESH</string>
     <!-- The title text for the workspace cling [CHAR_LIMIT=30] -->
     <string name="workspace_cling_title">Organize your space</string>
     <!-- The description of how to use the workspace [CHAR_LIMIT=70] -->
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index ec0a4238fb..541eaddd0d 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -399,10 +399,10 @@ class LauncherClings {
     public void dismissMigrationClingCopyApps(View v) {
         // Copy the shortcuts from the old database
         LauncherModel model = mLauncher.getModel();
-//        model.resetLoadedState(false, true);
-//        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
-//                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE
-//                        | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS);
+        model.resetLoadedState(false, true);
+        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE
+                        | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS);
 
         // Set the flag to skip the folder cling
         String spKey = LauncherAppState.getSharedPreferencesKey();
@@ -418,9 +418,9 @@ class LauncherClings {
     public void dismissMigrationClingUseDefault(View v) {
         // Clear the workspace
         LauncherModel model = mLauncher.getModel();
-//        model.resetLoadedState(false, true);
-//        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
-//                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE);
+        model.resetLoadedState(false, true);
+        model.startLoader(false, PagedView.INVALID_RESTORE_PAGE,
+                LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE);
 
         // Disable the migration cling
         dismissMigrationCling();

From 5743aa9a86b7f559d9beb09c223dad8e3913c5c6 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Fri, 10 Jan 2014 18:02:06 -0500
Subject: [PATCH 103/147] backup keys that might have slipped past

seems a little paranoid, but can't hurt.

Bug: 12455866
Change-Id: If9da4cc021ee4fac32c822a91fabda69bf3ff8aa
---
 src/com/android/launcher3/LauncherBackupHelper.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index a081c21911..4e70e6efdf 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -296,8 +296,9 @@ public class LauncherBackupHelper implements BackupHelper {
                 final long updateTime = cursor.getLong(ID_MODIFIED);
                 Key key = getKey(Key.FAVORITE, id);
                 keys.add(key);
-                currentIds.add(keyToBackupKey(key));
-                if (updateTime >= in.t) {
+                final String backupKey = keyToBackupKey(key);
+                currentIds.add(backupKey);
+                if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packFavorite(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }
@@ -364,8 +365,9 @@ public class LauncherBackupHelper implements BackupHelper {
                 final long updateTime = cursor.getLong(ID_MODIFIED);
                 Key key = getKey(Key.SCREEN, id);
                 keys.add(key);
-                currentIds.add(keyToBackupKey(key));
-                if (updateTime >= in.t) {
+                final String backupKey = keyToBackupKey(key);
+                currentIds.add(backupKey);
+                if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packScreen(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }

From 13571ae0de05039944008906c8217f942b91bd23 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 13 Jan 2014 10:05:37 -0800
Subject: [PATCH 104/147] Set App context from WallpaperChanged receiver. (Bug
 12525684)

Change-Id: Ie037d74d31e6b05b0ae5bb25ed1bf1c639a28a5f
---
 src/com/android/launcher3/WallpaperChangedReceiver.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/WallpaperChangedReceiver.java b/src/com/android/launcher3/WallpaperChangedReceiver.java
index 28e41d8a5e..2d5612f120 100644
--- a/src/com/android/launcher3/WallpaperChangedReceiver.java
+++ b/src/com/android/launcher3/WallpaperChangedReceiver.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 
 public class WallpaperChangedReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent data) {
+        LauncherAppState.setApplicationContext(context.getApplicationContext());
         LauncherAppState appState = LauncherAppState.getInstance();
         appState.onWallpaperChanged();
     }

From f0fa440fab8ff87726ddf1ff404bbbcc9bb59289 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Mon, 13 Jan 2014 14:26:12 -0800
Subject: [PATCH 105/147] Import translations. DO NOT MERGE

Change-Id: Ib79d541dac6867d262bb02f04eda43728d7a8357
Auto-generated-cl: translation import
---
 res/values-af/strings.xml     |  6 +++++-
 res/values-am/strings.xml     |  6 +++++-
 res/values-ar/strings.xml     |  6 +++++-
 res/values-bg/strings.xml     | 11 ++++++++++-
 res/values-ca/strings.xml     |  6 +++++-
 res/values-cs/strings.xml     |  6 +++++-
 res/values-da/strings.xml     |  6 +++++-
 res/values-de/strings.xml     |  6 +++++-
 res/values-el/strings.xml     |  6 +++++-
 res/values-en-rGB/strings.xml |  6 +++++-
 res/values-en-rIN/strings.xml |  6 +++++-
 res/values-es-rUS/strings.xml |  6 +++++-
 res/values-es/strings.xml     |  6 +++++-
 res/values-et-rEE/strings.xml |  6 +++++-
 res/values-fa/strings.xml     |  6 +++++-
 res/values-fi/strings.xml     |  6 +++++-
 res/values-fr-rCA/strings.xml |  6 +++++-
 res/values-fr/strings.xml     |  6 +++++-
 res/values-hi/strings.xml     |  6 +++++-
 res/values-hr/strings.xml     |  6 +++++-
 res/values-hu/strings.xml     |  6 +++++-
 res/values-hy-rAM/strings.xml |  6 +++++-
 res/values-in/strings.xml     |  6 +++++-
 res/values-it/strings.xml     |  6 +++++-
 res/values-iw/strings.xml     |  6 +++++-
 res/values-ja/strings.xml     | 11 ++++++++++-
 res/values-ka-rGE/strings.xml |  6 +++++-
 res/values-km-rKH/strings.xml |  6 +++++-
 res/values-ko/strings.xml     |  6 +++++-
 res/values-lo-rLA/strings.xml |  6 +++++-
 res/values-lt/strings.xml     |  6 +++++-
 res/values-lv/strings.xml     |  6 +++++-
 res/values-mn-rMN/strings.xml |  6 +++++-
 res/values-ms-rMY/strings.xml |  6 +++++-
 res/values-nb/strings.xml     |  6 +++++-
 res/values-nl/strings.xml     |  6 +++++-
 res/values-pl/strings.xml     |  6 +++++-
 res/values-pt-rPT/strings.xml |  6 +++++-
 res/values-pt/strings.xml     |  6 +++++-
 res/values-rm/strings.xml     | 10 +++++++++-
 res/values-ro/strings.xml     |  6 +++++-
 res/values-ru/strings.xml     | 11 ++++++++++-
 res/values-sk/strings.xml     | 11 ++++++++++-
 res/values-sl/strings.xml     |  6 +++++-
 res/values-sr/strings.xml     |  6 +++++-
 res/values-sv/strings.xml     |  8 ++++++--
 res/values-sw/strings.xml     |  6 +++++-
 res/values-th/strings.xml     |  6 +++++-
 res/values-tl/strings.xml     |  6 +++++-
 res/values-tr/strings.xml     | 11 ++++++++++-
 res/values-uk/strings.xml     |  6 +++++-
 res/values-vi/strings.xml     |  6 +++++-
 res/values-zh-rCN/strings.xml | 11 ++++++++++-
 res/values-zh-rHK/strings.xml |  6 +++++-
 res/values-zh-rTW/strings.xml |  6 +++++-
 res/values-zu/strings.xml     |  6 +++++-
 56 files changed, 315 insertions(+), 57 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 34a5568dc2..2c55a04b5a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Tuisskerm %1$d van %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Programme-bladsy %1$d van %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Legstukke-bladsy %1$d van %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welkom!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welkom"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Maak jouself tuis."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Skep meer skerms vir programme en vouers"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopieer jou program-ikone"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Voer ikone en vouers vanaf jou ou tuisskerms in?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIEER IKONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"BEGIN VAN NUUTS AF"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiseer jou spasie"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Raak en hou agtergrond om muurpapier, legstukke en instellings te bestuur."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Hier\'s \'n vouer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c6420d56bc..605eac12e5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"መነሻ ማያ ገጽ %1$d ከ%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"የመተግበሪያዎች ገጽ %1$d ከ%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"የመግብሮች ገጽ %1$d ከ%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"እንኳን ደህና መጡ!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"እንኳን በደህና መጡ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ልክ እቤትዎ እንዳሉ ሆነው ዘና ይበሉ።"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"ለመተግበሪያዎች እና አቃፊዎች ተጨማሪ ማያ ገጾችን ይፍጠሩ"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"የመተግበሪያ አዶዎችዎን ይቅዱ"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"አዶዎች እና አቃፊዎች ከድሮው የመነሻ ማያ ገጾችዎ ይምጡ?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"አዶዎችን ይቅዱ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"እንደ አዲስ ይጀምሩ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ቦታዎን ያደራጁ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"የግድግዳ ወረቀት፣ ምግብሮችን እና ቅንብሮችን ለማቀናበር ጀርባውን ይንኩ እና ይያዙት።"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"አንድ አቃፊ እነሆ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index aeca02532d..e70aa36cea 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏الشاشة الرئيسية %1$d من %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"‏صفحة التطبيقات %1$d من %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"‏صفحة الأدوات %1$d من %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"مرحبًا!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"مرحبًا"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"تصرف على راحتك."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"إنشاء المزيد من الشاشات للتطبيقات والمجلدات"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"نسخ رموز التطبيقات"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"هل تريد استيراد رموز ومجلدات من الشاشات الرئيسية القديمة؟"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"نسخ الرموز"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"بداية جديدة"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"تنظيم مساحتك"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"المس مع الاستمرار الجزء الخلفي من صورة الشاشة لإدارة الخلفية والأدوات والإعدادات."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"إليك المجلد"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2a2b72d290..27a1812f58 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Начален екран %1$d от %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Страница с приложения %1$d от %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Страница с приспособления %1$d от %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Добре дошли!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Персонализиране и приспособяване."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Създаване на още екрани за приложения и папки"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организиране на мястото ви"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Докоснете и задръжте фона, за да управлявате тапета, приспособленията и настройките."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ето една папка"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fa520ba678..ba3f418bf3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla d\'inici %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pàgina d\'aplicacions %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pàgina de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Hola!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Us donem la benvinguda"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personalitza la pantalla d\'inici"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea més pantalles per a aplicacions i carpetes"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar les icones d\'aplicació"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importar icones i carpetes de pantalles d\'inici anteriors?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIA LES ICONES."</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"NOU COMENÇAMENT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organitza el teu espai"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Toca i mantén premut el fons per gestionar el fons de pantalla, els widgets i la configuració."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Aquí hi ha una carpeta"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fdd48458c8..68ff5f75f8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikací %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka widgetů %1$d z %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Vítejte!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Vítejte"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Udělejte si pohodlí."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvořte několik obrazovek pro aplikace a složky"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Zkopírování ikon aplikací"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Chcete importovat ikony a složky ze svých starých ploch?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ZKOPÍROVAT IKONY"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ZAČÍT S VÝCHOZÍM ROZVRŽENÍM"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizace prostoru"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Chcete-li spravovat tapetu, widgety a nastavení, dotkněte se pozadí a přidržte je."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Toto je složka"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9bf05f0b64..c145dce927 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startskærm %1$d ud af %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-side %1$d ud af %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-side %1$d ud af %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Velkommen"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Velkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Føl dig hjemme."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opret flere skærme til apps og mapper"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiér dine appikoner"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra gamle startskærme?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIÉR IKONER"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START PÅ EN FRISK"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser din arbejdsplads"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Tryk på en baggrund, og hold fingeren nede for at administrere baggrunde, widgets og indstillinger."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Her kan du se en mappe"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4d70318bbc..d13a492a7c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startbildschirm %1$d von %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Hallo!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Willkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Mehr Bildschirme für Apps und Ordner erstellen"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"App-Symbole kopieren"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Symbole und Ordner alter Startbildschirme importieren?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"Symbole kopieren"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"Standardübersicht verwenden"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Arbeitsbereich organisieren"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Hintergrund berühren und halten, um Hintergrund, Widgets und Einstellungen zu verwalten"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Hier ist ein Ordner"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cfb97ece02..7bdfa134a3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Αρχική οθόνη %1$d από %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Σελίδα εφαρμογών %1$d από %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Σελίδα γραφικών στοιχείων %1$d από %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Καλώς ορίσατε!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Καλώς ορίσατε"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Νιώστε σαν στο σπίτι σας."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Δημιουργία περισσότερων οθονών για εφαρμογές και φακέλους"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Αντιγραφή εικονιδίων εφαρμογών"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Εισαγωγή εικονιδίων και φακέλων από παλιές αρχικές οθόνες;"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ΑΝΤΙΓΡΑΦΗ ΕΙΚΟΝΙΔΙΩΝ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ΝΕΑ ΕΝΑΡΞΗ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Οργανώστε το χώρο σας"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Αγγίξτε παρατεταμένα το φόντο για να διαχειριστείτε την ταπετσαρία, τα γραφικά στοιχεία και τις ρυθμίσεις."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ορίστε ένας φάκελος"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2ca832b330..f4f11dadab 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d of %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps page %1$d of %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets page %1$d of %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welcome!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welcome"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Make yourself at home."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Create more screens for apps and folders"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copy your app icons"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import icons and folders from your old Home screens?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPY ICONS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START AFRESH"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organise your space"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Touch &amp; hold background to manage wallpaper, widgets and settings."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Here\'s a folder"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2ca832b330..f4f11dadab 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d of %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps page %1$d of %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets page %1$d of %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welcome!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welcome"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Make yourself at home."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Create more screens for apps and folders"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copy your app icons"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import icons and folders from your old Home screens?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPY ICONS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START AFRESH"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organise your space"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Touch &amp; hold background to manage wallpaper, widgets and settings."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Here\'s a folder"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cec4c10a8c..d585f366ea 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"¡Bienvenido/a!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Te damos la bienvenida"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Siéntete como en casa."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas."</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar íconos de aplicaciones"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar íconos y carpetas de pantallas princip. antiguas?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONOS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"EMPEZAR DE CERO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén presionado el fondo para administrar el fondo de pantalla, los widgets y la configuración."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Aquí tienes una carpeta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 73dae125f8..8ca3e08d08 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla de inicio %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Te damos la bienvenida"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Te damos la bienvenida"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personaliza tu pantalla de inicio."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar iconos de aplicaciones"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar iconos y carpetas de pantallas de inicio antiguas?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ICONOS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"INICIAR ACTUALIZACIÓN"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para gestionar el fondo de pantalla, los widgets y los ajustes."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Esto es una carpeta"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index a68778a3ec..4a0dd8e7b1 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Avaekraan %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Rakenduste leht %1$d/%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Vidinate leht %1$d/%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Tere tulemast!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Tere tulemast"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Tundke end nagu kodus."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Looge rakenduste ja kaustade jaoks rohkem ekraanikuvasid"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopeerige rakenduste ikoonid"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Kas importida vanade avaekraanide ikoonid ja kaustad?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPEERI IKOONID"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ALUSTA ALGUSEST"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Korraldage oma ruumi"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Taustapildi, vidinate ja seadete haldamiseks puudutage tausta ning hoidke seda all."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Siin on kaust"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f118c10144..dc5f1864b6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏صفحه اصلی %1$d از %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"‏صفحه برنامه‌ها %1$d از %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"‏صفحه ابزارک‌ها %1$d از %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"خوش آمدید!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"خوش آمدید"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"راحت باشید."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"صفحات بیشتری را برای برنامه‌ها و پوشه‌ها ایجاد کنید"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"کپی کردن نمادهای برنامه شما"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"نمادها و پوشه‌ها از صفحه‌های اصلی قدیمی شما وارد شوند؟"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"کپی نمادها"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"شروع تازه"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"فضای خود را سازماندهی کنید"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"برای مدیریت کاغذدیواری، ابزارک‌ها و تنظیمات، پس‌زمینه را لمس کرده و نگه‌دارید."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"اینجا یک پوشه است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 549804d602..9bf69f4eaf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Aloitusruutu %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-sivu %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgetit-sivu %1$d / %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Tervetuloa!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Tervetuloa"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Ole kuin kotonasi."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Luo lisää ruutuja sovelluksille ja kansioille"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopioi sovelluskuvakkeet"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Tuodaanko kuvakkeet ja kansiot vanhoista aloitusruuduista?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIOI KUVAKKEET"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ALOITA ALUSTA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Järjestä tilasi"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Hallitse taustakuvaa, widgetejä ja asetuksia koskettamalla taustaa pitkään."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tässä on kansio"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 97c03fe15c..d0908ff9d6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Écran d\'accueil %1$d sur %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Page des applications : %1$d sur %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Page des widgets : %1$d sur %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bienvenue!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bienvenue"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Faites comme chez vous."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Créer plus d\'écrans pour les applications et les dossiers"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copier les icônes de vos applis"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importer les icônes et dossiers des anciens écrans d\'accueil?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIER LES ICÔNES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"DISPOSITION PAR DÉFAUT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser son espace personnel"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Maintenez votre doigt sur l\'arrière-plan pour gérer les fonds d\'écran, les widgets et les paramètres."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Voici un dossier"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0f9d836c43..1340dd54d4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Écran d\'accueil %1$d sur %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Page des applications %1$d sur %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Page des widgets %1$d sur %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bienvenue !"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bienvenue"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Familiarisez-vous avec l\'écran d\'accueil."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Créez des écrans personnalisés pour vos applis et dossiers"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copier les icônes de vos applis"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importer les icônes et dossiers des anciens écrans d\'accueil ?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIER LES ICÔNES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"DISPOSITION PAR DÉFAUT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organisez votre espace"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Appuyez de manière prolongée sur l\'arrière-plan pour gérer les fonds d\'écran, les widgets et les paramètres."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Voici un dossier"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e149e0fcc6..67bfcc7797 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"होम स्क्रीन %2$d में से %1$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"एप्लिकेशन पृष्ठ %2$d में से %1$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"विजेट पृष्ठ %2$d में से %1$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"स्वागत है!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"स्वागत है"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"जैसा चाहें वैसा उपयोग करें."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"एप्लिकेशन और फ़ोल्डर के लिए और अधिक स्क्रीन बनाएं"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"ऐप्स आइकन की प्रतिलिपि बनाएं"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"अपनी पुरानी होम स्क्रीन से आइकन और फ़ोल्डर आयात करें?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"आइकन की प्रतिलिपि बनाएं"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"फिर से शुरू करें"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"अपने स्थान को व्यवस्थित करें"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"वॉलपेपर, विजेट और सेटिंग प्रबंधित करने के लिए पृष्ठभूमि को स्पर्श करके रखें."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"यहां एक फ़ोल्डर है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c9b119fefc..8d6b3fde99 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Početni zaslon %1$d od %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stranica aplikacija %1$d od %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stranica widgeta %1$d od %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Dobro došli!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Dobro došli"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Osjećajte se kao kod kuće."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Izradite više zaslona za aplikacije i mape"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiranje ikona aplikacija"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Želite li uvesti ikone i mape sa starih početnih zaslona?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIRAJ IKONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"POKRENI NOVO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizirajte svoj prostor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Dodirnite i držite pozadinu da biste upravljali pozadinskom slikom, widgetima i postavkama."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Evo mape"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2b33776438..2c95329f45 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%2$d/%1$d. kezdőképernyő"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%2$d/%1$d. alkalmazásoldal"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%2$d/%1$d. moduloldal"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Üdvözöljük!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Üdvözöljük!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Varázsolja egyedivé készülékét."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Hozzon létre további képernyőket az alkalmazásoknak és mappáknak"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Alkalmazásikonok másolása"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importálja ikonjait és mappáit régi kezdőképernyőiről?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"IKONOK MÁSOLÁSA"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"TELJESEN ÚJ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Munkaterület rendezése"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Érintse meg és tartsa lenyomva a hátteret a háttérkép, modulok és beállítások kezeléséhez."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Itt egy mappa"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index eb7396b15a..e18b7e25e6 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Հիմնական էկրան %1$d` %2$d-ից"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ծրագրերի էջերը՝ %1$d %2$d-ից"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Վիջեթների էջերը՝ %1$d %2$d-ից"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Բարի գալուստ:"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Բարի գալուստ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Զգացեք ձեզ ինչպես տանը:"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Ստեղծեք նոր էկրաններ ծրագրերի և թղթապանակների համար"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Պատճենել ձեր ծրագրի պատկերակները"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Ներմուծե՞լ պատկերակները և թղթապանակները ձեր նախկին Հիմնական էկրանից"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ՊԱՏՃԵՆԵԼ ՊԱՏԿԵՐԱԿՆԵՐԸ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ՄԵԿՆԱՐԿԵԼ ԸՍՏ ԿԱՆԽԱԴՐՎԱԾԻ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Կառավարեք ձեր տարածությունը"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Հպեք և պահեք հետնաշերտի վրա՝ պաստառները, վիջեթներն ու կարգավորումները կառավարելու համար:"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ահա մի թղթապանակ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 87d163ac30..5b59a8b8a9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Layar utama %1$d dari %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Laman aplikasi %1$d dari %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Laman widget %1$d dari %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Selamat datang!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Selamat Datang"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Serasa di rumah sendiri."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak layar untuk aplikasi dan folder"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Salin ikon aplikasi Anda"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Impor ikon dan folder dari layar Utama lama Anda?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"IKON SALIN"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"MULAI DARI AWAL"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Kelola ruang Anda"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Sentuh lama latar belakang untuk mengelola wallpaper, widget, dan setelan."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ini adalah folder"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 92d79b0408..52548be272 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Schermata Home %1$d di %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pagina di applicazioni %1$d di %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pagina di widget %1$d di %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Benvenuto!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Benvenuto"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personalizza la schermata Home."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Creare più schermate per app e cartelle"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copia le icone delle tue app"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importare icone e cartelle dalle schermate Home precedenti?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIA ICONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"RICOMINCIA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizza il tuo spazio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Tocca e tieni premuto lo sfondo per gestire sfondi, widget e impostazioni."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ecco una cartella"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a348646d31..38d1cee35c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏מסך דף הבית %1$d מתוך %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"‏דף אפליקציות %1$d מתוך %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"‏דף רכיבי ווידג\'ט ‏%1$d מתוך %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ברוך הבא!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ברוכים הבאים"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"להרגיש בבית."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"צור מסכים נוספים עבור אפליקציות ותיקיות"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"העתקת סמלי האפליקציות שלך"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"האם לייבא סמלים ותיקיות ממסכי דף הבית הישנים שלך?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"העתק סמלים"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"התחל דף חדש"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ארגן את אזור העבודה שלך"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"גע נגיעה רציפה ברקע כדי לנהל את הטפט, רכיבי הווידג\'ט וההגדרות."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"הנה תיקייה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1de0be5c32..63ac20e1d3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"ホーム画面: %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"アプリの%1$d/%2$dページ"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ウィジェットの%1$d/%2$dページ"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ようこそ！"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"ホームをカスタマイズします。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"アプリとフォルダの画面をもっと作成します"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"スペースを整理"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"壁紙、ウィジェット、設定を管理するには、背景を押し続けます。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"これがフォルダです"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c004f07f1c..e55ae844ae 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"მთავარი ეკრანი %1$d, %2$d-დან"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"აპების გვერდი %1$d, %2$d-დან"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ვიჯეტების გვერდი %1$d, %2$d-დან"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"კეთილი იყოს თქვენი მობრძანება!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"მოგესალმებით"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"იგრძენით თავი საკუთარ სახლში"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"აპებისა და საქაღალდეებისთვის კიდევ ერთი ეკრანის შექმნა"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"თქვენი აპის ხატულების კოპირება"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"გსურთ ძვლი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ხატულების კოპირება"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"სტანდარტული განლაგება"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"თქვენი სივრცის ორგანიზება"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"თუ გსურთ ფონების, ვიჯეტების და პარამეტრების მართვა, შეეხეთ და არ აუშვათ ფონს."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"აი, საქაღალდე"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 84781bcc21..a15ef21cbc 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"អេក្រង់​ដើម %1$d នៃ %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"ទំព័រ​កម្មវិធី %1$d នៃ %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ទំព័រ​ធាតុ​ក្រាហ្វិក ​%1$d នៃ %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"សូម​ស្វាគមន៍​!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"សូម​ស្វាគមន៍"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ធ្វើ​ដោយ​ខ្លួន​ឯង​នៅ​លើ​អេក្រង់​ដើម។"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"បង្កើត​អេក្រង់​ច្រើន​សម្រាប់​កម្មវិធី​ ​និង​ថតឯកសារ"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"ចម្លង​រូបតំណាង​កម្មវិធី​របស់​អ្នក"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"នាំចូល​រូបតំណាង និង​ថត​ពី​អេក្រង់​ដើម​ចាស់​របស់​អ្នក?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"រូប​តំណាង​ច្បាប់​ចម្លង"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ចាប់ផ្ដើម​ធ្វើ​ឲ្យ​ស្រស់"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"រៀបចំ​ចន្លោះ​របស់​អ្នក"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"ប៉ះ &amp; សង្កត់​លើ​ផ្ទៃ​ខាង​ក្រោម ដើម្បី​គ្រប់គ្រង​ផ្ទាំង​រូបភាព, ធាតុ​ក្រាហ្វិក និង​ការ​កំណត់។"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"នេះ​ជា​ថត"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 59f2103d89..942f30bbbc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"홈 화면 %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"앱 페이지 %1$d/%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"위젯 페이지 %1$d/%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"환영합니다!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"환영합니다."</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"편리한 사용 환경을 만드세요."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"앱 및 폴더를 표시할 화면 더 만들기"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"앱 아이콘 복사"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"이전 메인 스크린에서 아이콘과 폴더를 가져오시겠습니까?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"아이콘 복사"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"새로 시작"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"공간 관리하기"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"배경화면, 위젯, 설정을 관리하려면 백그라운드를 길게 터치합니다."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"폴더"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index ad2feeab45..fbc7bf063a 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"ໜ້າຈໍຫຼັກ %1$d ໃນ %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"ແອັບຯໜ້າ %1$d ໃນ %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ວິດເຈັດໜ້າ %1$d ໃນ %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ຍິນດີຕ້ອນຮັບ!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ຍິນດີຕ້ອນຮັບ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ເຮັດໂຕໃຫ້ຄືຢູ່ໃນບ້ານ"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"ສ້າງຈໍເພີ່ມເຕີມສຳລັບແອັບຯ ແລະໂຟນເດີ"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"ສຳເນົາໄອຄອນແອັບຯຂອງທ່ານ"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"ນຳເຂົ້າໄອຄອນ ແລະ ໂຟນເດີຈາກໂຮມສະກຣີນອັນເກົ່າຂອງທ່ານບໍ່?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ສຳເນົາໄອຄອນ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ເລີ່ມຕົ້ນໃໝ່"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ຈັດການພື້ນທີ່ຂອງທ່ານ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"ແຕະຄ້າງໄວ້ທີ່ພາບພື້ນຫຼັງເພື່ອຈັດການພາບພື້ນຫຼັງ, ວິດເຈັດແລະການຕັ້ງຄ່າ."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ່"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8b1f396032..482b7a4105 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d pagrindinis ekranas iš %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d programų psl. iš %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d valdiklių psl. iš %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Sveiki!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Sveiki"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Jauskitės kaip namie."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Sukurkite daugiau programų ir aplankų ekrano kopijų"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Programų piktogramų kopij."</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importuoti piktogramas ir aplankus iš senų pagr. ekranų?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIJUOTI PIKTOGRAMAS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"PRADĖTI IŠ NAUJO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Tvarkykite savo vietą"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Palieskite ir laikykite foną, jei norite tvarkyti ekrano foną, valdiklius ir nustatymus."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Štai aplankas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 964d84d133..2b2dba8d3a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Sākuma ekrāns: %1$d no %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d. lietotņu lapa no %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d. logrīku lapa no %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Laipni lūdzam!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Laipni lūdzam!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Informācija par pamatfunkcijām"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Izveidojiet vairāk ekrānu lietotnēm un mapēm."</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Lietotņu ikonu kopēšana"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vai importēt ikonas, mapes no iepriekšējiem sākuma ekrāniem?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPĒT IKONAS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"SĀKT NO SĀKUMA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Kārtojiet savu darbvietu"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Pieskarieties fonam un turiet to, lai pārvaldītu fona tapeti, logrīkus un iestatījumus."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Lūk, mape!"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index bed237a832..9f489cfdf7 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%2$d-н Нүүр дэлгэц %1$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%2$d-н %1$d апп хуудас"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%2$d-н %1$d виджет хуудас"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Тавтай морилно уу!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Тавтай морилно уу"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Гэртээ байгаа мэт тухлаарай."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Апп болон фолдеруудад зориулан өөр дэлгэцүүд үүсгээрэй"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Таны апп дүрсүүдийг хуулах"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Таны хуучин Үндсэн дэлгэц дээрх дүрсүүдийг импорт хийх үү?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ДҮРСҮҮДИЙГ ХУУЛАХ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ШИНЭЭР ЭХЛЭХ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Өөрийнхөө зайг тохируулаарай"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Арын дэвсгэр дээр хүрээд &amp; дарснаар ханын зураг, виджет болон тохиргоог өөрчилж болно."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Фолдер энд байна"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3558b25107..2aee204059 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Skrin Laman Utama %1$d daripada %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Halaman apl %1$d daripada %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Halaman widget %1$d daripada %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Selamat datang!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Selamat datang"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Buat seperti berada di rumah sendiri."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak skrin untuk apl dan folder"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Salin ikon apl anda"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import ikon dan folder dari skrin Laman Utama anda?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"SALIN IKON"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"MULAKAN YANG BAHARU"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Susun ruang anda"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Sentuh &amp; tahan latar belakang untuk mengurus kertas dinding, widget dan tetapan."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ini ada folder"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 13d87591e1..4703291eb8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startside %1$d av %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Appside %1$d av %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Modulside %1$d av %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Velkommen!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Velkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Føl deg som hjemme."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opprett flere sider for apper og mapper"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiér appikonene dine"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra de gamle startsidene?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIÉR IKONENE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START PÅ NYTT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser plassen din"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Trykk og hold på bakgrunnen for å administrere bakgrunnen, moduler og innstillinger."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Dette er en mappe"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index aa035a09ab..658f379122 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startscherm %1$d van %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"App-pagina %1$d van %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgetpagina %1$d van %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welkom!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welkom"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personaliseer uw startscherm."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Meer schermen maken voor apps en mappen"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Uw app-pictogrammen kopiëren"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Pictogrammen en mappen importeren uit uw oude startschermen?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"PICTOGRAMMEN KOPIËREN"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"OPNIEUW BEGINNEN"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Uw ruimte indelen"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Blijf de achtergrond aanraken om de achtergrond, widgets en instellingen te beheren."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Dit is een map"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9eade81a9a..f8a34a480e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ekran główny %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Strona aplikacji: %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Strona widżetów: %1$d z %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Witamy"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Witamy"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Poczuj się jak u siebie."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Dodaj więcej ekranów na aplikacje i foldery"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiuj ikony aplikacji"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Zaimportować ikony i foldery ze starych ekranów głównych?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIUJ IKONY"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ZACZNIJ OD NOWA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Uporządkuj obszar roboczy"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Kliknij i przytrzymaj tło, by zmienić tapetę, widżety lub ustawienia."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tu jest folder"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4c9401dc38..5490a4fdd5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ecrã principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicações %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bem-vindo(a)!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bem-vindo(a)"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Sinta-se em casa."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais ecrãs para aplicações e pastas"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar ícones das aplicações"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importar ícones e pastas dos ecrãs principais antigos?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"COMEÇAR DO INÍCIO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizar o seu espaço"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Toque sem soltar no fundo para gerir a imagem de fundo, os widgets e as definições."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Eis uma pasta"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d82d9ea1d2..2bf38e546b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Tela inicial %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicativos, %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets, %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bem-vindo!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bem-vindo"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Fique à vontade."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais telas para aplicativos e pastas"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar ícones de aplicativos"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importar ícones e pastas de suas telas iniciais antigas?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"COMEÇAR DO ZERO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organize seu espaço"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Toque e mantenha pressionada a tela de fundo para gerenciar o plano de fundo, os widgets e as configurações."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Aqui está uma pasta"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 246553467b..ce6093f153 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -148,7 +148,7 @@
     <skip />
     <!-- no translation found for apps_customize_widgets_scroll_format (3106209519974971521) -->
     <skip />
-    <!-- no translation found for first_run_cling_title (7257389003637362144) -->
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
     <skip />
     <!-- no translation found for first_run_cling_description (6447072552696253358) -->
     <skip />
@@ -156,6 +156,14 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) -->
     <skip />
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <!-- no translation found for workspace_cling_title (5626202359865825661) -->
     <skip />
     <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 016dd918c2..a23a0cd2c0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ecranul de pornire %1$d din %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pagina de aplicații %1$d din %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pagina de widgeturi %1$d din %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bun venit!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bun venit"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Simțiți-vă ca acasă."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Creați mai multe ecrane pentru aplicații și dosare"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiați pictogr. aplicațiilor"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import. pictogr. și dosare de pe ecranele de pornire anter.?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAȚI PICTOGRAMELE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"REÎNCEPEȚI"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizați-vă spațiul"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Atingeți lung fundalul pentru a gestiona imaginea de fundal, widgeturile și setările."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Iată un dosar"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8d0984da29..46c84af6cd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Главные экран %1$d из %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Приложения: стр. %1$d из %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Виджеты: стр. %1$d из %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Добро пожаловать!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте как дома"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Создание дополнительных экранов для приложений и папок"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организация рабочего пространства"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Чтобы перейти к управлению обоями, виджетами и настройками, нажмите на фоновое изображение и удерживайте его."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Это папка"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3a4b03348a..64de07f5ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikácií %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka miniaplikácií %1$d z %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Vitajte!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Cíťte sa tu ako doma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvorte viac obrazoviek pre aplikácie a priečinky"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Usporiadajte svoj priestor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Ak chcete spravovať tapetu, miniaplikácie a nastavenia, dotknite sa pozadia a podržte."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tu je priečinok"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 68086dbc1c..f6d755643c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Začetni zaslon %1$d od %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stran aplikacij %1$d od %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stran pripomočkov %1$d od %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Pozdravljeni!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Pozdravljeni"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Počutite se kot doma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Ustvarite več zaslonov za aplikacije in mape"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiranje ikon aplikacij"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Želite uvoziti ikone in mape iz starih začetnih zaslonov?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIRAJ IKONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"SVEŽ ZAČETEK"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizirajte svoj prostor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Če želite upravljati ozadje, pripomočke in nastavitve, se dotaknite ozadja in ga pridržite."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"To je mapa"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6ab175069d..0d35b2f0ce 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d. почетни екран од %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d. страница апликација од %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d. страница виџета од %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Добро дошли!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Добро дошли"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Осећајте се као код куће."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Направите још екрана за апликације и директоријуме"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Копирајте иконе апликација"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Увести иконе и директоријуме са старих почетних екрана?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРАЈТЕ ИКОНЕ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ПОЧНИТЕ ИСПОЧЕТКА"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организујте простор"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Додирните позадину и задржите да бисте управљали позадином, виџетима и подешавањима."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ево једног директоријума"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c6dcb18ff3..3fa6a5e03a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -84,15 +84,19 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startskärmen %1$d av %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Appsida %1$d av %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget-sida %1$d av %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Välkommen!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Välkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Känn dig som hemma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Skapa fler skärmar för appar och mappar"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiera appikoner"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vill du importera ikoner och mappar från gamla startskärmar?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIERA IKONER"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"BÖRJA OM"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organisera ditt utrymme"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Tryck länge på bakgrunden om du vill hantera bakgrundsbilder, widgetar och inställningar."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Det här är en mapp"</string>
-    <string name="folder_cling_create_folder" msgid="6158215559475836131">"Om du vill skapa en till mapp av det här slaget trycker du länge på en app och drar den sedan ovanpå en annan."</string>
+    <string name="folder_cling_create_folder" msgid="6158215559475836131">"Skapa en till mapp av det här slaget genom att trycka och hålla ned en app och sedan dra den ovanpå en annan."</string>
     <string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
     <string name="folder_opened" msgid="94695026776264709">"Mappen är öppen, <xliff:g id="WIDTH">%1$d</xliff:g> gånger <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="1884479294466410023">"Tryck om du vill stänga mappen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e0ae27924d..fca5a47e9c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -86,11 +86,15 @@
     <skip />
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ukurasa wa programu %1$d ya %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Ukurasa wa wijeti %1$d ya %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Karibu!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Karibu"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Jisikie huru."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Unda skrini zaidi za programu na folda"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Nakili ikoni za programu yako"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Je, ungependa kuingiza ikoni na folda kutoka kwa skrini zako za Mwanzo za zamani?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"NAKILI IKONI"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ANZA UPYA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Panga nafasi yako"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Gusa na ushikilie mandharinyuma ili udhibiti mandhari, wijeti, na mipangilio."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Hii ni folda"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0a9ea784dc..70c2134e94 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"หน้าจอหลัก %1$d จาก %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"แอปหน้า %1$d จาก %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"วิดเจ็ตหน้า %1$d จาก %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ยินดีต้อนรับ!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ยินดีต้อนรับ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ทำตัวตามสบาย"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"สร้างหน้าจอเพิ่มสำหรับแอปและโฟลเดอร์"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"คัดลอกไอคอนแอปของคุณ"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"นำเข้าไอคอนและโฟลเดอร์จากหน้าจอหลักเก่าของคุณ"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"คัดลอกไอคอน"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"เริ่มต้นใหม่"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"จัดระเบียบพื้นที่ของคุณ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"แตะพื้นหลังค้างไว้เพื่อจัดการวอลเปเปอร์ วิดเจ็ต และการตั้งค่า"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"นี่คือโฟลเดอร์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 41de1c02c7..190565e5fd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d ng %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pahina ng apps %1$d ng %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pahina ng widget %1$d ng %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Maligayang pagdating!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Maligayang Pagdating"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gawing kumportable ang iyong sarili."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Gumawa ng higit pang mga screen para sa apps at mga folder"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopyahin ang mga icon ng app"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"I-import ang icon at folder mula sa luma mong Home screen?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPYAHIN ANG MGA ICON"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"MAGSIMULA NANG BAGO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Ayusin ang iyong espasyo"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Pindutin nang matagal ang background upang pamahalaan ang wallpaper, mga widget at setting"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Narito ang isang folder"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e77d76b8e8..bb8f6be466 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ana ekran %1$d / %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Uygulama sayfası %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget sayfası %1$d / %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Hoş geldiniz!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Rahatınıza bakın."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Uygulamalar ve klasörler için daha fazla ekran oluşturun"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Alanınızı düzenleyin"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Duvar kağıdını, widget\'ları ve ayarları yönetmek için arka plana uzun basın."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"İşte bir klasör"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5a32a479e6..8ceb8e8bda 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Головний екран %1$d з %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Сторінка програм %1$d з %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Сторінка віджетів %1$d з %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Вітаємо!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Вітаємо"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте як удома."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Створюйте нові екрани для програм і папок"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Копіювати значки програм"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Імпортувати значки та папки зі старих головних екранів?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПІЮВАТИ ЗНАЧКИ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ПАНЕЛЬ ЗАПУСКУ ЗА УМОВЧАННЯМ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Організуйте робочий простір"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Натисніть і утримуйте фон, щоб керувати фоновим малюнком, віджетами та налаштуваннями."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Це папка"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4c15bc80e4..abe17c2bc6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Màn hình chính %1$d / %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Trang ứng dụng %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Trang tiện ích con %1$d / %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Xin chào!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Chào mừng"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Tự nhiên như ở nhà."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Tạo thêm màn hình cho ứng dụng và thư mục"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Sao chép biểu tượng ứng dụng của bạn"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Nhập biểu tượng và thư mục từ Màn hình chính cũ của bạn?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"BIỂU TƯỢNG SAO CHÉP"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"BẮT ĐẦU LÀM MỚI"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Sắp xếp không gian của bạn"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Chạm và giữ nền để quản lý hình nền, tiện ích con và cài đặt."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Đây là một thư mục"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8a6d9c64c0..f01b695732 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主屏幕：第%1$d屏，共%2$d屏"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"应用：第%1$d页，共%2$d页"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小部件：第%1$d页，共%2$d页"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"欢迎！"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"您的主屏幕您做主。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"添加更多屏幕来容纳应用和文件夹"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"整理您的空间"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"触摸并按住背景，即可管理壁纸、小部件和设置。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"这是一个文件夹"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9d1e305799..c12c03f0e3 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主畫面 %1$d，共 %2$d 個"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"第 %1$d 個應用程式頁面，共 %2$d 頁"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"第 %1$d 個小工具頁面，共 %2$d 頁"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"歡迎！"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"歡迎"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"自訂主畫面。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"建立更多應用程式和資料夾的畫面"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"複製您的應用程式圖示"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"要從舊主畫面匯入圖示和資料夾嗎？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"複製圖示"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"重新開始"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"管理您的空間"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"輕觸並按住背景，即可管理桌布、小工具和設定。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"資料夾顯示如下"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6d82cf80e0..b0cc1e8318 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主螢幕：第 %1$d 頁，共 %2$d 頁"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"應用程式：第 %1$d 頁，共 %2$d 頁"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小工具：第 %1$d 頁，共 %2$d 頁"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"歡迎使用！"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"歡迎使用"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"主螢幕由您作主。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"建立更多畫面容納應用程式和資料夾"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"複製您的應用程式圖示"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"要從舊的主螢幕匯入圖示和資料夾嗎？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"複製圖示"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"重新開始"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"管理您的空間"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"輕觸並按住背景，即可管理桌布、小工具和設定。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"資料夾顯示如下"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2cde50a328..57bc7d4db3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Isikrini sasekhaya esingu-%1$d se-%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ikhasi lezinhlelo zokusebenza elingu-%1$d le-%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Ikhasi lamawijethi elingu-%1$d le-%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Siyakwamukela!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Siyakwamukela"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Zizwe usekhaya."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Dala izikrini eziningi zezinhlelo zokusebenza namafolda"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopisha izithonjana zakho zohlelo lokusebenza"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Ngenisa izithonjana namafolda kusukela kuzikrini zakho ezindala zasekhaya?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPISHA IZITHONJANA"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"QALISA KABUSHA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Hlela isikhala sakho"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Thinta uphinde ubambe okungemuva ukuze uphathe isithombe sangemuva, amawijethi nezilungiselelo."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Nayi ifolda"</string>

From 7614f33a7887ed5dc9c473634dc576daa901d94c Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Mon, 13 Jan 2014 14:28:22 -0800
Subject: [PATCH 106/147] Import translations. DO NOT MERGE

Change-Id: I6cf43d3ab8f99f3bda1fd114e2135d7c89797b11
Auto-generated-cl: translation import
---
 res/values-af/strings.xml     |  6 +++++-
 res/values-am/strings.xml     |  6 +++++-
 res/values-ar/strings.xml     |  6 +++++-
 res/values-bg/strings.xml     | 11 ++++++++++-
 res/values-ca/strings.xml     |  6 +++++-
 res/values-cs/strings.xml     |  6 +++++-
 res/values-da/strings.xml     |  6 +++++-
 res/values-de/strings.xml     |  6 +++++-
 res/values-el/strings.xml     |  6 +++++-
 res/values-en-rGB/strings.xml |  6 +++++-
 res/values-en-rIN/strings.xml |  6 +++++-
 res/values-es-rUS/strings.xml |  6 +++++-
 res/values-es/strings.xml     |  6 +++++-
 res/values-et-rEE/strings.xml |  6 +++++-
 res/values-fa/strings.xml     |  6 +++++-
 res/values-fi/strings.xml     |  6 +++++-
 res/values-fr-rCA/strings.xml |  6 +++++-
 res/values-fr/strings.xml     |  6 +++++-
 res/values-hi/strings.xml     |  6 +++++-
 res/values-hr/strings.xml     |  6 +++++-
 res/values-hu/strings.xml     |  6 +++++-
 res/values-hy-rAM/strings.xml |  6 +++++-
 res/values-in/strings.xml     |  6 +++++-
 res/values-it/strings.xml     |  6 +++++-
 res/values-iw/strings.xml     |  6 +++++-
 res/values-ja/strings.xml     | 11 ++++++++++-
 res/values-ka-rGE/strings.xml |  6 +++++-
 res/values-km-rKH/strings.xml |  6 +++++-
 res/values-ko/strings.xml     |  6 +++++-
 res/values-lo-rLA/strings.xml |  6 +++++-
 res/values-lt/strings.xml     |  6 +++++-
 res/values-lv/strings.xml     |  6 +++++-
 res/values-mn-rMN/strings.xml |  6 +++++-
 res/values-ms-rMY/strings.xml |  6 +++++-
 res/values-nb/strings.xml     |  6 +++++-
 res/values-nl/strings.xml     |  6 +++++-
 res/values-pl/strings.xml     |  6 +++++-
 res/values-pt-rPT/strings.xml |  6 +++++-
 res/values-pt/strings.xml     |  6 +++++-
 res/values-rm/strings.xml     | 10 +++++++++-
 res/values-ro/strings.xml     |  6 +++++-
 res/values-ru/strings.xml     | 11 ++++++++++-
 res/values-sk/strings.xml     | 11 ++++++++++-
 res/values-sl/strings.xml     |  6 +++++-
 res/values-sr/strings.xml     |  6 +++++-
 res/values-sv/strings.xml     |  8 ++++++--
 res/values-sw/strings.xml     |  6 +++++-
 res/values-th/strings.xml     |  6 +++++-
 res/values-tl/strings.xml     |  6 +++++-
 res/values-tr/strings.xml     | 11 ++++++++++-
 res/values-uk/strings.xml     |  6 +++++-
 res/values-vi/strings.xml     |  6 +++++-
 res/values-zh-rCN/strings.xml | 11 ++++++++++-
 res/values-zh-rHK/strings.xml |  6 +++++-
 res/values-zh-rTW/strings.xml |  6 +++++-
 res/values-zu/strings.xml     |  6 +++++-
 56 files changed, 315 insertions(+), 57 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 34a5568dc2..2c55a04b5a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Tuisskerm %1$d van %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Programme-bladsy %1$d van %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Legstukke-bladsy %1$d van %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welkom!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welkom"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Maak jouself tuis."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Skep meer skerms vir programme en vouers"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopieer jou program-ikone"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Voer ikone en vouers vanaf jou ou tuisskerms in?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIEER IKONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"BEGIN VAN NUUTS AF"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiseer jou spasie"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Raak en hou agtergrond om muurpapier, legstukke en instellings te bestuur."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Hier\'s \'n vouer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c6420d56bc..605eac12e5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"መነሻ ማያ ገጽ %1$d ከ%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"የመተግበሪያዎች ገጽ %1$d ከ%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"የመግብሮች ገጽ %1$d ከ%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"እንኳን ደህና መጡ!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"እንኳን በደህና መጡ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ልክ እቤትዎ እንዳሉ ሆነው ዘና ይበሉ።"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"ለመተግበሪያዎች እና አቃፊዎች ተጨማሪ ማያ ገጾችን ይፍጠሩ"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"የመተግበሪያ አዶዎችዎን ይቅዱ"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"አዶዎች እና አቃፊዎች ከድሮው የመነሻ ማያ ገጾችዎ ይምጡ?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"አዶዎችን ይቅዱ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"እንደ አዲስ ይጀምሩ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ቦታዎን ያደራጁ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"የግድግዳ ወረቀት፣ ምግብሮችን እና ቅንብሮችን ለማቀናበር ጀርባውን ይንኩ እና ይያዙት።"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"አንድ አቃፊ እነሆ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index aeca02532d..e70aa36cea 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏الشاشة الرئيسية %1$d من %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"‏صفحة التطبيقات %1$d من %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"‏صفحة الأدوات %1$d من %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"مرحبًا!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"مرحبًا"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"تصرف على راحتك."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"إنشاء المزيد من الشاشات للتطبيقات والمجلدات"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"نسخ رموز التطبيقات"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"هل تريد استيراد رموز ومجلدات من الشاشات الرئيسية القديمة؟"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"نسخ الرموز"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"بداية جديدة"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"تنظيم مساحتك"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"المس مع الاستمرار الجزء الخلفي من صورة الشاشة لإدارة الخلفية والأدوات والإعدادات."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"إليك المجلد"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2a2b72d290..27a1812f58 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Начален екран %1$d от %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Страница с приложения %1$d от %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Страница с приспособления %1$d от %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Добре дошли!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Персонализиране и приспособяване."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Създаване на още екрани за приложения и папки"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организиране на мястото ви"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Докоснете и задръжте фона, за да управлявате тапета, приспособленията и настройките."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ето една папка"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fa520ba678..ba3f418bf3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla d\'inici %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pàgina d\'aplicacions %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pàgina de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Hola!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Us donem la benvinguda"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personalitza la pantalla d\'inici"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea més pantalles per a aplicacions i carpetes"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar les icones d\'aplicació"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importar icones i carpetes de pantalles d\'inici anteriors?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIA LES ICONES."</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"NOU COMENÇAMENT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organitza el teu espai"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Toca i mantén premut el fons per gestionar el fons de pantalla, els widgets i la configuració."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Aquí hi ha una carpeta"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fdd48458c8..68ff5f75f8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikací %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka widgetů %1$d z %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Vítejte!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Vítejte"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Udělejte si pohodlí."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvořte několik obrazovek pro aplikace a složky"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Zkopírování ikon aplikací"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Chcete importovat ikony a složky ze svých starých ploch?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ZKOPÍROVAT IKONY"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ZAČÍT S VÝCHOZÍM ROZVRŽENÍM"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizace prostoru"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Chcete-li spravovat tapetu, widgety a nastavení, dotkněte se pozadí a přidržte je."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Toto je složka"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9bf05f0b64..c145dce927 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startskærm %1$d ud af %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-side %1$d ud af %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-side %1$d ud af %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Velkommen"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Velkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Føl dig hjemme."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opret flere skærme til apps og mapper"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiér dine appikoner"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra gamle startskærme?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIÉR IKONER"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START PÅ EN FRISK"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser din arbejdsplads"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Tryk på en baggrund, og hold fingeren nede for at administrere baggrunde, widgets og indstillinger."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Her kan du se en mappe"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4d70318bbc..d13a492a7c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startbildschirm %1$d von %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-Seite %1$d von %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets-Seite %1$d von %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Hallo!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Willkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gerät personalisieren"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Mehr Bildschirme für Apps und Ordner erstellen"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"App-Symbole kopieren"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Symbole und Ordner alter Startbildschirme importieren?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"Symbole kopieren"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"Standardübersicht verwenden"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Arbeitsbereich organisieren"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Hintergrund berühren und halten, um Hintergrund, Widgets und Einstellungen zu verwalten"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Hier ist ein Ordner"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cfb97ece02..7bdfa134a3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Αρχική οθόνη %1$d από %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Σελίδα εφαρμογών %1$d από %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Σελίδα γραφικών στοιχείων %1$d από %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Καλώς ορίσατε!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Καλώς ορίσατε"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Νιώστε σαν στο σπίτι σας."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Δημιουργία περισσότερων οθονών για εφαρμογές και φακέλους"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Αντιγραφή εικονιδίων εφαρμογών"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Εισαγωγή εικονιδίων και φακέλων από παλιές αρχικές οθόνες;"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ΑΝΤΙΓΡΑΦΗ ΕΙΚΟΝΙΔΙΩΝ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ΝΕΑ ΕΝΑΡΞΗ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Οργανώστε το χώρο σας"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Αγγίξτε παρατεταμένα το φόντο για να διαχειριστείτε την ταπετσαρία, τα γραφικά στοιχεία και τις ρυθμίσεις."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ορίστε ένας φάκελος"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2ca832b330..f4f11dadab 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d of %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps page %1$d of %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets page %1$d of %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welcome!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welcome"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Make yourself at home."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Create more screens for apps and folders"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copy your app icons"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import icons and folders from your old Home screens?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPY ICONS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START AFRESH"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organise your space"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Touch &amp; hold background to manage wallpaper, widgets and settings."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Here\'s a folder"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2ca832b330..f4f11dadab 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d of %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps page %1$d of %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgets page %1$d of %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welcome!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welcome"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Make yourself at home."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Create more screens for apps and folders"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copy your app icons"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import icons and folders from your old Home screens?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPY ICONS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START AFRESH"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organise your space"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Touch &amp; hold background to manage wallpaper, widgets and settings."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Here\'s a folder"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cec4c10a8c..d585f366ea 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"¡Bienvenido/a!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Te damos la bienvenida"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Siéntete como en casa."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas."</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar íconos de aplicaciones"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar íconos y carpetas de pantallas princip. antiguas?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONOS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"EMPEZAR DE CERO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén presionado el fondo para administrar el fondo de pantalla, los widgets y la configuración."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Aquí tienes una carpeta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 73dae125f8..8ca3e08d08 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla de inicio %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Te damos la bienvenida"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Te damos la bienvenida"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personaliza tu pantalla de inicio."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar iconos de aplicaciones"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar iconos y carpetas de pantallas de inicio antiguas?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ICONOS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"INICIAR ACTUALIZACIÓN"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para gestionar el fondo de pantalla, los widgets y los ajustes."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Esto es una carpeta"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index a68778a3ec..4a0dd8e7b1 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Avaekraan %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Rakenduste leht %1$d/%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Vidinate leht %1$d/%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Tere tulemast!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Tere tulemast"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Tundke end nagu kodus."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Looge rakenduste ja kaustade jaoks rohkem ekraanikuvasid"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopeerige rakenduste ikoonid"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Kas importida vanade avaekraanide ikoonid ja kaustad?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPEERI IKOONID"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ALUSTA ALGUSEST"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Korraldage oma ruumi"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Taustapildi, vidinate ja seadete haldamiseks puudutage tausta ning hoidke seda all."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Siin on kaust"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f118c10144..dc5f1864b6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏صفحه اصلی %1$d از %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"‏صفحه برنامه‌ها %1$d از %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"‏صفحه ابزارک‌ها %1$d از %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"خوش آمدید!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"خوش آمدید"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"راحت باشید."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"صفحات بیشتری را برای برنامه‌ها و پوشه‌ها ایجاد کنید"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"کپی کردن نمادهای برنامه شما"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"نمادها و پوشه‌ها از صفحه‌های اصلی قدیمی شما وارد شوند؟"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"کپی نمادها"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"شروع تازه"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"فضای خود را سازماندهی کنید"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"برای مدیریت کاغذدیواری، ابزارک‌ها و تنظیمات، پس‌زمینه را لمس کرده و نگه‌دارید."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"اینجا یک پوشه است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 549804d602..9bf69f4eaf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Aloitusruutu %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Apps-sivu %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgetit-sivu %1$d / %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Tervetuloa!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Tervetuloa"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Ole kuin kotonasi."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Luo lisää ruutuja sovelluksille ja kansioille"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopioi sovelluskuvakkeet"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Tuodaanko kuvakkeet ja kansiot vanhoista aloitusruuduista?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIOI KUVAKKEET"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ALOITA ALUSTA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Järjestä tilasi"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Hallitse taustakuvaa, widgetejä ja asetuksia koskettamalla taustaa pitkään."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tässä on kansio"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 97c03fe15c..d0908ff9d6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Écran d\'accueil %1$d sur %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Page des applications : %1$d sur %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Page des widgets : %1$d sur %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bienvenue!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bienvenue"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Faites comme chez vous."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Créer plus d\'écrans pour les applications et les dossiers"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copier les icônes de vos applis"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importer les icônes et dossiers des anciens écrans d\'accueil?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIER LES ICÔNES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"DISPOSITION PAR DÉFAUT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser son espace personnel"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Maintenez votre doigt sur l\'arrière-plan pour gérer les fonds d\'écran, les widgets et les paramètres."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Voici un dossier"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0f9d836c43..1340dd54d4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Écran d\'accueil %1$d sur %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Page des applications %1$d sur %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Page des widgets %1$d sur %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bienvenue !"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bienvenue"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Familiarisez-vous avec l\'écran d\'accueil."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Créez des écrans personnalisés pour vos applis et dossiers"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copier les icônes de vos applis"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importer les icônes et dossiers des anciens écrans d\'accueil ?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIER LES ICÔNES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"DISPOSITION PAR DÉFAUT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organisez votre espace"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Appuyez de manière prolongée sur l\'arrière-plan pour gérer les fonds d\'écran, les widgets et les paramètres."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Voici un dossier"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e149e0fcc6..67bfcc7797 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"होम स्क्रीन %2$d में से %1$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"एप्लिकेशन पृष्ठ %2$d में से %1$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"विजेट पृष्ठ %2$d में से %1$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"स्वागत है!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"स्वागत है"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"जैसा चाहें वैसा उपयोग करें."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"एप्लिकेशन और फ़ोल्डर के लिए और अधिक स्क्रीन बनाएं"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"ऐप्स आइकन की प्रतिलिपि बनाएं"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"अपनी पुरानी होम स्क्रीन से आइकन और फ़ोल्डर आयात करें?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"आइकन की प्रतिलिपि बनाएं"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"फिर से शुरू करें"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"अपने स्थान को व्यवस्थित करें"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"वॉलपेपर, विजेट और सेटिंग प्रबंधित करने के लिए पृष्ठभूमि को स्पर्श करके रखें."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"यहां एक फ़ोल्डर है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c9b119fefc..8d6b3fde99 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Početni zaslon %1$d od %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stranica aplikacija %1$d od %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stranica widgeta %1$d od %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Dobro došli!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Dobro došli"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Osjećajte se kao kod kuće."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Izradite više zaslona za aplikacije i mape"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiranje ikona aplikacija"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Želite li uvesti ikone i mape sa starih početnih zaslona?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIRAJ IKONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"POKRENI NOVO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizirajte svoj prostor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Dodirnite i držite pozadinu da biste upravljali pozadinskom slikom, widgetima i postavkama."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Evo mape"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2b33776438..2c95329f45 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%2$d/%1$d. kezdőképernyő"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%2$d/%1$d. alkalmazásoldal"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%2$d/%1$d. moduloldal"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Üdvözöljük!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Üdvözöljük!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Varázsolja egyedivé készülékét."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Hozzon létre további képernyőket az alkalmazásoknak és mappáknak"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Alkalmazásikonok másolása"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importálja ikonjait és mappáit régi kezdőképernyőiről?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"IKONOK MÁSOLÁSA"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"TELJESEN ÚJ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Munkaterület rendezése"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Érintse meg és tartsa lenyomva a hátteret a háttérkép, modulok és beállítások kezeléséhez."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Itt egy mappa"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index eb7396b15a..e18b7e25e6 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Հիմնական էկրան %1$d` %2$d-ից"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ծրագրերի էջերը՝ %1$d %2$d-ից"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Վիջեթների էջերը՝ %1$d %2$d-ից"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Բարի գալուստ:"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Բարի գալուստ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Զգացեք ձեզ ինչպես տանը:"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Ստեղծեք նոր էկրաններ ծրագրերի և թղթապանակների համար"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Պատճենել ձեր ծրագրի պատկերակները"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Ներմուծե՞լ պատկերակները և թղթապանակները ձեր նախկին Հիմնական էկրանից"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ՊԱՏՃԵՆԵԼ ՊԱՏԿԵՐԱԿՆԵՐԸ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ՄԵԿՆԱՐԿԵԼ ԸՍՏ ԿԱՆԽԱԴՐՎԱԾԻ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Կառավարեք ձեր տարածությունը"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Հպեք և պահեք հետնաշերտի վրա՝ պաստառները, վիջեթներն ու կարգավորումները կառավարելու համար:"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ահա մի թղթապանակ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 87d163ac30..5b59a8b8a9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Layar utama %1$d dari %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Laman aplikasi %1$d dari %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Laman widget %1$d dari %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Selamat datang!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Selamat Datang"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Serasa di rumah sendiri."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak layar untuk aplikasi dan folder"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Salin ikon aplikasi Anda"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Impor ikon dan folder dari layar Utama lama Anda?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"IKON SALIN"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"MULAI DARI AWAL"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Kelola ruang Anda"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Sentuh lama latar belakang untuk mengelola wallpaper, widget, dan setelan."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ini adalah folder"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 92d79b0408..52548be272 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Schermata Home %1$d di %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pagina di applicazioni %1$d di %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pagina di widget %1$d di %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Benvenuto!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Benvenuto"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personalizza la schermata Home."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Creare più schermate per app e cartelle"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copia le icone delle tue app"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importare icone e cartelle dalle schermate Home precedenti?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIA ICONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"RICOMINCIA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizza il tuo spazio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Tocca e tieni premuto lo sfondo per gestire sfondi, widget e impostazioni."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ecco una cartella"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a348646d31..38d1cee35c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"‏מסך דף הבית %1$d מתוך %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"‏דף אפליקציות %1$d מתוך %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"‏דף רכיבי ווידג\'ט ‏%1$d מתוך %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ברוך הבא!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ברוכים הבאים"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"להרגיש בבית."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"צור מסכים נוספים עבור אפליקציות ותיקיות"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"העתקת סמלי האפליקציות שלך"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"האם לייבא סמלים ותיקיות ממסכי דף הבית הישנים שלך?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"העתק סמלים"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"התחל דף חדש"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ארגן את אזור העבודה שלך"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"גע נגיעה רציפה ברקע כדי לנהל את הטפט, רכיבי הווידג\'ט וההגדרות."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"הנה תיקייה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1de0be5c32..63ac20e1d3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"ホーム画面: %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"アプリの%1$d/%2$dページ"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ウィジェットの%1$d/%2$dページ"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ようこそ！"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"ホームをカスタマイズします。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"アプリとフォルダの画面をもっと作成します"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"スペースを整理"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"壁紙、ウィジェット、設定を管理するには、背景を押し続けます。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"これがフォルダです"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c004f07f1c..e55ae844ae 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"მთავარი ეკრანი %1$d, %2$d-დან"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"აპების გვერდი %1$d, %2$d-დან"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ვიჯეტების გვერდი %1$d, %2$d-დან"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"კეთილი იყოს თქვენი მობრძანება!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"მოგესალმებით"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"იგრძენით თავი საკუთარ სახლში"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"აპებისა და საქაღალდეებისთვის კიდევ ერთი ეკრანის შექმნა"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"თქვენი აპის ხატულების კოპირება"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"გსურთ ძვლი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ხატულების კოპირება"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"სტანდარტული განლაგება"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"თქვენი სივრცის ორგანიზება"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"თუ გსურთ ფონების, ვიჯეტების და პარამეტრების მართვა, შეეხეთ და არ აუშვათ ფონს."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"აი, საქაღალდე"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 84781bcc21..a15ef21cbc 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"អេក្រង់​ដើម %1$d នៃ %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"ទំព័រ​កម្មវិធី %1$d នៃ %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ទំព័រ​ធាតុ​ក្រាហ្វិក ​%1$d នៃ %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"សូម​ស្វាគមន៍​!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"សូម​ស្វាគមន៍"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ធ្វើ​ដោយ​ខ្លួន​ឯង​នៅ​លើ​អេក្រង់​ដើម។"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"បង្កើត​អេក្រង់​ច្រើន​សម្រាប់​កម្មវិធី​ ​និង​ថតឯកសារ"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"ចម្លង​រូបតំណាង​កម្មវិធី​របស់​អ្នក"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"នាំចូល​រូបតំណាង និង​ថត​ពី​អេក្រង់​ដើម​ចាស់​របស់​អ្នក?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"រូប​តំណាង​ច្បាប់​ចម្លង"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ចាប់ផ្ដើម​ធ្វើ​ឲ្យ​ស្រស់"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"រៀបចំ​ចន្លោះ​របស់​អ្នក"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"ប៉ះ &amp; សង្កត់​លើ​ផ្ទៃ​ខាង​ក្រោម ដើម្បី​គ្រប់គ្រង​ផ្ទាំង​រូបភាព, ធាតុ​ក្រាហ្វិក និង​ការ​កំណត់។"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"នេះ​ជា​ថត"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 59f2103d89..942f30bbbc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"홈 화면 %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"앱 페이지 %1$d/%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"위젯 페이지 %1$d/%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"환영합니다!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"환영합니다."</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"편리한 사용 환경을 만드세요."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"앱 및 폴더를 표시할 화면 더 만들기"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"앱 아이콘 복사"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"이전 메인 스크린에서 아이콘과 폴더를 가져오시겠습니까?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"아이콘 복사"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"새로 시작"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"공간 관리하기"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"배경화면, 위젯, 설정을 관리하려면 백그라운드를 길게 터치합니다."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"폴더"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index ad2feeab45..fbc7bf063a 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"ໜ້າຈໍຫຼັກ %1$d ໃນ %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"ແອັບຯໜ້າ %1$d ໃນ %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ວິດເຈັດໜ້າ %1$d ໃນ %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ຍິນດີຕ້ອນຮັບ!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ຍິນດີຕ້ອນຮັບ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ເຮັດໂຕໃຫ້ຄືຢູ່ໃນບ້ານ"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"ສ້າງຈໍເພີ່ມເຕີມສຳລັບແອັບຯ ແລະໂຟນເດີ"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"ສຳເນົາໄອຄອນແອັບຯຂອງທ່ານ"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"ນຳເຂົ້າໄອຄອນ ແລະ ໂຟນເດີຈາກໂຮມສະກຣີນອັນເກົ່າຂອງທ່ານບໍ່?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ສຳເນົາໄອຄອນ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ເລີ່ມຕົ້ນໃໝ່"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ຈັດການພື້ນທີ່ຂອງທ່ານ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"ແຕະຄ້າງໄວ້ທີ່ພາບພື້ນຫຼັງເພື່ອຈັດການພາບພື້ນຫຼັງ, ວິດເຈັດແລະການຕັ້ງຄ່າ."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ່"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8b1f396032..482b7a4105 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d pagrindinis ekranas iš %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d programų psl. iš %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d valdiklių psl. iš %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Sveiki!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Sveiki"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Jauskitės kaip namie."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Sukurkite daugiau programų ir aplankų ekrano kopijų"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Programų piktogramų kopij."</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importuoti piktogramas ir aplankus iš senų pagr. ekranų?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIJUOTI PIKTOGRAMAS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"PRADĖTI IŠ NAUJO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Tvarkykite savo vietą"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Palieskite ir laikykite foną, jei norite tvarkyti ekrano foną, valdiklius ir nustatymus."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Štai aplankas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 964d84d133..2b2dba8d3a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Sākuma ekrāns: %1$d no %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d. lietotņu lapa no %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d. logrīku lapa no %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Laipni lūdzam!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Laipni lūdzam!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Informācija par pamatfunkcijām"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Izveidojiet vairāk ekrānu lietotnēm un mapēm."</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Lietotņu ikonu kopēšana"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vai importēt ikonas, mapes no iepriekšējiem sākuma ekrāniem?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPĒT IKONAS"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"SĀKT NO SĀKUMA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Kārtojiet savu darbvietu"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Pieskarieties fonam un turiet to, lai pārvaldītu fona tapeti, logrīkus un iestatījumus."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Lūk, mape!"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index bed237a832..9f489cfdf7 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%2$d-н Нүүр дэлгэц %1$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%2$d-н %1$d апп хуудас"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%2$d-н %1$d виджет хуудас"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Тавтай морилно уу!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Тавтай морилно уу"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Гэртээ байгаа мэт тухлаарай."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Апп болон фолдеруудад зориулан өөр дэлгэцүүд үүсгээрэй"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Таны апп дүрсүүдийг хуулах"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Таны хуучин Үндсэн дэлгэц дээрх дүрсүүдийг импорт хийх үү?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"ДҮРСҮҮДИЙГ ХУУЛАХ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ШИНЭЭР ЭХЛЭХ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Өөрийнхөө зайг тохируулаарай"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Арын дэвсгэр дээр хүрээд &amp; дарснаар ханын зураг, виджет болон тохиргоог өөрчилж болно."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Фолдер энд байна"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3558b25107..2aee204059 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Skrin Laman Utama %1$d daripada %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Halaman apl %1$d daripada %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Halaman widget %1$d daripada %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Selamat datang!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Selamat datang"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Buat seperti berada di rumah sendiri."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak skrin untuk apl dan folder"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Salin ikon apl anda"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import ikon dan folder dari skrin Laman Utama anda?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"SALIN IKON"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"MULAKAN YANG BAHARU"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Susun ruang anda"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Sentuh &amp; tahan latar belakang untuk mengurus kertas dinding, widget dan tetapan."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ini ada folder"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 13d87591e1..4703291eb8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startside %1$d av %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Appside %1$d av %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Modulside %1$d av %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Velkommen!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Velkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Føl deg som hjemme."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opprett flere sider for apper og mapper"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiér appikonene dine"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra de gamle startsidene?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIÉR IKONENE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"START PÅ NYTT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser plassen din"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Trykk og hold på bakgrunnen for å administrere bakgrunnen, moduler og innstillinger."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Dette er en mappe"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index aa035a09ab..658f379122 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startscherm %1$d van %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"App-pagina %1$d van %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widgetpagina %1$d van %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Welkom!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Welkom"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Personaliseer uw startscherm."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Meer schermen maken voor apps en mappen"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Uw app-pictogrammen kopiëren"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Pictogrammen en mappen importeren uit uw oude startschermen?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"PICTOGRAMMEN KOPIËREN"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"OPNIEUW BEGINNEN"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Uw ruimte indelen"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Blijf de achtergrond aanraken om de achtergrond, widgets en instellingen te beheren."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Dit is een map"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9eade81a9a..f8a34a480e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ekran główny %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Strona aplikacji: %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Strona widżetów: %1$d z %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Witamy"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Witamy"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Poczuj się jak u siebie."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Dodaj więcej ekranów na aplikacje i foldery"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiuj ikony aplikacji"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Zaimportować ikony i foldery ze starych ekranów głównych?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIUJ IKONY"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ZACZNIJ OD NOWA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Uporządkuj obszar roboczy"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Kliknij i przytrzymaj tło, by zmienić tapetę, widżety lub ustawienia."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tu jest folder"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4c9401dc38..5490a4fdd5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ecrã principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicações %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bem-vindo(a)!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bem-vindo(a)"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Sinta-se em casa."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais ecrãs para aplicações e pastas"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar ícones das aplicações"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importar ícones e pastas dos ecrãs principais antigos?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"COMEÇAR DO INÍCIO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizar o seu espaço"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Toque sem soltar no fundo para gerir a imagem de fundo, os widgets e as definições."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Eis uma pasta"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d82d9ea1d2..2bf38e546b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Tela inicial %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicativos, %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets, %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bem-vindo!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bem-vindo"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Fique à vontade."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crie mais telas para aplicativos e pastas"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiar ícones de aplicativos"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Importar ícones e pastas de suas telas iniciais antigas?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONES"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"COMEÇAR DO ZERO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organize seu espaço"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Toque e mantenha pressionada a tela de fundo para gerenciar o plano de fundo, os widgets e as configurações."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Aqui está uma pasta"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 246553467b..ce6093f153 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -148,7 +148,7 @@
     <skip />
     <!-- no translation found for apps_customize_widgets_scroll_format (3106209519974971521) -->
     <skip />
-    <!-- no translation found for first_run_cling_title (7257389003637362144) -->
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
     <skip />
     <!-- no translation found for first_run_cling_description (6447072552696253358) -->
     <skip />
@@ -156,6 +156,14 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) -->
     <skip />
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <!-- no translation found for workspace_cling_title (5626202359865825661) -->
     <skip />
     <!-- no translation found for workspace_cling_move_item (528201129978005352) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 016dd918c2..a23a0cd2c0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ecranul de pornire %1$d din %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pagina de aplicații %1$d din %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pagina de widgeturi %1$d din %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Bun venit!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bun venit"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Simțiți-vă ca acasă."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Creați mai multe ecrane pentru aplicații și dosare"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Copiați pictogr. aplicațiilor"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import. pictogr. și dosare de pe ecranele de pornire anter.?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAȚI PICTOGRAMELE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"REÎNCEPEȚI"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizați-vă spațiul"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Atingeți lung fundalul pentru a gestiona imaginea de fundal, widgeturile și setările."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Iată un dosar"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8d0984da29..46c84af6cd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Главные экран %1$d из %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Приложения: стр. %1$d из %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Виджеты: стр. %1$d из %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Добро пожаловать!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте как дома"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Создание дополнительных экранов для приложений и папок"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организация рабочего пространства"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Чтобы перейти к управлению обоями, виджетами и настройками, нажмите на фоновое изображение и удерживайте его."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Это папка"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3a4b03348a..64de07f5ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikácií %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka miniaplikácií %1$d z %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Vitajte!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Cíťte sa tu ako doma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvorte viac obrazoviek pre aplikácie a priečinky"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Usporiadajte svoj priestor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Ak chcete spravovať tapetu, miniaplikácie a nastavenia, dotknite sa pozadia a podržte."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tu je priečinok"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 68086dbc1c..f6d755643c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Začetni zaslon %1$d od %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stran aplikacij %1$d od %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stran pripomočkov %1$d od %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Pozdravljeni!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Pozdravljeni"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Počutite se kot doma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Ustvarite več zaslonov za aplikacije in mape"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiranje ikon aplikacij"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Želite uvoziti ikone in mape iz starih začetnih zaslonov?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIRAJ IKONE"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"SVEŽ ZAČETEK"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organizirajte svoj prostor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Če želite upravljati ozadje, pripomočke in nastavitve, se dotaknite ozadja in ga pridržite."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"To je mapa"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6ab175069d..0d35b2f0ce 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"%1$d. почетни екран од %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d. страница апликација од %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d. страница виџета од %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Добро дошли!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Добро дошли"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Осећајте се као код куће."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Направите још екрана за апликације и директоријуме"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Копирајте иконе апликација"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Увести иконе и директоријуме са старих почетних екрана?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРАЈТЕ ИКОНЕ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ПОЧНИТЕ ИСПОЧЕТКА"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организујте простор"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Додирните позадину и задржите да бисте управљали позадином, виџетима и подешавањима."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ево једног директоријума"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c6dcb18ff3..3fa6a5e03a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -84,15 +84,19 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Startskärmen %1$d av %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Appsida %1$d av %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget-sida %1$d av %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Välkommen!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Välkommen"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Känn dig som hemma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Skapa fler skärmar för appar och mappar"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopiera appikoner"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vill du importera ikoner och mappar från gamla startskärmar?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIERA IKONER"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"BÖRJA OM"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organisera ditt utrymme"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Tryck länge på bakgrunden om du vill hantera bakgrundsbilder, widgetar och inställningar."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Det här är en mapp"</string>
-    <string name="folder_cling_create_folder" msgid="6158215559475836131">"Om du vill skapa en till mapp av det här slaget trycker du länge på en app och drar den sedan ovanpå en annan."</string>
+    <string name="folder_cling_create_folder" msgid="6158215559475836131">"Skapa en till mapp av det här slaget genom att trycka och hålla ned en app och sedan dra den ovanpå en annan."</string>
     <string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>
     <string name="folder_opened" msgid="94695026776264709">"Mappen är öppen, <xliff:g id="WIDTH">%1$d</xliff:g> gånger <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="1884479294466410023">"Tryck om du vill stänga mappen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e0ae27924d..fca5a47e9c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -86,11 +86,15 @@
     <skip />
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ukurasa wa programu %1$d ya %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Ukurasa wa wijeti %1$d ya %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Karibu!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Karibu"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Jisikie huru."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Unda skrini zaidi za programu na folda"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Nakili ikoni za programu yako"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Je, ungependa kuingiza ikoni na folda kutoka kwa skrini zako za Mwanzo za zamani?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"NAKILI IKONI"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ANZA UPYA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Panga nafasi yako"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Gusa na ushikilie mandharinyuma ili udhibiti mandhari, wijeti, na mipangilio."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Hii ni folda"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0a9ea784dc..70c2134e94 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"หน้าจอหลัก %1$d จาก %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"แอปหน้า %1$d จาก %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"วิดเจ็ตหน้า %1$d จาก %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"ยินดีต้อนรับ!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ยินดีต้อนรับ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ทำตัวตามสบาย"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"สร้างหน้าจอเพิ่มสำหรับแอปและโฟลเดอร์"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"คัดลอกไอคอนแอปของคุณ"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"นำเข้าไอคอนและโฟลเดอร์จากหน้าจอหลักเก่าของคุณ"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"คัดลอกไอคอน"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"เริ่มต้นใหม่"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"จัดระเบียบพื้นที่ของคุณ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"แตะพื้นหลังค้างไว้เพื่อจัดการวอลเปเปอร์ วิดเจ็ต และการตั้งค่า"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"นี่คือโฟลเดอร์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 41de1c02c7..190565e5fd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Home screen %1$d ng %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Pahina ng apps %1$d ng %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Pahina ng widget %1$d ng %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Maligayang pagdating!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Maligayang Pagdating"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Gawing kumportable ang iyong sarili."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Gumawa ng higit pang mga screen para sa apps at mga folder"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopyahin ang mga icon ng app"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"I-import ang icon at folder mula sa luma mong Home screen?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPYAHIN ANG MGA ICON"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"MAGSIMULA NANG BAGO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Ayusin ang iyong espasyo"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Pindutin nang matagal ang background upang pamahalaan ang wallpaper, mga widget at setting"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Narito ang isang folder"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e77d76b8e8..bb8f6be466 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ana ekran %1$d / %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Uygulama sayfası %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget sayfası %1$d / %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Hoş geldiniz!"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"Rahatınıza bakın."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Uygulamalar ve klasörler için daha fazla ekran oluşturun"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"Alanınızı düzenleyin"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Duvar kağıdını, widget\'ları ve ayarları yönetmek için arka plana uzun basın."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"İşte bir klasör"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5a32a479e6..8ceb8e8bda 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Головний екран %1$d з %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Сторінка програм %1$d з %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Сторінка віджетів %1$d з %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Вітаємо!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Вітаємо"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте як удома."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Створюйте нові екрани для програм і папок"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Копіювати значки програм"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Імпортувати значки та папки зі старих головних екранів?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПІЮВАТИ ЗНАЧКИ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ПАНЕЛЬ ЗАПУСКУ ЗА УМОВЧАННЯМ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Організуйте робочий простір"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Натисніть і утримуйте фон, щоб керувати фоновим малюнком, віджетами та налаштуваннями."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Це папка"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4c15bc80e4..abe17c2bc6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Màn hình chính %1$d / %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Trang ứng dụng %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Trang tiện ích con %1$d / %2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Xin chào!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Chào mừng"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Tự nhiên như ở nhà."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Tạo thêm màn hình cho ứng dụng và thư mục"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Sao chép biểu tượng ứng dụng của bạn"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Nhập biểu tượng và thư mục từ Màn hình chính cũ của bạn?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"BIỂU TƯỢNG SAO CHÉP"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"BẮT ĐẦU LÀM MỚI"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Sắp xếp không gian của bạn"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Chạm và giữ nền để quản lý hình nền, tiện ích con và cài đặt."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Đây là một thư mục"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8a6d9c64c0..f01b695732 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -84,11 +84,20 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主屏幕：第%1$d屏，共%2$d屏"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"应用：第%1$d页，共%2$d页"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小部件：第%1$d页，共%2$d页"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"欢迎！"</string>
+    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
+    <skip />
     <string name="first_run_cling_description" msgid="6447072552696253358">"您的主屏幕您做主。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"添加更多屏幕来容纳应用和文件夹"</string>
+    <!-- no translation found for migration_cling_title (9181776667882933767) -->
+    <skip />
+    <!-- no translation found for migration_cling_description (2752413805582227644) -->
+    <skip />
+    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
+    <skip />
+    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
+    <skip />
     <string name="workspace_cling_title" msgid="5626202359865825661">"整理您的空间"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"触摸并按住背景，即可管理壁纸、小部件和设置。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"这是一个文件夹"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9d1e305799..c12c03f0e3 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主畫面 %1$d，共 %2$d 個"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"第 %1$d 個應用程式頁面，共 %2$d 頁"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"第 %1$d 個小工具頁面，共 %2$d 頁"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"歡迎！"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"歡迎"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"自訂主畫面。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"建立更多應用程式和資料夾的畫面"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"複製您的應用程式圖示"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"要從舊主畫面匯入圖示和資料夾嗎？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"複製圖示"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"重新開始"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"管理您的空間"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"輕觸並按住背景，即可管理桌布、小工具和設定。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"資料夾顯示如下"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6d82cf80e0..b0cc1e8318 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主螢幕：第 %1$d 頁，共 %2$d 頁"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"應用程式：第 %1$d 頁，共 %2$d 頁"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小工具：第 %1$d 頁，共 %2$d 頁"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"歡迎使用！"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"歡迎使用"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"主螢幕由您作主。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"建立更多畫面容納應用程式和資料夾"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"複製您的應用程式圖示"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"要從舊的主螢幕匯入圖示和資料夾嗎？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"複製圖示"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"重新開始"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"管理您的空間"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"輕觸並按住背景，即可管理桌布、小工具和設定。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"資料夾顯示如下"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2cde50a328..57bc7d4db3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -84,11 +84,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Isikrini sasekhaya esingu-%1$d se-%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Ikhasi lezinhlelo zokusebenza elingu-%1$d le-%2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Ikhasi lamawijethi elingu-%1$d le-%2$d"</string>
-    <string name="first_run_cling_title" msgid="7257389003637362144">"Siyakwamukela!"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Siyakwamukela"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Zizwe usekhaya."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Dala izikrini eziningi zezinhlelo zokusebenza namafolda"</string>
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopisha izithonjana zakho zohlelo lokusebenza"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Ngenisa izithonjana namafolda kusukela kuzikrini zakho ezindala zasekhaya?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPISHA IZITHONJANA"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"QALISA KABUSHA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Hlela isikhala sakho"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Thinta uphinde ubambe okungemuva ukuze uphathe isithombe sangemuva, amawijethi nezilungiselelo."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Nayi ifolda"</string>

From 4b171361ca4ef2d88cd9493c6d92bb390df45289 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Mon, 13 Jan 2014 17:39:02 -0500
Subject: [PATCH 107/147] hide launcher restore behind a flag.

enable with 'adb shell settings put secure launcher_restore_enabled 1'
before signing into wiped device

Bug: 12532845
Change-Id: I1471c39dac2e6e1412f7720b1ba8edf46273c593
---
 .../launcher3/LauncherBackupAgentHelper.java  | 15 +++++--
 .../launcher3/LauncherBackupHelper.java       |  5 ++-
 .../LauncherPreferencesBackupHelper.java      | 39 +++++++++++++++++++
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 src/com/android/launcher3/LauncherPreferencesBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java
index 83e4a60d45..876cf08878 100644
--- a/src/com/android/launcher3/LauncherBackupAgentHelper.java
+++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java
@@ -21,6 +21,7 @@ import android.app.backup.BackupManager;
 import android.app.backup.SharedPreferencesBackupHelper;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.provider.Settings;
 
 public class LauncherBackupAgentHelper extends BackupAgentHelper {
 
@@ -28,6 +29,8 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper {
 
     private static BackupManager sBackupManager;
 
+    protected static final String SETTING_RESTORE_ENABLED = "launcher_restore_enabled";
+
     /**
      * Notify the backup manager that out database is dirty.
      *
@@ -54,9 +57,15 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper {
 
     @Override
     public void onCreate() {
+
+        boolean restoreEnabled = 0 != Settings.Secure.getInt(
+                getContentResolver(), SETTING_RESTORE_ENABLED, 0);
+
         addHelper(LauncherBackupHelper.LAUNCHER_PREFS_PREFIX,
-                new SharedPreferencesBackupHelper(this,
-                        LauncherAppState.getSharedPreferencesKey()));
-        addHelper(LauncherBackupHelper.LAUNCHER_PREFIX, new LauncherBackupHelper(this));
+                new LauncherPreferencesBackupHelper(this,
+                        LauncherAppState.getSharedPreferencesKey(),
+                        restoreEnabled));
+        addHelper(LauncherBackupHelper.LAUNCHER_PREFIX,
+                new LauncherBackupHelper(this, restoreEnabled));
     }
 }
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index a081c21911..704d790dae 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -137,12 +137,15 @@ public class LauncherBackupHelper implements BackupHelper {
 
     private final Context mContext;
 
+    private final boolean mRestoreEnabled;
+
     private HashMap<ComponentName, AppWidgetProviderInfo> mWidgetMap;
 
     private ArrayList<Key> mKeys;
 
-    public LauncherBackupHelper(Context context) {
+    public LauncherBackupHelper(Context context, boolean restoreEnabled) {
         mContext = context;
+        mRestoreEnabled = restoreEnabled;
     }
 
     private void dataChanged() {
diff --git a/src/com/android/launcher3/LauncherPreferencesBackupHelper.java b/src/com/android/launcher3/LauncherPreferencesBackupHelper.java
new file mode 100644
index 0000000000..1ac6ff9628
--- /dev/null
+++ b/src/com/android/launcher3/LauncherPreferencesBackupHelper.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 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
+ *
+ *      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
+ * limitations under the License.
+ */
+
+package com.android.launcher3;
+
+import android.app.backup.BackupDataInputStream;
+import android.app.backup.SharedPreferencesBackupHelper;
+import android.content.Context;
+
+public class LauncherPreferencesBackupHelper extends SharedPreferencesBackupHelper {
+
+    private final boolean mRestoreEnabled;
+
+    public LauncherPreferencesBackupHelper(Context context,  String sharedPreferencesKey,
+            boolean restoreEnabled) {
+        super(context, sharedPreferencesKey);
+        mRestoreEnabled = restoreEnabled;
+    }
+
+    @Override
+    public void restoreEntity(BackupDataInputStream data) {
+        if (mRestoreEnabled) {
+            super.restoreEntity(data);
+        }
+    }
+}

From c83d136ce4a7bde768cbea4d4b263ab6e4eaa9f1 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 13 Jan 2014 14:52:49 -0800
Subject: [PATCH 108/147] Increasing string length for translation (Bug
 12524122)

Change-Id: I24e053790812779ec07de99c6f763965584a1bb7
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b25b4bb3d5..66bd36fb03 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -218,7 +218,7 @@ s -->
     <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string>
     <!-- The title text for the migration cling [CHAR_LIMIT=30] -->
     <string name="migration_cling_title">Copy your app icons</string>
-    <!-- The description of what migration does [CHAR_LIMIT=60] -->
+    <!-- The description of what migration does [CHAR_LIMIT=70] -->
     <string name="migration_cling_description">Import icons and folders from your old Home screens?</string>
     <!-- The description of the button to migrate apps from another launcher [CHAR_LIMIT=30] -->
     <string name="migration_cling_copy_apps">COPY ICONS</string>

From 4808aa6b42ff31aa792b6dc0601bd6f24a554e21 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 14 Jan 2014 13:50:53 +0100
Subject: [PATCH 109/147] Add ability to center the crop (disabled)

---
 WallpaperPicker/res/values/config.xml         |  3 +++
 .../launcher3/WallpaperCropActivity.java      | 20 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/WallpaperPicker/res/values/config.xml b/WallpaperPicker/res/values/config.xml
index 1b24190735..71580b5b07 100644
--- a/WallpaperPicker/res/values/config.xml
+++ b/WallpaperPicker/res/values/config.xml
@@ -15,4 +15,7 @@
 -->
 <resources>
     <bool name="allow_rotation">false</bool>
+    <!-- Specifies whether to expand the cropped area on both sides (rather
+         than just to one side) -->
+    <bool name="center_crop">false</bool>
 </resources>
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index b3ef073091..ee7b819512 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@ -330,10 +330,10 @@ public class WallpaperCropActivity extends Activity {
 
     protected void cropImageAndSetWallpaper(Uri uri,
             OnBitmapCroppedHandler onBitmapCroppedHandler, final boolean finishActivityWhenDone) {
+        boolean centerCrop = getResources().getBoolean(R.bool.center_crop);
         // Get the crop
         boolean ltr = mCropView.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR;
 
-
         Display d = getWindowManager().getDefaultDisplay();
 
         Point displaySize = new Point();
@@ -358,15 +358,25 @@ public class WallpaperCropActivity extends Activity {
         // ADJUST CROP WIDTH
         // Extend the crop all the way to the right, for parallax
         // (or all the way to the left, in RTL)
-        float extraSpace = ltr ? rotatedInSize[0] - cropRect.right : cropRect.left;
+        float extraSpace;
+        if (centerCrop) {
+            extraSpace = 2f * Math.min(rotatedInSize[0] - cropRect.right, cropRect.left);
+        } else {
+            extraSpace = ltr ? rotatedInSize[0] - cropRect.right : cropRect.left;
+        }
         // Cap the amount of extra width
         float maxExtraSpace = defaultWallpaperSize.x / cropScale - cropRect.width();
         extraSpace = Math.min(extraSpace, maxExtraSpace);
 
-        if (ltr) {
-            cropRect.right += extraSpace;
+        if (centerCrop) {
+            cropRect.left -= extraSpace / 2f;
+            cropRect.right += extraSpace / 2f;
         } else {
-            cropRect.left -= extraSpace;
+            if (ltr) {
+                cropRect.right += extraSpace;
+            } else {
+                cropRect.left -= extraSpace;
+            }
         }
 
         // ADJUST CROP HEIGHT

From e26d09484575f9b1855e5bc42d4fa05a5342f054 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Mon, 13 Jan 2014 14:30:14 -0500
Subject: [PATCH 110/147] Fix longpress crash.

The AllApps button doesn't usually accept longpresses, but
you can trick it into trying by holding one finger on it and
another on another icon in the hotseat. This patch defends
against that and bails out if the longpressed item has the
all apps rank (position in hotseat).

Bug: 11740833
Change-Id: I99785ccbc9e6dc6be2a9e56289b3cc0275fbb65c
---
 src/com/android/launcher3/Launcher.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 765fca4993..aadcd8799b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2781,7 +2781,8 @@ public class Launcher extends Activity
         // The hotseat touch handling does not go through Workspace, and we always allow long press
         // on hotseat items.
         final View itemUnderLongClick = longClickCellInfo.cell;
-        boolean allowLongPress = isHotseatLayout(v) || mWorkspace.allowLongPress();
+        final boolean inHotseat = isHotseatLayout(v);
+        boolean allowLongPress = inHotseat || mWorkspace.allowLongPress();
         if (allowLongPress && !mDragController.isDragging()) {
             if (itemUnderLongClick == null) {
                 // User long pressed on empty space
@@ -2794,7 +2795,11 @@ public class Launcher extends Activity
                     mWorkspace.enterOverviewMode();
                 }
             } else {
-                if (!(itemUnderLongClick instanceof Folder)) {
+                final boolean isAllAppsButton = inHotseat && isAllAppsButtonRank(
+                        mHotseat.getOrderInHotseat(
+                                longClickCellInfo.cellX,
+                                longClickCellInfo.cellY));
+                if (!(itemUnderLongClick instanceof Folder || isAllAppsButton)) {
                     // User long pressed on an item
                     mWorkspace.startDrag(longClickCellInfo);
                 }

From 5dee7aff5fa8774d37977d12df7ce8986752321d Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Fri, 20 Dec 2013 17:22:11 -0500
Subject: [PATCH 111/147] restore app favorites and screens

version 0: restore assuming apps are already installed.

Bug: 10779035
Change-Id: I7f9aa418a7d3d5460a79a229c0fbc80305b5eb5c
---
 .../launcher3/LauncherBackupHelper.java       | 85 +++++++++++++++++--
 .../android/launcher3/LauncherProvider.java   | 13 ++-
 2 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 556d4af791..b91a06abe6 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -38,6 +38,7 @@ import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -331,9 +332,15 @@ public class LauncherBackupHelper implements BackupHelper {
         if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
                 Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
 
+        if (!mRestoreEnabled) {
+            if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+            return;
+        }
+
         try {
-            Favorite favorite =  unpackFavorite(buffer, 0, dataSize);
-            if (DEBUG) Log.d(TAG, "unpacked " + favorite.itemType);
+            ContentResolver cr = mContext.getContentResolver();
+            ContentValues values = unpackFavorite(buffer, 0, dataSize);
+            cr.insert(Favorites.CONTENT_URI, values);
         } catch (InvalidProtocolBufferNanoException e) {
             Log.w(TAG, "failed to decode proto", e);
         }
@@ -363,6 +370,7 @@ public class LauncherBackupHelper implements BackupHelper {
         Set<String> currentIds = new HashSet<String>(cursor.getCount());
         try {
             cursor.moveToPosition(-1);
+            Log.d(TAG, "dumping screens after: " + in.t);
             while(cursor.moveToNext()) {
                 final long id = cursor.getLong(ID_INDEX);
                 final long updateTime = cursor.getLong(ID_MODIFIED);
@@ -373,6 +381,9 @@ public class LauncherBackupHelper implements BackupHelper {
                 if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packScreen(cursor);
                     writeRowToBackup(key, blob, out, data);
+                    if (DEBUG) Log.d(TAG, "wrote screen " + id);
+                } else {
+                    if (DEBUG) Log.d(TAG, "screen " + id + " was too old: " + updateTime);
                 }
             }
         } finally {
@@ -399,9 +410,17 @@ public class LauncherBackupHelper implements BackupHelper {
         Log.v(TAG, "unpacking screen " + key.id);
         if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
                 Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
+
+        if (!mRestoreEnabled) {
+            if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+            return;
+        }
+
         try {
-            Screen screen = unpackScreen(buffer, 0, dataSize);
-            if (DEBUG) Log.d(TAG, "unpacked " + screen.rank);
+            ContentResolver cr = mContext.getContentResolver();
+            ContentValues values = unpackScreen(buffer, 0, dataSize);
+            cr.insert(WorkspaceScreens.CONTENT_URI, values);
+
         } catch (InvalidProtocolBufferNanoException e) {
             Log.w(TAG, "failed to decode proto", e);
         }
@@ -519,6 +538,13 @@ public class LauncherBackupHelper implements BackupHelper {
             if (icon == null) {
                 Log.w(TAG, "failed to unpack icon for " + key.name);
             }
+
+            if (!mRestoreEnabled) {
+                if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+                return;
+            } else {
+                // future site of icon cache mutation
+            }
         } catch (InvalidProtocolBufferNanoException e) {
             Log.w(TAG, "failed to decode proto", e);
         }
@@ -634,6 +660,13 @@ public class LauncherBackupHelper implements BackupHelper {
                     Log.w(TAG, "failed to unpack widget icon for " + key.name);
                 }
             }
+
+            if (!mRestoreEnabled) {
+                if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+                return;
+            } else {
+                // future site of widget table mutation
+            }
         } catch (InvalidProtocolBufferNanoException e) {
             Log.w(TAG, "failed to decode proto", e);
         }
@@ -770,11 +803,43 @@ public class LauncherBackupHelper implements BackupHelper {
     }
 
     /** Deserialize a Favorite from persistence, after verifying checksum wrapper. */
-    private Favorite unpackFavorite(byte[] buffer, int offset, int dataSize)
+    private ContentValues unpackFavorite(byte[] buffer, int offset, int dataSize)
             throws InvalidProtocolBufferNanoException {
         Favorite favorite = new Favorite();
         MessageNano.mergeFrom(favorite, readCheckedBytes(buffer, offset, dataSize));
-        return favorite;
+        if (DEBUG) Log.d(TAG, "unpacked " + favorite.itemType + ", " + favorite.id);
+        ContentValues values = new ContentValues();
+        values.put(Favorites._ID, favorite.id);
+        values.put(Favorites.SCREEN, favorite.screen);
+        values.put(Favorites.CONTAINER, favorite.container);
+        values.put(Favorites.CELLX, favorite.cellX);
+        values.put(Favorites.CELLY, favorite.cellY);
+        values.put(Favorites.SPANX, favorite.spanX);
+        values.put(Favorites.SPANY, favorite.spanY);
+        values.put(Favorites.ICON_TYPE, favorite.iconType);
+        if (favorite.iconType == Favorites.ICON_TYPE_RESOURCE) {
+            values.put(Favorites.ICON_PACKAGE, favorite.iconPackage);
+            values.put(Favorites.ICON_RESOURCE, favorite.iconResource);
+        }
+        if (favorite.iconType == Favorites.ICON_TYPE_BITMAP) {
+            values.put(Favorites.ICON, favorite.icon);
+        }
+        if (!TextUtils.isEmpty(favorite.title)) {
+            values.put(Favorites.TITLE, favorite.title);
+        } else {
+            values.put(Favorites.TITLE, "");
+        }
+        if (!TextUtils.isEmpty(favorite.intent)) {
+            values.put(Favorites.INTENT, favorite.intent);
+        }
+        values.put(Favorites.ITEM_TYPE, favorite.itemType);
+        if (favorite.itemType == Favorites.ITEM_TYPE_APPWIDGET) {
+            if (!TextUtils.isEmpty(favorite.appWidgetProvider)) {
+                values.put(Favorites.APPWIDGET_PROVIDER, favorite.appWidgetProvider);
+            }
+            values.put(Favorites.APPWIDGET_ID, favorite.appWidgetId);
+        }
+        return values;
     }
 
     /** Serialize a Screen for persistence, including a checksum wrapper. */
@@ -787,11 +852,15 @@ public class LauncherBackupHelper implements BackupHelper {
     }
 
     /** Deserialize a Screen from persistence, after verifying checksum wrapper. */
-    private Screen unpackScreen(byte[] buffer, int offset, int dataSize)
+    private ContentValues unpackScreen(byte[] buffer, int offset, int dataSize)
             throws InvalidProtocolBufferNanoException {
         Screen screen = new Screen();
         MessageNano.mergeFrom(screen, readCheckedBytes(buffer, offset, dataSize));
-        return screen;
+        if (DEBUG) Log.d(TAG, "unpacked " + screen.id + "/" + screen.rank);
+        ContentValues values = new ContentValues();
+        values.put(WorkspaceScreens._ID, screen.id);
+        values.put(WorkspaceScreens.SCREEN_RANK, screen.rank);
+        return values;
     }
 
     /** Serialize an icon Resource for persistence, including a checksum wrapper. */
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 7adbadea10..5676a9adb7 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -138,9 +138,10 @@ public class LauncherProvider extends ContentProvider {
         if (values == null) {
             throw new RuntimeException("Error: attempting to insert null values");
         }
-        if (!values.containsKey(LauncherSettings.Favorites._ID)) {
+        if (!values.containsKey(LauncherSettings.BaseLauncherColumns._ID)) {
             throw new RuntimeException("Error: attempting to add item without specifying an id");
         }
+        helper.checkId(table, values);
         return db.insert(table, nullColumnHack, values);
     }
 
@@ -271,6 +272,7 @@ public class LauncherProvider extends ContentProvider {
         SharedPreferences sp = getContext().getSharedPreferences(spKey, Context.MODE_PRIVATE);
 
         if (sp.getBoolean(EMPTY_DATABASE_CREATED, false)) {
+            Log.d(TAG, "loading default workspace");
             int workspaceResId = origWorkspaceResId;
 
             // Use default workspace resource if none provided
@@ -882,6 +884,15 @@ public class LauncherProvider extends ContentProvider {
             mMaxItemId = id + 1;
         }
 
+        public void checkId(String table, ContentValues values) {
+            long id = values.getAsLong(LauncherSettings.BaseLauncherColumns._ID);
+            if (table == LauncherProvider.TABLE_WORKSPACE_SCREENS) {
+                mMaxScreenId = Math.max(id, mMaxScreenId);
+            }  else {
+                mMaxItemId = Math.max(id, mMaxItemId);
+            }
+        }
+
         private long initializeMaxItemId(SQLiteDatabase db) {
             Cursor c = db.rawQuery("SELECT MAX(_id) FROM favorites", null);
 

From 285b6e1483fd7ddc941fb2c9c50d43ee1b1841ca Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 14 Jan 2014 10:30:27 -0800
Subject: [PATCH 112/147] Properly saving migration cling keys.

Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
---
 src/com/android/launcher3/LauncherClings.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 541eaddd0d..85937aa62e 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -373,14 +373,14 @@ class LauncherClings {
                         showMigrationWorkspaceCling();
                     }
                 };
-                dismissCling(cling, cb, WORKSPACE_CLING_DISMISSED_KEY,
+                dismissCling(cling, cb, MIGRATION_CLING_DISMISSED_KEY,
                         DISMISS_CLING_DURATION, true);
             }
         };
         mLauncher.getWorkspace().post(dismissCb);
     }
 
-    private void dismissAnyWorkspaceCling(Cling cling, View v) {
+    private void dismissAnyWorkspaceCling(Cling cling, String key, View v) {
         Runnable cb = null;
         if (v == null) {
             cb = new Runnable() {
@@ -389,8 +389,7 @@ class LauncherClings {
                 }
             };
         }
-        dismissCling(cling, cb, WORKSPACE_CLING_DISMISSED_KEY,
-                DISMISS_CLING_DURATION, true);
+        dismissCling(cling, cb, key, DISMISS_CLING_DURATION, true);
 
         // Fade in the search bar
         mLauncher.getSearchBar().showSearchBar(true);
@@ -428,12 +427,12 @@ class LauncherClings {
 
     public void dismissMigrationWorkspaceCling(View v) {
         Cling cling = (Cling) mLauncher.findViewById(R.id.migration_workspace_cling);
-        dismissAnyWorkspaceCling(cling, v);
+        dismissAnyWorkspaceCling(cling, MIGRATION_WORKSPACE_CLING_DISMISSED_KEY, v);
     }
 
     public void dismissWorkspaceCling(View v) {
         Cling cling = (Cling) mLauncher.findViewById(R.id.workspace_cling);
-        dismissAnyWorkspaceCling(cling, v);
+        dismissAnyWorkspaceCling(cling, WORKSPACE_CLING_DISMISSED_KEY, v);
     }
 
     public void dismissFolderCling(View v) {

From eedb00a674358bb88dce1e0d3a90bd6cb9e97cfc Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 13 Jan 2014 13:45:07 -0800
Subject: [PATCH 113/147] Fix NPE in Workspace.onDropCompleted

Bug: 11627757
Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d
---
 src/com/android/launcher3/LauncherAppState.java | 4 ++++
 src/com/android/launcher3/Workspace.java        | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 5e41fcad05..5cfcf8b9fa 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -238,4 +238,8 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
         return getInstance().mBuildInfo.isDogfoodBuild() &&
                 Launcher.isPropertyEnabled(Launcher.DISABLE_ALL_APPS_PROPERTY);
     }
+
+    public static boolean isDogfoodBuild() {
+        return getInstance().mBuildInfo.isDogfoodBuild();
+    }
 }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b6276c0f20..91c29cba9f 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4051,7 +4051,13 @@ public class Workspace extends SmoothPagedView
             } else {
                 cellLayout = getScreenWithId(mDragInfo.screenId);
             }
-            cellLayout.onDropChild(mDragInfo.cell);
+            if (cellLayout == null && LauncherAppState.isDogfoodBuild()) {
+                throw new RuntimeException("Invalid state: cellLayout == null in "
+                        + "Workspace#onDropCompleted. Please file a bug. ");
+            }
+            if (cellLayout != null) {
+                cellLayout.onDropChild(mDragInfo.cell);
+            }
         }
         if ((d.cancelled || (beingCalledAfterUninstall && !mUninstallSuccessful))
                 && mDragInfo.cell != null) {

From 65b6a603fa972a1bd62298558016eb4712e8c727 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Fri, 10 Jan 2014 14:11:25 -0500
Subject: [PATCH 114/147] search for a valid journal

there are too many bytes, so we need to find the valid subset,
without stepping past the end!

Bug: 12489602
Change-Id: Ic9d7c804c199740ff50d0864f99632ae68619369
---
 .../launcher3/LauncherBackupHelper.java       | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 556d4af791..7268b0865a 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -858,7 +858,7 @@ public class LauncherBackupHelper implements BackupHelper {
      * in that case, do a full backup.
      *
      * @param oldState the read-0only file descriptor pointing to the old journal
-     * @return a Journal protocol bugffer
+     * @return a Journal protocol buffer
      */
     private Journal readJournal(ParcelFileDescriptor oldState) {
         Journal journal = new Journal();
@@ -867,38 +867,50 @@ public class LauncherBackupHelper implements BackupHelper {
         }
         FileInputStream inStream = new FileInputStream(oldState.getFileDescriptor());
         try {
-            int remaining = inStream.available();
-            if (DEBUG) Log.d(TAG, "available " + remaining);
-            if (remaining < MAX_JOURNAL_SIZE) {
-                byte[] buffer = new byte[remaining];
+            int availableBytes = inStream.available();
+            if (DEBUG) Log.d(TAG, "available " + availableBytes);
+            if (availableBytes < MAX_JOURNAL_SIZE) {
+                byte[] buffer = new byte[availableBytes];
                 int bytesRead = 0;
-                while (remaining > 0) {
+                boolean valid = false;
+                while (availableBytes > 0) {
                     try {
-                        int result = inStream.read(buffer, bytesRead, remaining);
+                        // OMG what are you doing? This is crazy inefficient!
+                        // If we read a byte that is not ours, we will cause trouble: b/12491813
+                        // However, we don't know how many bytes to expect (oops).
+                        // So we have to step through *slowly*, watching for the end.
+                        int result = inStream.read(buffer, bytesRead, 1);
                         if (result > 0) {
-                            if (DEBUG) Log.d(TAG, "read some bytes: " + result);
-                            remaining -= result;
+                            availableBytes -= result;
                             bytesRead += result;
+                            if (DEBUG && (bytesRead % 100 == 0)) {
+                                Log.d(TAG, "read some bytes: " + bytesRead);
+                            }
                         } else {
-                            // stop reading ands see what there is to parse
-                            Log.w(TAG, "read error: " + result);
-                            remaining = 0;
+                            Log.w(TAG, "unexpected end of file while reading journal.");
+                            // stop reading and see what there is to parse
+                            availableBytes = 0;
                         }
                     } catch (IOException e) {
-                        Log.w(TAG, "failed to read the journal", e);
+                        Log.e(TAG, "failed to read the journal", e);
                         buffer = null;
-                        remaining = 0;
+                        availableBytes = 0;
+                    }
+
+                    // check the buffer to see if we have a valid journal
+                    try {
+                        MessageNano.mergeFrom(journal, readCheckedBytes(buffer, 0, bytesRead));
+                        // if we are here, then we have read a valid, checksum-verified journal
+                        valid = true;
+                        availableBytes = 0;
+                    } catch (InvalidProtocolBufferNanoException e) {
+                        // if we don't have the whole journal yet, mergeFrom will throw. keep going.
+                        journal.clear();
                     }
                 }
                 if (DEBUG) Log.d(TAG, "journal bytes read: " + bytesRead);
-
-                if (buffer != null) {
-                    try {
-                        MessageNano.mergeFrom(journal, readCheckedBytes(buffer, 0, bytesRead));
-                    } catch (InvalidProtocolBufferNanoException e) {
-                        Log.d(TAG, "failed to read the journal", e);
-                        journal.clear();
-                    }
+                if (!valid) {
+                    Log.w(TAG, "failed to read the journal: could not find a valid journal");
                 }
             }
         } catch (IOException e) {
@@ -968,7 +980,9 @@ public class LauncherBackupHelper implements BackupHelper {
         FileOutputStream outStream = null;
         try {
             outStream = new FileOutputStream(newState.getFileDescriptor());
-            outStream.write(writeCheckedBytes(journal));
+            final byte[] journalBytes = writeCheckedBytes(journal);
+            if (DEBUG) Log.d(TAG, "writing " + journalBytes.length + " bytes of journal");
+            outStream.write(journalBytes);
             outStream.close();
         } catch (IOException e) {
             Log.d(TAG, "failed to write backup journal", e);

From 1b921efc84e09e39ec5d2bd114ec919dfe2a79f0 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 14 Jan 2014 16:00:17 -0800
Subject: [PATCH 115/147] Keep selected wallpaper on configuration change.

Keeps the currently selected wallpaper when a configuration (for example,
device rotation) occurs. This change also effects the logic when the thumbnail
gets displayed after loading the image from an external URI, as this must be
now handled independently of which wallpaper is selected.

Bug: 11007874
Change-Id: Id676c378aec38d0b21e5d9150846f33aff415cad
---
 .../launcher3/WallpaperPickerActivity.java    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index d3c779fe4b..c54e4779c1 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -85,6 +85,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
     public static final int PICK_WALLPAPER_THIRD_PARTY_ACTIVITY = 6;
     public static final int PICK_LIVE_WALLPAPER = 7;
     private static final String TEMP_WALLPAPER_TILES = "TEMP_WALLPAPER_TILES";
+    private static final String SELECTED_INDEX = "SELECTED_INDEX";
     private static final String OLD_DEFAULT_WALLPAPER_THUMBNAIL_FILENAME = "default_thumb.jpg";
     private static final String DEFAULT_WALLPAPER_THUMBNAIL_FILENAME = "default_thumb2.jpg";
 
@@ -103,6 +104,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
     ArrayList<Uri> mTempWallpaperTiles = new ArrayList<Uri>();
     private SavedWallpaperImages mSavedImages;
     private WallpaperInfo mLiveWallpaperInfoOnPickerLaunch;
+    private int mSelectedIndex;
 
     public static abstract class WallpaperTileInfo {
         protected View mView;
@@ -148,7 +150,6 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                     public void run() {
                         if (mBitmapSource != null &&
                                 mBitmapSource.getLoadingState() == BitmapSource.State.LOADED) {
-                            mView.setVisibility(View.VISIBLE);
                             a.selectTile(mView);
                         } else {
                             ViewGroup parent = (ViewGroup) mView.getParent();
@@ -430,8 +431,9 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
             public void onLayoutChange(View v, int left, int top, int right, int bottom,
                     int oldLeft, int oldTop, int oldRight, int oldBottom) {
                 if ((right - left) > 0 && (bottom - top) > 0) {
-                    if (mWallpapersView.getChildCount() > 0) {
-                        mThumbnailOnClickListener.onClick(mWallpapersView.getChildAt(0));
+                    if (mSelectedIndex >= 0 && mSelectedIndex < mWallpapersView.getChildCount()) {
+                        mThumbnailOnClickListener.onClick(
+                                mWallpapersView.getChildAt(mSelectedIndex));
                     }
                     v.removeOnLayoutChangeListener(this);
                 }
@@ -551,6 +553,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         }
         mSelectedTile = v;
         v.setSelected(true);
+        mSelectedIndex = mWallpapersView.indexOfChild(v);
         // TODO: Remove this once the accessibility framework and
         // services have better support for selection state.
         v.announceForAccessibility(
@@ -601,13 +604,15 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
 
     protected void onSaveInstanceState(Bundle outState) {
         outState.putParcelableArrayList(TEMP_WALLPAPER_TILES, mTempWallpaperTiles);
+        outState.putInt(SELECTED_INDEX, mSelectedIndex);
     }
 
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         ArrayList<Uri> uris = savedInstanceState.getParcelableArrayList(TEMP_WALLPAPER_TILES);
         for (Uri uri : uris) {
-            addTemporaryWallpaperTile(uri);
+            addTemporaryWallpaperTile(uri, true);
         }
+        mSelectedIndex = savedInstanceState.getInt(SELECTED_INDEX, 0);
     }
 
     private void populateWallpapersFromAdapter(ViewGroup parent, BaseAdapter adapter,
@@ -711,7 +716,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         }
     }
 
-    private void addTemporaryWallpaperTile(final Uri uri) {
+    private void addTemporaryWallpaperTile(final Uri uri, boolean fromRestore) {
         mTempWallpaperTiles.add(uri);
         // Add a tile for the image picked from Gallery
         final FrameLayout pickedImageThumbnail = (FrameLayout) getLayoutInflater().
@@ -735,6 +740,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                     image.setImageBitmap(thumb);
                     Drawable thumbDrawable = image.getDrawable();
                     thumbDrawable.setDither(true);
+                    pickedImageThumbnail.setVisibility(View.VISIBLE);
                 } else {
                     Log.e(TAG, "Error loading thumbnail for uri=" + uri);
                 }
@@ -747,14 +753,16 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         addLongPressHandler(pickedImageThumbnail);
         updateTileIndices();
         pickedImageThumbnail.setOnClickListener(mThumbnailOnClickListener);
-        mThumbnailOnClickListener.onClick(pickedImageThumbnail);
+        if (!fromRestore) {
+            mThumbnailOnClickListener.onClick(pickedImageThumbnail);
+        }
     }
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == IMAGE_PICK && resultCode == RESULT_OK) {
             if (data != null && data.getData() != null) {
                 Uri uri = data.getData();
-                addTemporaryWallpaperTile(uri);
+                addTemporaryWallpaperTile(uri, false);
             }
         } else if (requestCode == PICK_WALLPAPER_THIRD_PARTY_ACTIVITY) {
             setResult(RESULT_OK);

From bc4539df6fd8b0672fbf51a49cba630add5083a3 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 14 Jan 2014 14:05:32 -0800
Subject: [PATCH 116/147] Ensure that hasFirstRunActivity is only called when
 necessary

Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
---
 src/com/android/launcher3/Launcher.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 765fca4993..93852ef5a4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4304,12 +4304,13 @@ public class Launcher extends Activity
     }
 
     private boolean shouldRunFirstRunActivity() {
-        return !ActivityManager.isRunningInTestHarness();
+        return !ActivityManager.isRunningInTestHarness() &&
+                !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false);
     }
 
     public void showFirstRunActivity() {
-        if (shouldRunFirstRunActivity() && hasFirstRunActivity()
-                && !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false)) {
+        if (shouldRunFirstRunActivity() &&
+                hasFirstRunActivity()) {
             Intent firstRunIntent = getFirstRunActivity();
             if (firstRunIntent != null) {
                 startActivity(firstRunIntent);

From 24ce0b3708b44e738d6ee52477aa4dd917b547e7 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 14 Jan 2014 16:18:14 -0800
Subject: [PATCH 117/147] Fixing drop targets in phone / small tablet landscape
 (issue 12192781)

Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
---
 res/layout-land/launcher.xml                        |  4 ++--
 res/layout-land/{search_bar.xml => qsb.xml}         |  0
 res/layout-port/launcher.xml                        |  4 ++--
 res/layout-port/{search_bar.xml => qsb.xml}         |  1 -
 res/layout-sw720dp/launcher.xml                     |  4 ++--
 res/layout-sw720dp/{search_bar.xml => qsb.xml}      |  3 ++-
 .../{qsb_bar.xml => search_drop_target_bar.xml}     |  3 +--
 res/values-land/styles.xml                          |  4 ----
 res/values-sw720dp/styles.xml                       |  5 -----
 res/values/styles.xml                               |  4 ----
 src/com/android/launcher3/DeviceProfile.java        | 13 +++++--------
 src/com/android/launcher3/FocusHelper.java          |  2 +-
 src/com/android/launcher3/Launcher.java             | 13 +++++++------
 13 files changed, 22 insertions(+), 38 deletions(-)
 rename res/layout-land/{search_bar.xml => qsb.xml} (100%)
 rename res/layout-port/{search_bar.xml => qsb.xml} (98%)
 rename res/layout-sw720dp/{search_bar.xml => qsb.xml} (97%)
 rename res/layout/{qsb_bar.xml => search_drop_target_bar.xml} (94%)

diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index abb19f4bb0..2880c18bfb 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -45,8 +45,8 @@
             android:layout_gravity="end" />
 
         <include
-            android:id="@+id/qsb_bar"
-            layout="@layout/qsb_bar" />
+            android:id="@+id/search_drop_target_bar"
+            layout="@layout/search_drop_target_bar" />
 
         <include layout="@layout/overview_panel"
             android:id="@+id/overview_panel"
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/qsb.xml
similarity index 100%
rename from res/layout-land/search_bar.xml
rename to res/layout-land/qsb.xml
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 74005348cf..574b73e462 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -57,8 +57,8 @@
             android:layout_gravity="center_horizontal" />
 
         <include
-            android:id="@+id/qsb_bar"
-            layout="@layout/qsb_bar" />
+            android:id="@+id/search_drop_target_bar"
+            layout="@layout/search_drop_target_bar" />
 
         <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure
              that it is still visible during the transition to AllApps and doesn't overlay on
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/qsb.xml
similarity index 98%
rename from res/layout-port/search_bar.xml
rename to res/layout-port/qsb.xml
index e993f78478..4c9963dfb1 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/qsb.xml
@@ -16,7 +16,6 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    style="@style/SearchDropTargetBar"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/search_frame">
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 7dac2718cf..64b0fa0d64 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -45,8 +45,8 @@
             android:layout_height="match_parent" />
 
         <include
-            android:id="@+id/qsb_bar"
-            layout="@layout/qsb_bar" />
+            android:id="@+id/search_drop_target_bar"
+            layout="@layout/search_drop_target_bar" />
 
         <include layout="@layout/overview_panel"
             android:id="@+id/overview_panel"
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/qsb.xml
similarity index 97%
rename from res/layout-sw720dp/search_bar.xml
rename to res/layout-sw720dp/qsb.xml
index 3276f3f170..4c9963dfb1 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/qsb.xml
@@ -16,7 +16,8 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    style="@style/SearchDropTargetBar"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
    <com.android.launcher3.HolographicLinearLayout
diff --git a/res/layout/qsb_bar.xml b/res/layout/search_drop_target_bar.xml
similarity index 94%
rename from res/layout/qsb_bar.xml
rename to res/layout/search_drop_target_bar.xml
index 030acf6be4..2d51b93ab5 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/search_drop_target_bar.xml
@@ -15,14 +15,13 @@
 -->
 <com.android.launcher3.SearchDropTargetBar
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/QSBBar"
+    android:orientation="horizontal"
     android:focusable="false"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <!-- Drag specific targets container -->
     <LinearLayout
-        style="@style/SearchDropTargetBar"
         android:id="@+id/drag_target_bar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index fa3801d601..87a7444557 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -19,10 +19,6 @@
 
 <resources>
 <!-- Search Bar -->
-    <style name="QSBBar">
-    </style>
-    <style name="SearchDropTargetBar">
-    </style>
     <style name="SearchButton">
     </style>
     <style name="DropTargetButtonContainer">
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index b3afae399e..507af1d16e 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -58,11 +58,6 @@
         <item name="android:maxWidth">240dp</item>
     </style>
 
-    <!-- QSB Search / Drop Target bar -->
-    <style name="QSBBar">
-    </style>
-    <style name="SearchDropTargetBar">
-    </style>
     <style name="SearchButton">
     </style>
     <style name="DropTargetButtonContainer">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c9834f8b5e..c18dccbab6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -91,10 +91,6 @@
         <item name="android:shadowRadius">4.0</item>
         <item name="android:shadowColor">#FF000000</item>
     </style>
-
-    <style name="QSBBar">
-        <item name="android:orientation">horizontal</item>
-    </style>
     <style name="SearchDropTargetBar">
     </style>
     <style name="SearchButton">
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index a64d5e4033..492a8798b3 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -34,6 +34,7 @@ import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -605,10 +606,13 @@ public class DeviceProfile {
             // Vertical search bar space
             lp.gravity = Gravity.TOP | Gravity.LEFT;
             lp.width = searchBarSpaceHeightPx;
-            lp.height = LayoutParams.MATCH_PARENT;
+            lp.height = LayoutParams.WRAP_CONTENT;
             searchBar.setPadding(
                     0, 2 * edgeMarginPx, 0,
                     2 * edgeMarginPx);
+
+            LinearLayout targets = (LinearLayout) searchBar.findViewById(R.id.drag_target_bar);
+            targets.setOrientation(LinearLayout.VERTICAL);
         } else {
             // Horizontal search bar space
             lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL;
@@ -621,13 +625,6 @@ public class DeviceProfile {
         }
         searchBar.setLayoutParams(lp);
 
-        // Layout the search bar
-        View qsbBar = launcher.getQsbBar();
-        LayoutParams vglp = qsbBar.getLayoutParams();
-        vglp.width = LayoutParams.MATCH_PARENT;
-        vglp.height = LayoutParams.MATCH_PARENT;
-        qsbBar.setLayoutParams(vglp);
-
         // Layout the voice proxy
         View voiceButtonProxy = launcher.findViewById(R.id.voice_button_proxy);
         if (voiceButtonProxy != null) {
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
index 4600985c4d..bb62bac65a 100644
--- a/src/com/android/launcher3/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -665,7 +665,7 @@ public class FocusHelper {
         final CellLayout layout = (CellLayout) parent.getParent();
         final Workspace workspace = (Workspace) layout.getParent();
         final ViewGroup launcher = (ViewGroup) workspace.getParent();
-        final ViewGroup tabs = (ViewGroup) launcher.findViewById(R.id.qsb_bar);
+        final ViewGroup tabs = (ViewGroup) launcher.findViewById(R.id.search_drop_target_bar);
         final ViewGroup hotseat = (ViewGroup) launcher.findViewById(R.id.hotseat);
         int pageIndex = workspace.indexOfChild(layout);
         int pageCount = workspace.getChildCount();
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7ef812f856..336cf9e7a8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -256,7 +256,7 @@ public class Launcher extends Activity
     private AppsCustomizeTabHost mAppsCustomizeTabHost;
     private AppsCustomizePagedView mAppsCustomizeContent;
     private boolean mAutoAdvanceRunning = false;
-    private View mQsbBar;
+    private View mQsb;
 
     private Bundle mSavedState;
     // We set the state in both onCreate and then onNewIntent in some cases, which causes both
@@ -1284,7 +1284,8 @@ public class Launcher extends Activity
         dragController.addDragListener(mWorkspace);
 
         // Get the search/delete bar
-        mSearchDropTargetBar = (SearchDropTargetBar) mDragLayer.findViewById(R.id.qsb_bar);
+        mSearchDropTargetBar = (SearchDropTargetBar)
+                mDragLayer.findViewById(R.id.search_drop_target_bar);
 
         // Setup AppsCustomize
         mAppsCustomizeTabHost = (AppsCustomizeTabHost) findViewById(R.id.apps_customize_pane);
@@ -3458,11 +3459,11 @@ public class Launcher extends Activity
     }
 
     public View getQsbBar() {
-        if (mQsbBar == null) {
-            mQsbBar = mInflater.inflate(R.layout.search_bar, mSearchDropTargetBar, false);
-            mSearchDropTargetBar.addView(mQsbBar);
+        if (mQsb == null) {
+            mQsb = mInflater.inflate(R.layout.qsb, mSearchDropTargetBar, false);
+            mSearchDropTargetBar.addView(mQsb);
         }
-        return mQsbBar;
+        return mQsb;
     }
 
     protected boolean updateGlobalSearchIcon() {

From d017f882eb67b630adb082dd2227e20f5bc77b05 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 14 Jan 2014 17:08:48 -0800
Subject: [PATCH 118/147] Remove settings in overview mode for Launcher3.

The appereance of the settings button in overview mode is now dependent on
a overridable method, such that we can have it in GEL, but not in Launcher3.
This change also adjusts the logic of how wide the overview panel is, depending
on how many items we have.

Bug: 12441429
Change-Id: Ibf537c26602785f565292cbfa213eb123469ebcd
---
 res/values/dimens.xml                        |  3 +-
 src/com/android/launcher3/DeviceProfile.java | 30 +++++++++++++---
 src/com/android/launcher3/Launcher.java      | 36 +++++++++++++-------
 3 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 28b6a5bcce..1eca5b382e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,7 +25,8 @@
     <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
     <dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen>
     <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
-    <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen>
+    <dimen name="dynamic_grid_overview_bar_item_width">48dp</dimen>
+    <dimen name="dynamic_grid_overview_bar_spacer_width">68dp</dimen>
 
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index a64d5e4033..fb946904be 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -31,6 +31,7 @@ import android.view.Display;
 import android.view.Gravity;
 import android.view.Surface;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
@@ -88,7 +89,8 @@ public class DeviceProfile {
 
     int overviewModeMinIconZoneHeightPx;
     int overviewModeMaxIconZoneHeightPx;
-    int overviewModeMaxBarWidthPx;
+    int overviewModeBarItemWidthPx;
+    int overviewModeBarSpacerWidthPx;
     float overviewModeIconZoneRatio;
     float overviewModeScaleFactor;
 
@@ -170,8 +172,10 @@ public class DeviceProfile {
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_min_icon_zone_height);
         overviewModeMaxIconZoneHeightPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_max_icon_zone_height);
-        overviewModeMaxBarWidthPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_bar_max_width);
+        overviewModeBarItemWidthPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_bar_item_width);
+        overviewModeBarSpacerWidthPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_overview_bar_spacer_width);
         overviewModeIconZoneRatio =
                 res.getInteger(R.integer.config_dynamic_grid_overview_icon_zone_percentage) / 100f;
         overviewModeScaleFactor =
@@ -593,6 +597,21 @@ public class DeviceProfile {
         return isVerticalBarLayout() || isLargeTablet();
     }
 
+    int getVisibleChildCount(ViewGroup parent) {
+        int visibleChildren = 0;
+        for (int i = 0; i < parent.getChildCount(); i++) {
+            if (parent.getChildAt(i).getVisibility() != View.GONE) {
+                visibleChildren++;
+            }
+        }
+        return visibleChildren;
+    }
+
+    int calculateOverviewModeWidth(int visibleChildCount) {
+        return visibleChildCount * overviewModeBarItemWidthPx +
+                (visibleChildCount-1) * overviewModeBarSpacerWidthPx;
+    }
+
     public void layout(Launcher launcher) {
         FrameLayout.LayoutParams lp;
         Resources res = launcher.getResources();
@@ -739,12 +758,13 @@ public class DeviceProfile {
         }
 
         // Layout the Overview Mode
-        View overviewMode = launcher.getOverviewPanel();
+        ViewGroup overviewMode = launcher.getOverviewPanel();
         if (overviewMode != null) {
             Rect r = getOverviewModeButtonBarRect();
             lp = (FrameLayout.LayoutParams) overviewMode.getLayoutParams();
             lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
-            lp.width = Math.min(availableWidthPx, overviewModeMaxBarWidthPx);
+            lp.width = Math.min(availableWidthPx,
+                    calculateOverviewModeWidth(getVisibleChildCount(overviewMode)));
             lp.height = r.height();
             overviewMode.setLayoutParams(lp);
         }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index aadcd8799b..d70967d37a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -248,7 +248,7 @@ public class Launcher extends Activity
     private FolderInfo mFolderInfo;
 
     private Hotseat mHotseat;
-    private View mOverviewPanel;
+    private ViewGroup mOverviewPanel;
 
     private View mAllAppsButton;
 
@@ -1061,6 +1061,10 @@ public class Launcher extends Activity
         public void onScrollProgressChanged(float progress);
     }
 
+    protected boolean hasSettings() {
+        return false;
+    }
+
     protected void startSettings() {
     }
 
@@ -1242,7 +1246,7 @@ public class Launcher extends Activity
             mHotseat.setOnLongClickListener(this);
         }
 
-        mOverviewPanel = findViewById(R.id.overview_panel);
+        mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel);
         View widgetButton = findViewById(R.id.widget_button);
         widgetButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -1266,15 +1270,23 @@ public class Launcher extends Activity
         wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
 
         View settingsButton = findViewById(R.id.settings_button);
-        settingsButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                if (!mWorkspace.isSwitchingState()) {
-                    startSettings();
-                }
-            }
-        });
-        settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());
+        if (hasSettings()) {
+            settingsButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View arg0) {
+                    if (!mWorkspace.isSwitchingState()) {
+                        startSettings();
+                    }
+                    }
+            });
+            settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());
+        } else {
+            settingsButton.setVisibility(View.GONE);
+            FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) widgetButton.getLayoutParams();
+            lp.gravity = Gravity.END | Gravity.TOP;
+            widgetButton.requestLayout();
+        }
+
         mOverviewPanel.setAlpha(0f);
 
         // Setup the workspace
@@ -1746,7 +1758,7 @@ public class Launcher extends Activity
         return mHotseat;
     }
 
-    public View getOverviewPanel() {
+    public ViewGroup getOverviewPanel() {
         return mOverviewPanel;
     }
 

From a0d5a040b84a4521819306bff0c5ddb5dc5300e1 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Tue, 14 Jan 2014 17:45:22 -0800
Subject: [PATCH 119/147] Replace "hotseat" with "Favorites tray" in user
 visible strings.

Bug: 12078955
Change-Id: I824948d8820276caab18d6df095754a4cfb67640
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66bd36fb03..2c6306a56e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,9 +85,9 @@ s -->
     <!-- Error message when user has filled a home screen -->
     <string name="out_of_space">No more room on this Home screen.</string>
     <!-- Error message when user has filled the hotseat -->
-    <string name="hotseat_out_of_space">No more room on the hotseat.</string>
+    <string name="hotseat_out_of_space">No more room in the Favorites tray</string>
     <!-- Error message when user tries to drop an invalid item on the hotseat -->
-    <string name="invalid_hotseat_item">This widget is too large for the hotseat.</string>
+    <string name="invalid_hotseat_item">This widget is too large for the Favorites tray</string>
     <!-- Message displayed when a shortcut is created by an external application -->
     <string name="shortcut_installed">Shortcut \"<xliff:g id="name" example="Browser">%s</xliff:g>\" created.</string>
     <!-- Message displayed when a shortcut is uninstalled by an external application -->

From e43a1e788223ab5a4405c5eeb0133ff57efbc768 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 15 Jan 2014 10:33:02 -0800
Subject: [PATCH 120/147] Tightening migration conditions. (Bug 11973614)

Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
---
 src/com/android/launcher3/Launcher.java       | 29 ++++++++++--
 src/com/android/launcher3/LauncherClings.java | 46 ++++++++++++-------
 src/com/android/launcher3/LauncherModel.java  |  4 +-
 3 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 6e3032f286..c119999e8a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -41,6 +41,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
@@ -478,11 +479,18 @@ public class Launcher extends Activity
         // On large interfaces, we want the screen to auto-rotate based on the current orientation
         unlockScreenOrientation(true);
 
+        // The two first run cling paths are mutually exclusive, if the launcher is preinstalled
+        // on the device, then we always show the first run cling experience (or if there is no
+        // launcher2). Otherwise, we prompt the user upon started for migration
         showFirstRunActivity();
-        if (mModel.canMigrateFromOldLauncherDb()) {
-            mLauncherClings.showMigrationCling();
+        if (mLauncherClings.shouldShowFirstRunOrMigrationClings()) {
+            if (mModel.canMigrateFromOldLauncherDb(this)) {
+                mLauncherClings.showMigrationCling();
+            } else {
+                mLauncherClings.showFirstRunCling();
+            }
         } else {
-            mLauncherClings.showFirstRunCling();
+            mLauncherClings.removeFirstRunAndMigrationClings();
         }
     }
 
@@ -4280,6 +4288,21 @@ public class Launcher extends Activity
         mLauncherClings.updateSearchBarHint(hint);
     }
 
+    protected boolean isLauncherPreinstalled() {
+        PackageManager pm = getPackageManager();
+        try {
+            ApplicationInfo ai = pm.getApplicationInfo(getComponentName().getPackageName(), 0);
+            if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
     protected String getFirstRunClingSearchBarHint() {
         return "";
     }
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 85937aa62e..42a134fdbb 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -200,14 +200,27 @@ class LauncherClings {
         }
     }
 
-    /** Shows the first run cling */
-    public void showFirstRunCling() {
+    public boolean shouldShowFirstRunOrMigrationClings() {
         SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
-        if (isClingsEnabled() &&
-                !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) &&
-                !skipCustomClingIfNoAccounts() ) {
+        return isClingsEnabled() &&
+            !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) &&
+            !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false);
+    }
 
+    public void removeFirstRunAndMigrationClings() {
+        removeCling(R.id.first_run_cling);
+        removeCling(R.id.migration_cling);
+    }
 
+    /**
+     * Shows the first run cling.
+     *
+     * This flow is mutually exclusive with showMigrationCling, and only runs if this Launcher
+     * package was preinstalled or there is no db to migrate from.
+     */
+    public void showFirstRunCling() {
+        if (!skipCustomClingIfNoAccounts()) {
+            SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
             // If we're not using the default workspace layout, replace workspace cling
             // with a custom workspace cling (usually specified in an overlay)
             // For now, only do this on tablets
@@ -238,22 +251,22 @@ class LauncherClings {
             }
             initCling(R.id.first_run_cling, 0, false, true);
         } else {
-            removeCling(R.id.first_run_cling);
+            removeFirstRunAndMigrationClings();
         }
     }
 
+    /**
+     * Shows the migration cling.
+     *
+     * This flow is mutually exclusive with showFirstRunCling, and only runs if this Launcher
+     * package was not preinstalled and there exists a db to migrate from.
+     */
     public void showMigrationCling() {
-        // Enable the clings only if they have not been dismissed before
-        if (isClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
-                MIGRATION_CLING_DISMISSED_KEY, false)) {
-            mLauncher.hideWorkspaceSearchAndHotseat();
+        mLauncher.hideWorkspaceSearchAndHotseat();
 
-            Cling c = initCling(R.id.migration_cling, 0, false, true);
-            c.bringScrimToFront();
-            c.bringToFront();
-        } else {
-            removeCling(R.id.migration_cling);
-        }
+        Cling c = initCling(R.id.migration_cling, 0, false, true);
+        c.bringScrimToFront();
+        c.bringToFront();
     }
 
     public void showMigrationWorkspaceCling() {
@@ -300,7 +313,6 @@ class LauncherClings {
         }
     }
 
-
     /** Removes the cling outright from the DragLayer */
     private void removeCling(int id) {
         final View cling = mLauncher.findViewById(id);
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index d271976a79..4478e9bbd3 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -227,8 +227,8 @@ public class LauncherModel extends BroadcastReceiver {
         }
     }
 
-    boolean canMigrateFromOldLauncherDb() {
-        return mOldContentProviderExists;
+    boolean canMigrateFromOldLauncherDb(Launcher launcher) {
+        return mOldContentProviderExists && !launcher.isLauncherPreinstalled() ;
     }
 
     static boolean findNextAvailableIconSpaceInScreen(ArrayList<ItemInfo> items, int[] xy,

From 850f91320c3ae6eeb4b248757b8aa7e14f83ea7c Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Mon, 13 Jan 2014 17:44:52 -0800
Subject: [PATCH 121/147] Fix back button behavior for "App info" when launched
 by Launcher3.

Ensures the back stack is clean when opening the "App info" app from the launcher.

Bug: 10393223
Change-Id: Iad078ca37c4794a580f1b996f8324fef404e7462
---
 src/com/android/launcher3/Launcher.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c119999e8a..b8a46d7310 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2513,7 +2513,8 @@ public class Launcher extends Activity
         String packageName = componentName.getPackageName();
         Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
                 Uri.fromParts("package", packageName, null));
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK |
+                Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
         startActivitySafely(null, intent, "startApplicationDetailsActivity");
     }
 

From 50c8f42568145b87b489e1ab65838f5fc434e5e6 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 15 Jan 2014 16:10:39 -0500
Subject: [PATCH 122/147] rationalize launcher backup logging

enough data to debug dogfood issues
easy switch to move to quieter production mode
common switch across all three classes

Bug: 12545310
Change-Id: Icb4ad7174f20884c6993140149db590d66f6e006
---
 .../launcher3/LauncherBackupAgentHelper.java  |  5 +-
 .../launcher3/LauncherBackupHelper.java       | 91 ++++++++++---------
 .../LauncherPreferencesBackupHelper.java      |  5 +
 3 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java
index 876cf08878..de6aeddddb 100644
--- a/src/com/android/launcher3/LauncherBackupAgentHelper.java
+++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java
@@ -22,10 +22,13 @@ import android.app.backup.SharedPreferencesBackupHelper;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
+import android.util.Log;
 
 public class LauncherBackupAgentHelper extends BackupAgentHelper {
 
     private static final String TAG = "LauncherBackupAgentHelper";
+    static final boolean VERBOSE = true;
+    static final boolean DEBUG = false;
 
     private static BackupManager sBackupManager;
 
@@ -57,9 +60,9 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper {
 
     @Override
     public void onCreate() {
-
         boolean restoreEnabled = 0 != Settings.Secure.getInt(
                 getContentResolver(), SETTING_RESTORE_ENABLED, 0);
+        if (VERBOSE) Log.v(TAG, "restore is " + (restoreEnabled ? "enabled" : "disabled"));
 
         addHelper(LauncherBackupHelper.LAUNCHER_PREFS_PREFIX,
                 new LauncherPreferencesBackupHelper(this,
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 69b0026ed5..57cdfb94aa 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.android.launcher3;
 
 import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
@@ -68,7 +67,8 @@ import java.util.zip.CRC32;
 public class LauncherBackupHelper implements BackupHelper {
 
     private static final String TAG = "LauncherBackupHelper";
-    private static final boolean DEBUG = false;
+    private static final boolean VERBOSE = LauncherBackupAgentHelper.VERBOSE;
+    private static final boolean DEBUG = LauncherBackupAgentHelper.DEBUG;
     private static final boolean DEBUG_PAYLOAD = false;
 
     private static final int MAX_JOURNAL_SIZE = 1000000;
@@ -171,7 +171,7 @@ public class LauncherBackupHelper implements BackupHelper {
     @Override
     public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
             ParcelFileDescriptor newState) {
-        Log.v(TAG, "onBackup");
+        if (VERBOSE) Log.v(TAG, "onBackup");
 
         Journal in = readJournal(oldState);
         Journal out = new Journal();
@@ -181,7 +181,7 @@ public class LauncherBackupHelper implements BackupHelper {
         out.rows = 0;
         out.bytes = 0;
 
-        Log.v(TAG, "lastBackupTime=" + lastBackupTime);
+        Log.v(TAG, "lastBackupTime = " + lastBackupTime);
 
         ArrayList<Key> keys = new ArrayList<Key>();
         try {
@@ -207,7 +207,7 @@ public class LauncherBackupHelper implements BackupHelper {
      */
     @Override
     public void restoreEntity(BackupDataInputStream data) {
-        Log.v(TAG, "restoreEntity");
+        if (VERBOSE) Log.v(TAG, "restoreEntity");
         if (mKeys == null) {
             mKeys = new ArrayList<Key>();
         }
@@ -223,10 +223,11 @@ public class LauncherBackupHelper implements BackupHelper {
             bytesRead = data.read(buffer, 0, dataSize);
             if (DEBUG) Log.d(TAG, "read " + bytesRead + " of " + dataSize + " available");
         } catch (IOException e) {
-            Log.d(TAG, "failed to read entity from restore data", e);
+            Log.e(TAG, "failed to read entity from restore data", e);
         }
         try {
             key = backupKeyToKey(backupKey);
+            mKeys.add(key);
             switch (key.type) {
                 case Key.FAVORITE:
                     restoreFavorite(key, buffer, dataSize, mKeys);
@@ -305,6 +306,8 @@ public class LauncherBackupHelper implements BackupHelper {
                 if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packFavorite(cursor);
                     writeRowToBackup(key, blob, out, data);
+                } else {
+                    if (VERBOSE) Log.v(TAG, "favorite " + id + " was too old: " + updateTime);
                 }
             }
         } finally {
@@ -328,12 +331,12 @@ public class LauncherBackupHelper implements BackupHelper {
      * @param keys keys to mark as clean in the notes for next backup
      */
     private void restoreFavorite(Key key, byte[] buffer, int dataSize, ArrayList<Key> keys) {
-        Log.v(TAG, "unpacking favorite " + key.id + " (" + dataSize + " bytes)");
+        if (VERBOSE) Log.v(TAG, "unpacking favorite " + key.id);
         if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
                 Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
 
         if (!mRestoreEnabled) {
-            if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+            if (VERBOSE) Log.v(TAG, "restore not enabled: skipping database mutation");
             return;
         }
 
@@ -342,7 +345,7 @@ public class LauncherBackupHelper implements BackupHelper {
             ContentValues values = unpackFavorite(buffer, 0, dataSize);
             cr.insert(Favorites.CONTENT_URI, values);
         } catch (InvalidProtocolBufferNanoException e) {
-            Log.w(TAG, "failed to decode proto", e);
+            Log.e(TAG, "failed to decode favorite", e);
         }
     }
 
@@ -370,7 +373,7 @@ public class LauncherBackupHelper implements BackupHelper {
         Set<String> currentIds = new HashSet<String>(cursor.getCount());
         try {
             cursor.moveToPosition(-1);
-            Log.d(TAG, "dumping screens after: " + in.t);
+            if (DEBUG) Log.d(TAG, "dumping screens after: " + in.t);
             while(cursor.moveToNext()) {
                 final long id = cursor.getLong(ID_INDEX);
                 final long updateTime = cursor.getLong(ID_MODIFIED);
@@ -381,9 +384,8 @@ public class LauncherBackupHelper implements BackupHelper {
                 if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packScreen(cursor);
                     writeRowToBackup(key, blob, out, data);
-                    if (DEBUG) Log.d(TAG, "wrote screen " + id);
                 } else {
-                    if (DEBUG) Log.d(TAG, "screen " + id + " was too old: " + updateTime);
+                    if (VERBOSE) Log.v(TAG, "screen " + id + " was too old: " + updateTime);
                 }
             }
         } finally {
@@ -407,12 +409,12 @@ public class LauncherBackupHelper implements BackupHelper {
      * @param keys keys to mark as clean in the notes for next backup
      */
     private void restoreScreen(Key key, byte[] buffer, int dataSize, ArrayList<Key> keys) {
-        Log.v(TAG, "unpacking screen " + key.id);
+        if (VERBOSE) Log.v(TAG, "unpacking screen " + key.id);
         if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
                 Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
 
         if (!mRestoreEnabled) {
-            if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+            if (VERBOSE) Log.v(TAG, "restore not enabled: skipping database mutation");
             return;
         }
 
@@ -422,7 +424,7 @@ public class LauncherBackupHelper implements BackupHelper {
             cr.insert(WorkspaceScreens.CONTENT_URI, values);
 
         } catch (InvalidProtocolBufferNanoException e) {
-            Log.w(TAG, "failed to decode proto", e);
+            Log.e(TAG, "failed to decode screen", e);
         }
     }
 
@@ -477,14 +479,14 @@ public class LauncherBackupHelper implements BackupHelper {
                         Log.w(TAG, "empty intent on application favorite: " + id);
                     }
                     if (savedIds.contains(backupKey)) {
-                        if (DEBUG) Log.d(TAG, "already saved icon " + backupKey);
+                        if (VERBOSE) Log.v(TAG, "already saved icon " + backupKey);
 
                         // remember that we already backed this up previously
                         keys.add(key);
                     } else if (backupKey != null) {
                         if (DEBUG) Log.d(TAG, "I can count this high: " + out.rows);
                         if ((out.rows - startRows) < MAX_ICONS_PER_PASS) {
-                            if (DEBUG) Log.d(TAG, "saving icon " + backupKey);
+                            if (VERBOSE) Log.v(TAG, "saving icon " + backupKey);
                             Bitmap icon = iconCache.getIcon(intent);
                             keys.add(key);
                             if (icon != null && !iconCache.isDefaultIcon(icon)) {
@@ -492,15 +494,15 @@ public class LauncherBackupHelper implements BackupHelper {
                                 writeRowToBackup(key, blob, out, data);
                             }
                         } else {
-                            if (DEBUG) Log.d(TAG, "scheduling another run for icon " + backupKey);
+                            if (VERBOSE) Log.d(TAG, "deferring icon backup " + backupKey);
                             // too many icons for this pass, request another.
                             dataChanged();
                         }
                     }
                 } catch (URISyntaxException e) {
-                    Log.w(TAG, "invalid URI on application favorite: " + id);
+                    Log.e(TAG, "invalid URI on application favorite: " + id);
                 } catch (IOException e) {
-                    Log.w(TAG, "unable to save application icon for favorite: " + id);
+                    Log.e(TAG, "unable to save application icon for favorite: " + id);
                 }
 
             }
@@ -525,13 +527,13 @@ public class LauncherBackupHelper implements BackupHelper {
      * @param keys keys to mark as clean in the notes for next backup
      */
     private void restoreIcon(Key key, byte[] buffer, int dataSize, ArrayList<Key> keys) {
-        Log.v(TAG, "unpacking icon " + key.id);
+        if (VERBOSE) Log.v(TAG, "unpacking icon " + key.id);
         if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
                 Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
         try {
             Resource res = unpackIcon(buffer, 0, dataSize);
-            if (DEBUG) Log.d(TAG, "unpacked " + res.dpi);
-            if (DEBUG) Log.d(TAG, "read " +
+            if (DEBUG) Log.d(TAG, "unpacked " + res.dpi + " dpi icon");
+            if (DEBUG_PAYLOAD) Log.d(TAG, "read " +
                     Base64.encodeToString(res.data, 0, res.data.length,
                             Base64.NO_WRAP));
             Bitmap icon = BitmapFactory.decodeByteArray(res.data, 0, res.data.length);
@@ -540,13 +542,13 @@ public class LauncherBackupHelper implements BackupHelper {
             }
 
             if (!mRestoreEnabled) {
-                if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+                if (VERBOSE) Log.v(TAG, "restore not enabled: skipping database mutation");
                 return;
             } else {
                 // future site of icon cache mutation
             }
         } catch (InvalidProtocolBufferNanoException e) {
-            Log.w(TAG, "failed to decode proto", e);
+            Log.e(TAG, "failed to decode icon", e);
         }
     }
 
@@ -605,14 +607,14 @@ public class LauncherBackupHelper implements BackupHelper {
                     Log.w(TAG, "empty intent on appwidget: " + id);
                 }
                 if (savedIds.contains(backupKey)) {
-                    if (DEBUG) Log.d(TAG, "already saved widget " + backupKey);
+                    if (VERBOSE) Log.v(TAG, "already saved widget " + backupKey);
 
                     // remember that we already backed this up previously
                     keys.add(key);
                 } else if (backupKey != null) {
                     if (DEBUG) Log.d(TAG, "I can count this high: " + out.rows);
                     if ((out.rows - startRows) < MAX_WIDGETS_PER_PASS) {
-                        if (DEBUG) Log.d(TAG, "saving widget " + backupKey);
+                        if (VERBOSE) Log.v(TAG, "saving widget " + backupKey);
                         previewLoader.setPreviewSize(spanX * profile.cellWidthPx,
                                 spanY * profile.cellHeightPx, widgetSpacingLayout);
                         byte[] blob = packWidget(dpi, previewLoader, iconCache, provider);
@@ -620,7 +622,7 @@ public class LauncherBackupHelper implements BackupHelper {
                         writeRowToBackup(key, blob, out, data);
 
                     } else {
-                        if (DEBUG) Log.d(TAG, "scheduling another run for widget " + backupKey);
+                        if (VERBOSE) Log.d(TAG, "deferring widget backup " + backupKey);
                         // too many widgets for this pass, request another.
                         dataChanged();
                     }
@@ -647,7 +649,7 @@ public class LauncherBackupHelper implements BackupHelper {
      * @param keys keys to mark as clean in the notes for next backup
      */
     private void restoreWidget(Key key, byte[] buffer, int dataSize, ArrayList<Key> keys) {
-        Log.v(TAG, "unpacking widget " + key.id);
+        if (VERBOSE) Log.v(TAG, "unpacking widget " + key.id);
         if (DEBUG) Log.d(TAG, "read (" + buffer.length + "): " +
                 Base64.encodeToString(buffer, 0, dataSize, Base64.NO_WRAP));
         try {
@@ -662,13 +664,13 @@ public class LauncherBackupHelper implements BackupHelper {
             }
 
             if (!mRestoreEnabled) {
-                if (DEBUG) Log.v(TAG, "restore not enabled: skipping database mutation");
+                if (VERBOSE) Log.v(TAG, "restore not enabled: skipping database mutation");
                 return;
             } else {
                 // future site of widget table mutation
             }
         } catch (InvalidProtocolBufferNanoException e) {
-            Log.w(TAG, "failed to decode proto", e);
+            Log.e(TAG, "failed to decode widget", e);
         }
     }
 
@@ -807,7 +809,8 @@ public class LauncherBackupHelper implements BackupHelper {
             throws InvalidProtocolBufferNanoException {
         Favorite favorite = new Favorite();
         MessageNano.mergeFrom(favorite, readCheckedBytes(buffer, offset, dataSize));
-        if (DEBUG) Log.d(TAG, "unpacked " + favorite.itemType + ", " + favorite.id);
+        if (VERBOSE) Log.v(TAG, "unpacked favorite " + favorite.itemType + ", " +
+                (TextUtils.isEmpty(favorite.title) ? favorite.id : favorite.title));
         ContentValues values = new ContentValues();
         values.put(Favorites._ID, favorite.id);
         values.put(Favorites.SCREEN, favorite.screen);
@@ -856,7 +859,7 @@ public class LauncherBackupHelper implements BackupHelper {
             throws InvalidProtocolBufferNanoException {
         Screen screen = new Screen();
         MessageNano.mergeFrom(screen, readCheckedBytes(buffer, offset, dataSize));
-        if (DEBUG) Log.d(TAG, "unpacked " + screen.id + "/" + screen.rank);
+        if (VERBOSE) Log.v(TAG, "unpacked screen " + screen.id + "/" + screen.rank);
         ContentValues values = new ContentValues();
         values.put(WorkspaceScreens._ID, screen.id);
         values.put(WorkspaceScreens.SCREEN_RANK, screen.rank);
@@ -879,6 +882,7 @@ public class LauncherBackupHelper implements BackupHelper {
             throws InvalidProtocolBufferNanoException {
         Resource res = new Resource();
         MessageNano.mergeFrom(res, readCheckedBytes(buffer, offset, dataSize));
+        if (VERBOSE) Log.v(TAG, "unpacked icon " + res.dpi + "/" + res.data.length);
         return res;
     }
 
@@ -917,6 +921,7 @@ public class LauncherBackupHelper implements BackupHelper {
             throws InvalidProtocolBufferNanoException {
         Widget widget = new Widget();
         MessageNano.mergeFrom(widget, readCheckedBytes(buffer, offset, dataSize));
+        if (VERBOSE) Log.v(TAG, "unpacked widget " + widget.provider);
         return widget;
     }
 
@@ -942,6 +947,7 @@ public class LauncherBackupHelper implements BackupHelper {
                 byte[] buffer = new byte[availableBytes];
                 int bytesRead = 0;
                 boolean valid = false;
+                InvalidProtocolBufferNanoException lastProtoException = null;
                 while (availableBytes > 0) {
                     try {
                         // OMG what are you doing? This is crazy inefficient!
@@ -961,7 +967,6 @@ public class LauncherBackupHelper implements BackupHelper {
                             availableBytes = 0;
                         }
                     } catch (IOException e) {
-                        Log.e(TAG, "failed to read the journal", e);
                         buffer = null;
                         availableBytes = 0;
                     }
@@ -972,23 +977,25 @@ public class LauncherBackupHelper implements BackupHelper {
                         // if we are here, then we have read a valid, checksum-verified journal
                         valid = true;
                         availableBytes = 0;
+                        if (VERBOSE) Log.v(TAG, "read " + bytesRead + " bytes of journal");
                     } catch (InvalidProtocolBufferNanoException e) {
                         // if we don't have the whole journal yet, mergeFrom will throw. keep going.
+                        lastProtoException = e;
                         journal.clear();
                     }
                 }
                 if (DEBUG) Log.d(TAG, "journal bytes read: " + bytesRead);
                 if (!valid) {
-                    Log.w(TAG, "failed to read the journal: could not find a valid journal");
+                    Log.w(TAG, "could not find a valid journal", lastProtoException);
                 }
             }
         } catch (IOException e) {
-            Log.d(TAG, "failed to close the journal", e);
+            Log.w(TAG, "failed to close the journal", e);
         } finally {
             try {
                 inStream.close();
             } catch (IOException e) {
-                Log.d(TAG, "failed to close the journal", e);
+                Log.w(TAG, "failed to close the journal", e);
             }
         }
         return journal;
@@ -1001,7 +1008,7 @@ public class LauncherBackupHelper implements BackupHelper {
         data.writeEntityData(blob, blob.length);
         out.rows++;
         out.bytes += blob.length;
-        Log.v(TAG, "saving " + geKeyType(key) + " " + backupKey + ": " +
+        if (VERBOSE) Log.v(TAG, "saving " + geKeyType(key) + " " + backupKey + ": " +
                 getKeyName(key) + "/" + blob.length);
         if(DEBUG_PAYLOAD) {
             String encoded = Base64.encodeToString(blob, 0, blob.length, Base64.NO_WRAP);
@@ -1009,7 +1016,7 @@ public class LauncherBackupHelper implements BackupHelper {
             for (int offset = 0; offset < encoded.length(); offset += chunkSize) {
                 int end = offset + chunkSize;
                 end = Math.min(end, encoded.length());
-                Log.d(TAG, "wrote " + encoded.substring(offset, end));
+                Log.w(TAG, "wrote " + encoded.substring(offset, end));
             }
         }
     }
@@ -1029,7 +1036,7 @@ public class LauncherBackupHelper implements BackupHelper {
             throws IOException {
         int rows = 0;
         for(String deleted: deletedIds) {
-            Log.v(TAG, "dropping icon " + deleted);
+            if (VERBOSE) Log.v(TAG, "dropping deleted item " + deleted);
             data.writeEntityHeader(deleted, -1);
             rows++;
         }
@@ -1050,11 +1057,11 @@ public class LauncherBackupHelper implements BackupHelper {
         try {
             outStream = new FileOutputStream(newState.getFileDescriptor());
             final byte[] journalBytes = writeCheckedBytes(journal);
-            if (DEBUG) Log.d(TAG, "writing " + journalBytes.length + " bytes of journal");
             outStream.write(journalBytes);
             outStream.close();
+            if (VERBOSE) Log.v(TAG, "wrote " + journalBytes.length + " bytes of journal");
         } catch (IOException e) {
-            Log.d(TAG, "failed to write backup journal", e);
+            Log.w(TAG, "failed to write backup journal", e);
         }
     }
 
diff --git a/src/com/android/launcher3/LauncherPreferencesBackupHelper.java b/src/com/android/launcher3/LauncherPreferencesBackupHelper.java
index 1ac6ff9628..6f9c05c883 100644
--- a/src/com/android/launcher3/LauncherPreferencesBackupHelper.java
+++ b/src/com/android/launcher3/LauncherPreferencesBackupHelper.java
@@ -19,9 +19,13 @@ package com.android.launcher3;
 import android.app.backup.BackupDataInputStream;
 import android.app.backup.SharedPreferencesBackupHelper;
 import android.content.Context;
+import android.util.Log;
 
 public class LauncherPreferencesBackupHelper extends SharedPreferencesBackupHelper {
 
+    private static final String TAG = "LauncherPreferencesBackupHelper";
+    private static final boolean VERBOSE = LauncherBackupAgentHelper.VERBOSE;
+
     private final boolean mRestoreEnabled;
 
     public LauncherPreferencesBackupHelper(Context context,  String sharedPreferencesKey,
@@ -33,6 +37,7 @@ public class LauncherPreferencesBackupHelper extends SharedPreferencesBackupHelp
     @Override
     public void restoreEntity(BackupDataInputStream data) {
         if (mRestoreEnabled) {
+            if (VERBOSE) Log.v(TAG, "restoring preferences");
             super.restoreEntity(data);
         }
     }

From 0c04bfae0925c09b102363d680e3260aaeba45a4 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 15 Jan 2014 13:52:37 -0800
Subject: [PATCH 123/147] Import translations. DO NOT MERGE

Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
---
 res/values-af/strings.xml     |  4 ++--
 res/values-am/strings.xml     |  4 ++--
 res/values-ar/strings.xml     |  4 ++--
 res/values-bg/strings.xml     | 21 +++++++++------------
 res/values-ca/strings.xml     |  4 ++--
 res/values-cs/strings.xml     |  4 ++--
 res/values-da/strings.xml     |  4 ++--
 res/values-de/strings.xml     |  4 ++--
 res/values-el/strings.xml     |  4 ++--
 res/values-en-rGB/strings.xml |  4 ++--
 res/values-en-rIN/strings.xml |  4 ++--
 res/values-es-rUS/strings.xml |  8 ++++----
 res/values-es/strings.xml     |  6 +++---
 res/values-et-rEE/strings.xml |  6 ++++--
 res/values-fa/strings.xml     |  4 ++--
 res/values-fi/strings.xml     |  6 ++++--
 res/values-fr-rCA/strings.xml |  4 ++--
 res/values-fr/strings.xml     |  4 ++--
 res/values-hi/strings.xml     |  6 ++++--
 res/values-hr/strings.xml     |  6 ++++--
 res/values-hu/strings.xml     |  4 ++--
 res/values-hy-rAM/strings.xml |  4 ++--
 res/values-in/strings.xml     |  6 ++++--
 res/values-it/strings.xml     |  4 ++--
 res/values-iw/strings.xml     |  4 ++--
 res/values-ja/strings.xml     | 21 +++++++++------------
 res/values-ka-rGE/strings.xml |  8 +++++---
 res/values-km-rKH/strings.xml |  6 ++++--
 res/values-ko/strings.xml     |  6 ++++--
 res/values-lo-rLA/strings.xml |  6 ++++--
 res/values-lt/strings.xml     |  6 ++++--
 res/values-lv/strings.xml     |  6 ++++--
 res/values-mn-rMN/strings.xml |  4 ++--
 res/values-ms-rMY/strings.xml |  8 +++++---
 res/values-nb/strings.xml     |  6 +++---
 res/values-nl/strings.xml     |  4 ++--
 res/values-pl/strings.xml     |  4 ++--
 res/values-pt-rPT/strings.xml |  4 ++--
 res/values-pt/strings.xml     |  6 ++++--
 res/values-rm/strings.xml     |  4 ++--
 res/values-ro/strings.xml     |  6 ++++--
 res/values-ru/strings.xml     | 21 +++++++++------------
 res/values-sk/strings.xml     | 21 +++++++++------------
 res/values-sl/strings.xml     |  4 ++--
 res/values-sr/strings.xml     |  6 ++++--
 res/values-sv/strings.xml     |  4 ++--
 res/values-sw/strings.xml     |  6 +++---
 res/values-th/strings.xml     |  6 ++++--
 res/values-tl/strings.xml     |  6 ++++--
 res/values-tr/strings.xml     | 21 +++++++++------------
 res/values-uk/strings.xml     |  4 ++--
 res/values-vi/strings.xml     |  6 ++++--
 res/values-zh-rCN/strings.xml | 21 +++++++++------------
 res/values-zh-rHK/strings.xml |  4 ++--
 res/values-zh-rTW/strings.xml |  6 ++++--
 res/values-zu/strings.xml     |  4 ++--
 56 files changed, 199 insertions(+), 179 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2c55a04b5a..53b5b5a88c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Legstukke"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Niks meer spasie op jou Tuisskerms nie."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Niks meer spasie op die tuisskerm nie."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Niks meer plek op die warmlaai nie."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Hierdie legstuk is te groot vir die warmlaai."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen plek meer in die Gunstelinge-laai nie"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Hierdie legstuk is te groot vir die Gunstelinge-laai"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Kortpad \"<xliff:g id="NAME">%s</xliff:g>\" is geskep."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Kortpad \"<xliff:g id="NAME">%s</xliff:g>\" is verwyder."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Kortpad \"<xliff:g id="NAME">%s</xliff:g>\" bestaan reeds."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 605eac12e5..b0c862d144 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ፍርግሞች"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"የመነሻ ማያ ገጾችዎ ላይ ተጨማሪ ቦታ የለም።"</string>
     <string name="out_of_space" msgid="4691004494942118364">"በዚህ መነሻ ማያ ገጽ ላይ ምንም ቦታ የለም።"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"በመትከያ ቦታው ላይ ተጨማሪ ቦታ የለም።"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ይህ ፍርግም ለመትከያ ቦታው በጣም ትልቅ ነው።"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"በተወዳጆች መሣቢያ ውስጥ ተጨማሪ ቦታ የለም"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ይህ መግብር ወደ የተወዳጆች መሣቢያ ላይ እንዳይገባ በጣም ትልቅ ነው"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"አቋራጭ «<xliff:g id="NAME">%s</xliff:g>» ተፈጥሯል።"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"አቋራጭ «<xliff:g id="NAME">%s</xliff:g>» ተወግዶ ነበር።"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"አቋራጭ «<xliff:g id="NAME">%s</xliff:g>» አስቀድሞ አለ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e70aa36cea..98dce5fbda 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"الأدوات"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ليس هناك مساحة أخرى في الشاشات الرئيسية."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ليس هناك مساحة أخرى في هذه الشاشة الرئيسية."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ليست هناك مساحة أخرى في منطقة الإرساء القابلة للتخصيص."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"حجم هذه الأداة كبير للغاية بحيث لا تتسع له منطقة الإرساء القابلة للتخصيص."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"هذه الأداة كبيرة جدًا مما يحول دون قبولها في علبة المفضّلة"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"تم إنشاء الاختصار \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"تمت إزالة الاختصار \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"الاختصار \"<xliff:g id="NAME">%s</xliff:g>\" موجود من قبل."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 27a1812f58..6d5680a93d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Приспособления"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На началните ви екрани няма повече място."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На този начален екран няма повече място."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"В трамплина няма повече място."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Това приспособление е твърде голямо за трамплина."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Прекият път към <xliff:g id="NAME">%s</xliff:g> е създаден."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Прекият път към <xliff:g id="NAME">%s</xliff:g> бе премахнат."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Прекият път към <xliff:g id="NAME">%s</xliff:g> вече съществува."</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Начален екран %1$d от %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Страница с приложения %1$d от %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Страница с приспособления %1$d от %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Добре дошли"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Персонализиране и приспособяване."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Създаване на още екрани за приложения и папки"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Икони на прилож. ви: Копиране"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Да се импортират ли иконите и папките от старите ви начални екрани?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРАНЕ НА ИКОНИТЕ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"СТАРТИРАНЕ ОТНАЧАЛО"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организиране на мястото ви"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Докоснете и задръжте фона, за да управлявате тапета, приспособленията и настройките."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ето една папка"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ba3f418bf3..865d0e0ee7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No queda espai a les pantalles d\'inici."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Ja no queda espai en aquesta pantalla d\'inici."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No queda espai al hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Aquest widget és massa gran per al hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No hi ha més espai a la safata Preferits."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Aquest widget és massa gran per a la safata Preferits."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"S\'ha creat la drecera \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"S\'ha suprimit la drecera \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"La drecera \"<xliff:g id="NAME">%s</xliff:g>\" ja existeix."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 68ff5f75f8..0255709260 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgety"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na plochách již není místo."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na této ploše již není místo."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"V sekci hotseat již není místo."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Widget je pro hotseat příliš velký."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na panelu Oblíbené položky již není místo."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Tento widget je pro panel Oblíbené položky příliš velký."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Zástupce aplikace <xliff:g id="NAME">%s</xliff:g> byl vytvořen."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Zástupce aplikace <xliff:g id="NAME">%s</xliff:g> byl odebrán."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Zástupce aplikace <xliff:g id="NAME">%s</xliff:g> již existuje."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c145dce927..68ceb5bec2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Der er ikke mere plads på dine startskærme."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Der er ikke mere plads på denne startskærm."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Der er ikke mere plads i hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Denne widget er for stor til hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Der er ikke mere plads i bakken Foretrukne"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Denne widget er for stor til bakken Foretrukne"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" blev oprettet."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" blev fjernet."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" findes allerede."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d13a492a7c..4bd04b208b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Auf Ihren Startbildschirmen ist kein Platz mehr vorhanden."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Kein Platz mehr auf der App-Leiste"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Dieses Widget ist zu groß für die App-Leiste."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Dieses Widget ist zu groß für die Ablage \"Favoriten\"."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Verknüpfung \"<xliff:g id="NAME">%s</xliff:g>\" wurde erstellt."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Verknüpfung \"<xliff:g id="NAME">%s</xliff:g>\" wurde entfernt."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Verknüpfung \"<xliff:g id="NAME">%s</xliff:g>\" ist bereits vorhanden."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7bdfa134a3..b6a9855e4b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Γραφικά στοιχεία"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Δεν υπάρχει άλλος χώρος στις Αρχικές οθόνες σας."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Δεν υπάρχει χώρος σε αυτήν την αρχική οθόνη."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Δεν υπάρχει άλλος χώρος στη γραμμή γρήγορης πρόσβασης."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Αυτό το γραφικό στοιχείο είναι πολύ μεγάλο για τη γραμμή γρήγορης πρόσβασης."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Δεν υπάρχει επιπλέον χώρος στην περιοχή Αγαπημένα"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Αυτό το γραφικό στοιχείο είναι πολύ μεγάλο για την περιοχή Αγαπημένα."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Δημιουργήθηκε η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\" καταργήθηκε."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\" υπάρχει ήδη."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f4f11dadab..9f732e09d8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No more room on your Home screens."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No more room on the hot seat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"This widget is too large for the hot seat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"This widget is too large for the Favourites tray"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" created."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" was removed."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" already exists."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f4f11dadab..9f732e09d8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No more room on your Home screens."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No more room on the hot seat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"This widget is too large for the hot seat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"This widget is too large for the Favourites tray"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" created."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" was removed."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" already exists."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d585f366ea..95e4a997bd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No hay más espacio en tus pantallas principales."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No hay más espacio en esta pantalla principal."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No hay más espacio en la barra de accesos directos."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget es demasiado grande para la barra de accesos directos."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está llena."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Este widget es demasiado grande para la bandeja de favoritos."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Se creó el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Se eliminó el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ya existe."</string>
@@ -84,13 +84,13 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="2459738000155917941">"Te damos la bienvenida"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bienvenido"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Siéntete como en casa."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas."</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Copiar íconos de aplicaciones"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar íconos y carpetas de pantallas princip. antiguas?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar íconos y carpetas de pant. principales antiguas?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONOS"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"EMPEZAR DE CERO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8ca3e08d08..e5beb909eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No queda espacio en las pantallas de inicio."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No queda espacio en la pantalla de inicio."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No queda espacio en la barra de accesos directos."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget es demasiado grande para la barra de accesos directos."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está completa"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Este widget es demasiado grande para la bandeja de favoritos"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Se ha creado el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Se ha eliminado el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ya existe."</string>
@@ -92,7 +92,7 @@
     <string name="migration_cling_title" msgid="9181776667882933767">"Copiar iconos de aplicaciones"</string>
     <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar iconos y carpetas de pantallas de inicio antiguas?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ICONOS"</string>
-    <string name="migration_cling_use_default" msgid="2626475813981258626">"INICIAR ACTUALIZACIÓN"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"AJUSTES PREDETERMINADOS"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para gestionar el fondo de pantalla, los widgets y los ajustes."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Esto es una carpeta"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 4a0dd8e7b1..55fa73e776 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Vidinad"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Teie avaekraanidel ei ole enam ruumi."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Kohandataval dokialal pole rohkem ruumi."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"See vidin on kohandatava dokiala jaoks liiga suur."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on loodud."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on eemaldatud."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on juba olemas."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index dc5f1864b6..f4f445ed65 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ابزارک‌ها"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"فضای بیشتری در صفحات نمایش اصلی شما موجود نیست."</string>
     <string name="out_of_space" msgid="4691004494942118364">"فضای بیشتری در این صفحه اصلی موجود نیست."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"فضای بیشتری در جایگاه اتصال نیست."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"این ابزارک بیش از حد برای جایگاه اتصال بزرگ است."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی مورد علاقه‌ها وجود ندارد"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"این ابزارک برای سینی مورد علاقه‌ها بسیار بزرگ است"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» ایجاد شد."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» حذف شد."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» در حال حاضر وجود دارد."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9bf69f4eaf..1feb28c61f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgetit"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Aloitusruuduilla ei ole enää tilaa."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Hotseatissa ei ole enää tilaa."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Tämä widget on liian suuri tähän hotseat-paikkaan."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> luotiin."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> poistettiin."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> on jo olemassa."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d0908ff9d6..03343510c5 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Vous n\'avez plus d\'espace libre sur vos écrans d\'accueil."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur l\'écran d\'accueil."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Vous n\'avez plus de place sur la barre d\'accès rapide."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ce widget est trop volumineux pour la barre d\'accès rapide."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Il n\'y a plus d\'espace dans la zone des favoris"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ce widget est trop volumineux pour la zone des favoris"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Le raccourci « <xliff:g id="NAME">%s</xliff:g> » a été créé."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Le raccourci « <xliff:g id="NAME">%s</xliff:g> » a été supprimé."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Le raccourci « <xliff:g id="NAME">%s</xliff:g> » existe déjà."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1340dd54d4..5f0607e1ab 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Vous n\'avez plus d\'espace libre sur vos écrans d\'accueil."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur cet écran d\'accueil."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Vous n\'avez plus de place sur la barre d\'accès rapide."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ce widget est trop volumineux pour la barre d\'accès rapide."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ce widget est trop volumineux pour la zone de favoris."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" a été créé."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" a été supprimé."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" existe déjà."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 67bfcc7797..42bb397d89 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"विजेट"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"आपकी होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
     <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"हॉटसीट पर स्थान शेष नहीं है."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"हॉटसीट के लि‍ए यह वि‍जेट बहुत बड़ा है."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" बनाया गया."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" निकाल दिया गया था."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" पहले से मौजूद है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8d6b3fde99..2c9d5487f8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeti"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na vašim početnim zaslonima više nema mjesta."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Na hotseatu više nema mjesta."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ovaj je widget prevelik za hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Izrađen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Uklonjen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Prečac za \"<xliff:g id="NAME">%s</xliff:g>\" već postoji."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2c95329f45..1734fe37ea 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Modulok"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nincs több hely a kezdőképernyőkön."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nincs több hely ezen a kezdőképernyőn."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Nincs több hely az egyéni mezőben."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ez a modul túl nagy az egyéni mező számára."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ez a widget túl nagy a Kedvencek tálcán való elhelyezéshez"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon létrehozva."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon eltávolítva."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon már létezik."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e18b7e25e6..1faae76274 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Վիջեթներ"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Այլևս տեղ չկա ձեր հիմնական էկրաններին:"</string>
     <string name="out_of_space" msgid="4691004494942118364">"Այլևս տեղ չկա այս հիմնական էկրանին:"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Թեժ նստատեղերում այլևս տեղ չկա:"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Այս վիջեթը չափազանց մեծ է թեժ նստատեղերի համար:"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ընտրյալների ցուցակում այլևս ազատ տեղ չկա"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Այս վիջեթը շատ մեծ է Ընտրյալների ցուցակի համար"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"«<xliff:g id="NAME">%s</xliff:g>» դյուրանցումը ստեղծված է:"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"«<xliff:g id="NAME">%s</xliff:g>» դյուրանցումը հեռացվեց:"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"«<xliff:g id="NAME">%s</xliff:g>» դյուրանցումն արդեն գոյություն ունի:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5b59a8b8a9..f2c6f6e683 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tidak ada ruang lagi di layar Utama Anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi pada layar Utama ini."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Tidak ada ruang lagi di hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Widget ini terlalu besar untuk hotseat tersebut."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dihapus."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah ada."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 52548be272..f379ae7b1b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Spazio nelle schermate Home esaurito."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Spazio nella schermata Home esaurito."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Spazio nell\'area hotseat esaurito."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Questo widget è troppo grande per l\'area hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spazio esaurito nella barra dei Preferiti"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Questo widget è troppo grande per la barra dei Preferiti"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" creata."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"La scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" è stata rimossa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" già presente."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 38d1cee35c..da79225684 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"רכיבי ווידג\'ט"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"אין יותר מקום במסכי דף הבית."</string>
     <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"אין יותר מקום בפס האפליקציות."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"הווידג\'ט הזה גדול מדי עבור פס האפליקציות."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש ה\'מועדפים\'"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"הווידג\'ט הזה גדול מדי עבור מגש ה\'מועדפים\'."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' נוצר."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' הוסר."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' כבר קיים."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 63ac20e1d3..7a95f8e0de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ウィジェット"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ホーム画面に空きスペースがありません。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"このホーム画面に空きスペースがありません。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ホットシートに空きスペースがありません。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"このウィジェットはホットシートには大きすぎます。"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を作成しました。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を削除しました。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」は既に存在します。"</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"ホーム画面: %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"アプリの%1$d/%2$dページ"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ウィジェットの%1$d/%2$dページ"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ようこそ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ホームをカスタマイズします。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"アプリとフォルダの画面をもっと作成します"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"アプリのアイコンをコピー"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"古いホーム画面からアイコンとフォルダをインポートしますか？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"アイコンをコピー"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"初期状態にリセットする"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"スペースを整理"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"壁紙、ウィジェット、設定を管理するには、背景を押し続けます。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"これがフォルダです"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index e55ae844ae..4fdd2a07e6 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ვიჯეტები"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"მთავარ ეკრანებზე ადგილი აღარ არის."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ამ მთავარ ეკრანზე ადგილი აღარ არის."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"hotseat-ში მეტი ადგილი არ არის."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ეს ვიჯეტი ძალიან დიდია hotseat-ისთვის."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"შეიქმნა მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"მასლახმობი „<xliff:g id="NAME">%s</xliff:g>“ წაშლილია."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“ უკვე არსებობს."</string>
@@ -90,7 +92,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"აპებისა და საქაღალდეებისთვის კიდევ ერთი ეკრანის შექმნა"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"თქვენი აპის ხატულების კოპირება"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"გსურთ ძვლი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"გსურთ, ძველი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"ხატულების კოპირება"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"სტანდარტული განლაგება"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"თქვენი სივრცის ორგანიზება"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index a15ef21cbc..d655622a0c 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​រស់​អ្នក​ទៀត​ទេ។"</string>
     <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"គ្មាន​បន្ទប់​នៅ​ក្នុង​មជ្ឈមណ្ឌល​ទៀត​ទេ។"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ធាតុ​ក្រាហ្វិក​នេះ​ធំ​ពេក​សម្រាប់​មជ្ឈមណ្ឌល។"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"បាន​បង្កើត​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"បាន​លុប​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"មាន​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" រួច​ហើយ។"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 942f30bbbc..ef1b3093d4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"위젯"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"홈 화면에 더 이상 공간이 없습니다."</string>
     <string name="out_of_space" msgid="4691004494942118364">"홈 화면에 더 이상 공간이 없습니다."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"즐겨찾는 앱 모음에 더 이상 빈 공간이 없습니다."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"이 위젯은 너무 커서 즐겨찾는 앱 모음에 들어갈 수 없습니다."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 생성되었습니다."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 삭제되었습니다."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 이미 있습니다."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index fbc7bf063a..d7e103d6a4 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ວິດເຈັດ"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກຂອງທ່ານ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກນີ້."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ບໍ່ມີຫ້ອງຫວ່າງໃນ hotseat ແລ້ວ."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ວິດເຈັດ ມີຂະໜາດໃຫຍ່ເກີນໄປສຳລັບ hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກສ້າງແລ້ວ."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກລຶບແລ້ວ."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ມີຢູ່ແລ້ວ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 482b7a4105..977f6a9ab0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Valdikliai"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Pagrindiniuose ekranuose vietos nebėra."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šiame pagrindiniame ekrane vietos nebėra."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Įtvirtintojoje srityje nebėra vietos."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Šis valdiklis įtvirtintajai sričiai per didelis."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ sukurtas."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ pašalintas."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ jau yra."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2b2dba8d3a..b2d6152fe6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Logrīki"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Sākuma ekrānos vairs nav vietas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šajā sākuma ekrānā vairs nav vietas."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Režīmā “hotseat” vairs nav vietas."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Šis logrīks ir pārāk liels režīmam “hotseat”."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Tika izveidota saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Tika noņemta saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Saīsne “<xliff:g id="NAME">%s</xliff:g>” jau pastāv."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 9f489cfdf7..0430ac5b3b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виджет"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Таны Нүүр дэлгэц зайгүй."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Энэ Нүүр дэлгэц зайгүй."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Суурь зайгүй."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Энэ виджет сууринд хэт томдож байна."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"\"Дуртай\" трей дээр өөр зай байхгүй байна"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Энэ виджет трей дээр хэт томдож байна"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"\"<xliff:g id="NAME">%s</xliff:g>\" товчлол үүсэв."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"\"<xliff:g id="NAME">%s</xliff:g>\" товчлол устгагдав."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" товчлол өмнө үүссэн байна."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 2aee204059..c7d59e3c55 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tiada lagi ruang pada skrin Laman Utama anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Tiada lagi ruang pada kerusi panas."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Widget ini terlalu besar untuk kerusi panas."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dialih keluar."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah wujud."</string>
@@ -90,7 +92,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak skrin untuk apl dan folder"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Salin ikon apl anda"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"Import ikon dan folder dari skrin Laman Utama anda?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import ikon dan folder dari skrin Laman Utama lama anda?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"SALIN IKON"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"MULAKAN YANG BAHARU"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Susun ruang anda"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4703291eb8..0e163753aa 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Moduler"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Ikke mer plass på startsidene dine."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Denne startsiden er full."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Dokksonen er full."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Denne modulen er for stor for dokksonen."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritter-skuffen er full"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Denne modulen er for stor for Favoritter-skuffen."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» er opprettet."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» er fjernet."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» fins allerede."</string>
@@ -90,7 +90,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opprett flere sider for apper og mapper"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Kopiér appikonene dine"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra de gamle startsidene?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra dine gamle startsider?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIÉR IKONENE"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"START PÅ NYTT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser plassen din"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 658f379122..f6c1b09c95 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Er is geen ruimte meer op uw startschermen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Er is geen ruimte meer op dit startscherm."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Er is geen ruimte meer op de hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Deze widget is te groot voor de hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen ruimte meer in het vak \'Favorieten\'"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Deze widget is te groot voor het vak \'Favorieten\'"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' is gemaakt."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' is verwijderd."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' bestaat al."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f8a34a480e..5a2efbfbc6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widżety"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Brak miejsca na ekranach głównych."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Brak miejsca na tym ekranie głównym."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Brak miejsca w kieszonce."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ten widżet jest za duży, by umieścić go w kieszonce."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ten widżet jest za duży, by zmieścił się w Ulubionych"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Skrót „<xliff:g id="NAME">%s</xliff:g>” został utworzony."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Skrót „<xliff:g id="NAME">%s</xliff:g>” został usunięty."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Skrót „<xliff:g id="NAME">%s</xliff:g>” już istnieje."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5490a4fdd5..c6f5710414 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Sem espaço suficiente nos Ecrãs principais."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sem espaço suficiente neste Ecrã principal."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Sem espaço suficiente na barra personalizável."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget é demasiado grande para a barra personalizável."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Não existe mais espaço no tabuleiro de Favoritos"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Este widget é demasiado grande para o tabuleiro de Favoritos"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Atalho “<xliff:g id="NAME">%s</xliff:g>” criado."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho “<xliff:g id="NAME">%s</xliff:g>” foi removido."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho “<xliff:g id="NAME">%s</xliff:g>” já existe."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2bf38e546b..df7f056e9d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Não há mais espaço nas telas iniciais."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Não há mais espaço na tela inicial."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Não há mais espaço no hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget é muito grande para o hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Atalho \"<xliff:g id="NAME">%s</xliff:g>\" criado."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index ce6093f153..8563d7da40 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -64,9 +64,9 @@
     <skip />
     <!-- no translation found for out_of_space (4691004494942118364) -->
     <skip />
-    <!-- no translation found for hotseat_out_of_space (9139760413395605841) -->
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
     <skip />
-    <!-- no translation found for invalid_hotseat_item (1211534262129849507) -->
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
     <skip />
     <!-- no translation found for shortcut_installed (1701742129426969556) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a23a0cd2c0..1c0460be8c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeturi"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nu mai este loc pe ecranele de pornire."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nu mai este loc pe acest Ecran de pornire."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Nu mai este loc în bara de lansare rapidă."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Acest widget este prea mare pentru bara de lansare rapidă."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>\" a fost creată."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” a fost eliminată."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” există deja."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 46c84af6cd..ec723cb7e3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виджеты"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На главных экранах все занято"</string>
     <string name="out_of_space" msgid="4691004494942118364">"На этом экране все занято"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Нет свободного места в слоте"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Виджет слишком велик для слота"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" создан"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" удален"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" уже существует"</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Главные экран %1$d из %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Приложения: стр. %1$d из %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Виджеты: стр. %1$d из %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Добро пожаловать!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте как дома"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Создание дополнительных экранов для приложений и папок"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Копировать значки приложений"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Импортировать значки и папки со старого главного экрана?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРОВАТЬ ЗНАЧКИ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ИСПОЛЬЗОВАТЬ СТАНДАРТНЫЙ МАКЕТ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организация рабочего пространства"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Чтобы перейти к управлению обоями, виджетами и настройками, нажмите на фоновое изображение и удерживайте его."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Это папка"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 64de07f5ee..271d8b81d6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Miniaplikácie"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na plochách už nie je miesto."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tejto ploche už nie je miesto"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"V časti hotseat už nie je miesto."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Táto miniaplikácia je pre hotseat príliš veľká."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol vytvorený."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol odstránený."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Odkaz <xliff:g id="NAME">%s</xliff:g> už existuje."</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikácií %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka miniaplikácií %1$d z %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Vitajte"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Cíťte sa tu ako doma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvorte viac obrazoviek pre aplikácie a priečinky"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopírovanie ikon aplikácií"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Chcete importovať ikony a priečinky zo starých plôch?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"SKOPÍROVAŤ IKONY"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ZAČAŤ S PREDVOLENÝM ROZLOŽENÍM"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Usporiadajte svoj priestor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Ak chcete spravovať tapetu, miniaplikácie a nastavenia, dotknite sa pozadia a podržte."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tu je priečinok"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f6d755643c..dfd63e2c0f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Pripomočki"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na začetnih zaslonih ni več prostora."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tem začetnem zaslonu ni več prostora."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"V vrstici z ikonami ni več prostora."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ta pripomoček je prevelik za vrstico z ikonami."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"V vrstici za priljubljene ni več prostora"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ta pripomoček je prevelik za vrstico s priljubljenimi"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Bližnjica »<xliff:g id="NAME">%s</xliff:g>« je ustvarjena."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Bližnjica »<xliff:g id="NAME">%s</xliff:g>« je bila odstranjena."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Bližnjica »<xliff:g id="NAME">%s</xliff:g>« že obstaja."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0d35b2f0ce..a8299c2e43 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виџети"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Нема више простора на почетним екранима."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Нема више простора на овом почетном екрану."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Нема више простора на траци актуелности."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Овај виџет је превелики за траку актуелности."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је направљена."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је уклоњена."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ већ постоји."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3fa6a5e03a..4005b7e6ea 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgetar"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Det finns inte plats för mer på dina startsidor."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Det finns inte plats för mer på den här startskärmen."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Utrymmet på Hotseat är fullt."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Denna widget är för stor för Hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritfältet är fullt"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Denna widget är för stor för favoritfältet"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Genvägen <xliff:g id="NAME">%s</xliff:g> har skapats."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Genvägen <xliff:g id="NAME">%s</xliff:g> har tagits bort."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Genvägen <xliff:g id="NAME">%s</xliff:g> finns redan."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fca5a47e9c..4397d3bae5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Wijeti"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Hakuna nafasi zaidi kwenye skrini zako za Nyumbani."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Hakuna nafasi katika skrini hii ya Mwanzo."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Hakuna nafasi zaidi kwenye eneo kali."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Wijeti hii ni kubwa zaidi kwa eneo kali."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Hakuna nafasi zaidi katika treya ya Vipendeleo"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Wijeti hii ni kubwa mno kwa treya ya Vipendeleo"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" imeundwa."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" iliondolewa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" la njia ya mkato tayari lipo."</string>
@@ -92,7 +92,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Unda skrini zaidi za programu na folda"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Nakili ikoni za programu yako"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"Je, ungependa kuingiza ikoni na folda kutoka kwa skrini zako za Mwanzo za zamani?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Je, ungependa kuingiza ikoni na folda kutoka kwenye skrini zako za Mwanzo za zamani?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"NAKILI IKONI"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"ANZA UPYA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Panga nafasi yako"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 70c2134e94..de8ce198a4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"วิดเจ็ต"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ไม่มีที่ว่างในหน้าจอหลักของคุณ"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ไม่มีที่ว่างใน hotseat"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"วิดเจ็ตนี้มีขนาดใหญ่เกินไปสำหรับ hotseat"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"สร้างทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" แล้ว"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"นำทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" ออกแล้ว"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"มีทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" อยู่แล้ว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 190565e5fd..2f03be1185 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Mga Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Wala nang lugar sa iyong mga Home screen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Wala nang lugar sa Home screen na ito."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Wala nang lugar sa hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Masyadong malaki ang widget na ito para sa hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Nagawa ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Inalis ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Umiiral na ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bb8f6be466..0712f92d17 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget\'lar"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Ana ekranlarınızda yer kalmadı."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Bu Ana ekranda yer kalmadı."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Favori kısa yollarda yer yok"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Bu widget, favori kısa yollar için çok büyük."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu oluşturuldu."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu kaldırıldı."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu zaten var."</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ana ekran %1$d / %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Uygulama sayfası %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget sayfası %1$d / %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Hoş geldiniz"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Rahatınıza bakın."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Uygulamalar ve klasörler için daha fazla ekran oluşturun"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Uygulama simgelerini kopyala"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Eski Ana ekranlarınızdaki simgeler ve klasörler içe aktarılsın mı?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"SİMGELERİ KOPYALA"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"VARSAYILANI KULLAN"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Alanınızı düzenleyin"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Duvar kağıdını, widget\'ları ve ayarları yönetmek için arka plana uzun basın."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"İşte bir klasör"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8ceb8e8bda..7cef32139f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Віджети"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На головних екранах більше немає місця."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На цьому головному екрані більше немає місця."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Немає вільного місця."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Цей віджет завеликий."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"В області \"Вибране\" немає місця"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Цей віджет завеликий для області \"Вибране\""</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Ярлик \"<xliff:g id="NAME">%s</xliff:g>\" створено."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Ярлик \"<xliff:g id="NAME">%s</xliff:g>\" вилучено."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Ярлик \"<xliff:g id="NAME">%s</xliff:g>\" уже існує."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index abe17c2bc6..23b208ddd2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Tiện ích con"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Không còn chỗ trên Màn hình chính của bạn."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Không còn chỗ trên Màn hình chính này."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Không còn chỗ trên vùng gắn."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Tiện ích con này quá lớn cho vùng gắn."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã được tạo."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã bị xóa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã tồn tại."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f01b695732..7e221d1b5c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"小部件"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"您的主屏幕上没有空间了。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"底部区域已无空间。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"该小部件太大，底部区域容纳不下。"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"已创建“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已删除“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已存在。"</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主屏幕：第%1$d屏，共%2$d屏"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"应用：第%1$d页，共%2$d页"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小部件：第%1$d页，共%2$d页"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"欢迎使用"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"您的主屏幕您做主。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"添加更多屏幕来容纳应用和文件夹"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"复制应用图标"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"要导入旧的主屏幕中的图标和文件夹吗？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"复制图标"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"使用全新配置"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"整理您的空间"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"触摸并按住背景，即可管理壁纸、小部件和设置。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"这是一个文件夹"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c12c03f0e3..d40292ecdb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主畫面已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"停駐區已無可用空間。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"這個小工具過大，停駐區沒有足夠空間。"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏系統匣沒有足夠空間"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，我的收藏系統匣沒有足夠空間"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b0cc1e8318..079ec75abe 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主螢幕已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"這個主螢幕已無空間。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"停駐區已無空間。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"這個小工具過大，停駐區無法容納。"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 57bc7d4db3..c07f6a96c5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Amawijethi"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Akusenagumbi ezikrinini zakho Zekhaya."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Asisekho isikhala kulesi sikrini Sasekhaya."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Akusenagumbi ku-hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Le wijethi inkulu kakhulu ukuba ku-hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Asisekho isikhala kwitreyi lezintandokazi"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Le wijethi inkulu kakhulu ukuba kwitreyi lezintandokazi."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Isinqamuleli esithi \"<xliff:g id="NAME">%s</xliff:g>\" sidaliwe."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Isinqamuleli esithi \"<xliff:g id="NAME">%s</xliff:g>\" sisusiwe."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Isinqamuleli esithi \"<xliff:g id="NAME">%s</xliff:g>\" sesivele sikhona."</string>

From 3b0d0a6bd3efb78ffdedb1b6cf67f75485455637 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 15 Jan 2014 13:56:06 -0800
Subject: [PATCH 124/147] Import translations. DO NOT MERGE

Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d
Auto-generated-cl: translation import
---
 res/values-af/strings.xml     |  4 ++--
 res/values-am/strings.xml     |  4 ++--
 res/values-ar/strings.xml     |  4 ++--
 res/values-bg/strings.xml     | 21 +++++++++------------
 res/values-ca/strings.xml     |  4 ++--
 res/values-cs/strings.xml     |  4 ++--
 res/values-da/strings.xml     |  4 ++--
 res/values-de/strings.xml     |  4 ++--
 res/values-el/strings.xml     |  4 ++--
 res/values-en-rGB/strings.xml |  4 ++--
 res/values-en-rIN/strings.xml |  4 ++--
 res/values-es-rUS/strings.xml |  8 ++++----
 res/values-es/strings.xml     |  6 +++---
 res/values-et-rEE/strings.xml |  6 ++++--
 res/values-fa/strings.xml     |  4 ++--
 res/values-fi/strings.xml     |  6 ++++--
 res/values-fr-rCA/strings.xml |  4 ++--
 res/values-fr/strings.xml     |  4 ++--
 res/values-hi/strings.xml     |  6 ++++--
 res/values-hr/strings.xml     |  6 ++++--
 res/values-hu/strings.xml     |  4 ++--
 res/values-hy-rAM/strings.xml |  4 ++--
 res/values-in/strings.xml     |  6 ++++--
 res/values-it/strings.xml     |  4 ++--
 res/values-iw/strings.xml     |  4 ++--
 res/values-ja/strings.xml     | 21 +++++++++------------
 res/values-ka-rGE/strings.xml |  8 +++++---
 res/values-km-rKH/strings.xml |  6 ++++--
 res/values-ko/strings.xml     |  6 ++++--
 res/values-lo-rLA/strings.xml |  6 ++++--
 res/values-lt/strings.xml     |  6 ++++--
 res/values-lv/strings.xml     |  6 ++++--
 res/values-mn-rMN/strings.xml |  4 ++--
 res/values-ms-rMY/strings.xml |  8 +++++---
 res/values-nb/strings.xml     |  6 +++---
 res/values-nl/strings.xml     |  4 ++--
 res/values-pl/strings.xml     |  4 ++--
 res/values-pt-rPT/strings.xml |  4 ++--
 res/values-pt/strings.xml     |  6 ++++--
 res/values-rm/strings.xml     |  4 ++--
 res/values-ro/strings.xml     |  6 ++++--
 res/values-ru/strings.xml     | 21 +++++++++------------
 res/values-sk/strings.xml     | 21 +++++++++------------
 res/values-sl/strings.xml     |  4 ++--
 res/values-sr/strings.xml     |  6 ++++--
 res/values-sv/strings.xml     |  4 ++--
 res/values-sw/strings.xml     |  6 +++---
 res/values-th/strings.xml     |  6 ++++--
 res/values-tl/strings.xml     |  6 ++++--
 res/values-tr/strings.xml     | 21 +++++++++------------
 res/values-uk/strings.xml     |  4 ++--
 res/values-vi/strings.xml     |  6 ++++--
 res/values-zh-rCN/strings.xml | 21 +++++++++------------
 res/values-zh-rHK/strings.xml |  4 ++--
 res/values-zh-rTW/strings.xml |  6 ++++--
 res/values-zu/strings.xml     |  4 ++--
 56 files changed, 199 insertions(+), 179 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2c55a04b5a..53b5b5a88c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Legstukke"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Niks meer spasie op jou Tuisskerms nie."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Niks meer spasie op die tuisskerm nie."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Niks meer plek op die warmlaai nie."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Hierdie legstuk is te groot vir die warmlaai."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen plek meer in die Gunstelinge-laai nie"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Hierdie legstuk is te groot vir die Gunstelinge-laai"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Kortpad \"<xliff:g id="NAME">%s</xliff:g>\" is geskep."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Kortpad \"<xliff:g id="NAME">%s</xliff:g>\" is verwyder."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Kortpad \"<xliff:g id="NAME">%s</xliff:g>\" bestaan reeds."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 605eac12e5..b0c862d144 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ፍርግሞች"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"የመነሻ ማያ ገጾችዎ ላይ ተጨማሪ ቦታ የለም።"</string>
     <string name="out_of_space" msgid="4691004494942118364">"በዚህ መነሻ ማያ ገጽ ላይ ምንም ቦታ የለም።"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"በመትከያ ቦታው ላይ ተጨማሪ ቦታ የለም።"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ይህ ፍርግም ለመትከያ ቦታው በጣም ትልቅ ነው።"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"በተወዳጆች መሣቢያ ውስጥ ተጨማሪ ቦታ የለም"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ይህ መግብር ወደ የተወዳጆች መሣቢያ ላይ እንዳይገባ በጣም ትልቅ ነው"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"አቋራጭ «<xliff:g id="NAME">%s</xliff:g>» ተፈጥሯል።"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"አቋራጭ «<xliff:g id="NAME">%s</xliff:g>» ተወግዶ ነበር።"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"አቋራጭ «<xliff:g id="NAME">%s</xliff:g>» አስቀድሞ አለ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e70aa36cea..98dce5fbda 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"الأدوات"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ليس هناك مساحة أخرى في الشاشات الرئيسية."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ليس هناك مساحة أخرى في هذه الشاشة الرئيسية."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ليست هناك مساحة أخرى في منطقة الإرساء القابلة للتخصيص."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"حجم هذه الأداة كبير للغاية بحيث لا تتسع له منطقة الإرساء القابلة للتخصيص."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"لا يوجد المزيد من الحقول في علبة المفضلة"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"هذه الأداة كبيرة جدًا مما يحول دون قبولها في علبة المفضّلة"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"تم إنشاء الاختصار \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"تمت إزالة الاختصار \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"الاختصار \"<xliff:g id="NAME">%s</xliff:g>\" موجود من قبل."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 27a1812f58..6d5680a93d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Приспособления"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На началните ви екрани няма повече място."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На този начален екран няма повече място."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"В трамплина няма повече място."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Това приспособление е твърде голямо за трамплина."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Прекият път към <xliff:g id="NAME">%s</xliff:g> е създаден."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Прекият път към <xliff:g id="NAME">%s</xliff:g> бе премахнат."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Прекият път към <xliff:g id="NAME">%s</xliff:g> вече съществува."</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Начален екран %1$d от %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Страница с приложения %1$d от %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Страница с приспособления %1$d от %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Добре дошли"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Персонализиране и приспособяване."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Създаване на още екрани за приложения и папки"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Икони на прилож. ви: Копиране"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Да се импортират ли иконите и папките от старите ви начални екрани?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРАНЕ НА ИКОНИТЕ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"СТАРТИРАНЕ ОТНАЧАЛО"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организиране на мястото ви"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Докоснете и задръжте фона, за да управлявате тапета, приспособленията и настройките."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Ето една папка"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ba3f418bf3..865d0e0ee7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No queda espai a les pantalles d\'inici."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Ja no queda espai en aquesta pantalla d\'inici."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No queda espai al hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Aquest widget és massa gran per al hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No hi ha més espai a la safata Preferits."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Aquest widget és massa gran per a la safata Preferits."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"S\'ha creat la drecera \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"S\'ha suprimit la drecera \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"La drecera \"<xliff:g id="NAME">%s</xliff:g>\" ja existeix."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 68ff5f75f8..0255709260 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgety"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na plochách již není místo."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na této ploše již není místo."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"V sekci hotseat již není místo."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Widget je pro hotseat příliš velký."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na panelu Oblíbené položky již není místo."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Tento widget je pro panel Oblíbené položky příliš velký."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Zástupce aplikace <xliff:g id="NAME">%s</xliff:g> byl vytvořen."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Zástupce aplikace <xliff:g id="NAME">%s</xliff:g> byl odebrán."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Zástupce aplikace <xliff:g id="NAME">%s</xliff:g> již existuje."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c145dce927..68ceb5bec2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Der er ikke mere plads på dine startskærme."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Der er ikke mere plads på denne startskærm."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Der er ikke mere plads i hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Denne widget er for stor til hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Der er ikke mere plads i bakken Foretrukne"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Denne widget er for stor til bakken Foretrukne"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" blev oprettet."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" blev fjernet."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" findes allerede."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d13a492a7c..4bd04b208b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Auf Ihren Startbildschirmen ist kein Platz mehr vorhanden."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Auf diesem Startbildschirm ist kein Platz mehr vorhanden."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Kein Platz mehr auf der App-Leiste"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Dieses Widget ist zu groß für die App-Leiste."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ablage \"Favoriten\" ist voll."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Dieses Widget ist zu groß für die Ablage \"Favoriten\"."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Verknüpfung \"<xliff:g id="NAME">%s</xliff:g>\" wurde erstellt."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Verknüpfung \"<xliff:g id="NAME">%s</xliff:g>\" wurde entfernt."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Verknüpfung \"<xliff:g id="NAME">%s</xliff:g>\" ist bereits vorhanden."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7bdfa134a3..b6a9855e4b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Γραφικά στοιχεία"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Δεν υπάρχει άλλος χώρος στις Αρχικές οθόνες σας."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Δεν υπάρχει χώρος σε αυτήν την αρχική οθόνη."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Δεν υπάρχει άλλος χώρος στη γραμμή γρήγορης πρόσβασης."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Αυτό το γραφικό στοιχείο είναι πολύ μεγάλο για τη γραμμή γρήγορης πρόσβασης."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Δεν υπάρχει επιπλέον χώρος στην περιοχή Αγαπημένα"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Αυτό το γραφικό στοιχείο είναι πολύ μεγάλο για την περιοχή Αγαπημένα."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Δημιουργήθηκε η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\" καταργήθηκε."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Η συντόμευση \"<xliff:g id="NAME">%s</xliff:g>\" υπάρχει ήδη."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f4f11dadab..9f732e09d8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No more room on your Home screens."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No more room on the hot seat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"This widget is too large for the hot seat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"This widget is too large for the Favourites tray"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" created."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" was removed."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" already exists."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f4f11dadab..9f732e09d8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No more room on your Home screens."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No more room on this Home screen."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No more room on the hot seat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"This widget is too large for the hot seat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"No more room in the Favourites tray"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"This widget is too large for the Favourites tray"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" created."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" was removed."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Shortcut \"<xliff:g id="NAME">%s</xliff:g>\" already exists."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d585f366ea..95e4a997bd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No hay más espacio en tus pantallas principales."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No hay más espacio en esta pantalla principal."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No hay más espacio en la barra de accesos directos."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget es demasiado grande para la barra de accesos directos."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está llena."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Este widget es demasiado grande para la bandeja de favoritos."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Se creó el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Se eliminó el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ya existe."</string>
@@ -84,13 +84,13 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Pantalla principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Página de widgets %1$d de %2$d"</string>
-    <string name="first_run_cling_title" msgid="2459738000155917941">"Te damos la bienvenida"</string>
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Bienvenido"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Siéntete como en casa."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Crea más pantallas para aplicaciones y carpetas."</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Copiar íconos de aplicaciones"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar íconos y carpetas de pantallas princip. antiguas?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar íconos y carpetas de pant. principales antiguas?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONOS"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"EMPEZAR DE CERO"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8ca3e08d08..e5beb909eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"No queda espacio en las pantallas de inicio."</string>
     <string name="out_of_space" msgid="4691004494942118364">"No queda espacio en la pantalla de inicio."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"No queda espacio en la barra de accesos directos."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget es demasiado grande para la barra de accesos directos."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"La bandeja de favoritos está completa"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Este widget es demasiado grande para la bandeja de favoritos"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Se ha creado el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Se ha eliminado el acceso directo \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"El acceso directo \"<xliff:g id="NAME">%s</xliff:g>\" ya existe."</string>
@@ -92,7 +92,7 @@
     <string name="migration_cling_title" msgid="9181776667882933767">"Copiar iconos de aplicaciones"</string>
     <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar iconos y carpetas de pantallas de inicio antiguas?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ICONOS"</string>
-    <string name="migration_cling_use_default" msgid="2626475813981258626">"INICIAR ACTUALIZACIÓN"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"AJUSTES PREDETERMINADOS"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para gestionar el fondo de pantalla, los widgets y los ajustes."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Esto es una carpeta"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 4a0dd8e7b1..55fa73e776 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Vidinad"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Teie avaekraanidel ei ole enam ruumi."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Kohandataval dokialal pole rohkem ruumi."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"See vidin on kohandatava dokiala jaoks liiga suur."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on loodud."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on eemaldatud."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on juba olemas."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index dc5f1864b6..f4f445ed65 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ابزارک‌ها"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"فضای بیشتری در صفحات نمایش اصلی شما موجود نیست."</string>
     <string name="out_of_space" msgid="4691004494942118364">"فضای بیشتری در این صفحه اصلی موجود نیست."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"فضای بیشتری در جایگاه اتصال نیست."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"این ابزارک بیش از حد برای جایگاه اتصال بزرگ است."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی مورد علاقه‌ها وجود ندارد"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"این ابزارک برای سینی مورد علاقه‌ها بسیار بزرگ است"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» ایجاد شد."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» حذف شد."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» در حال حاضر وجود دارد."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9bf69f4eaf..1feb28c61f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgetit"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Aloitusruuduilla ei ole enää tilaa."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Hotseatissa ei ole enää tilaa."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Tämä widget on liian suuri tähän hotseat-paikkaan."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> luotiin."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> poistettiin."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> on jo olemassa."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d0908ff9d6..03343510c5 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Vous n\'avez plus d\'espace libre sur vos écrans d\'accueil."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur l\'écran d\'accueil."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Vous n\'avez plus de place sur la barre d\'accès rapide."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ce widget est trop volumineux pour la barre d\'accès rapide."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Il n\'y a plus d\'espace dans la zone des favoris"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ce widget est trop volumineux pour la zone des favoris"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Le raccourci « <xliff:g id="NAME">%s</xliff:g> » a été créé."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Le raccourci « <xliff:g id="NAME">%s</xliff:g> » a été supprimé."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Le raccourci « <xliff:g id="NAME">%s</xliff:g> » existe déjà."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1340dd54d4..5f0607e1ab 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Vous n\'avez plus d\'espace libre sur vos écrans d\'accueil."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Pas d\'espace libre sur cet écran d\'accueil."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Vous n\'avez plus de place sur la barre d\'accès rapide."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ce widget est trop volumineux pour la barre d\'accès rapide."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Plus d\'espace disponible dans la zone de favoris."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ce widget est trop volumineux pour la zone de favoris."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" a été créé."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" a été supprimé."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Le raccourci \"<xliff:g id="NAME">%s</xliff:g>\" existe déjà."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 67bfcc7797..42bb397d89 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"विजेट"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"आपकी होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
     <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"हॉटसीट पर स्थान शेष नहीं है."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"हॉटसीट के लि‍ए यह वि‍जेट बहुत बड़ा है."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" बनाया गया."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" निकाल दिया गया था."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" पहले से मौजूद है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8d6b3fde99..2c9d5487f8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeti"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na vašim početnim zaslonima više nema mjesta."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Na hotseatu više nema mjesta."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ovaj je widget prevelik za hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Izrađen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Uklonjen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Prečac za \"<xliff:g id="NAME">%s</xliff:g>\" već postoji."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2c95329f45..1734fe37ea 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Modulok"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nincs több hely a kezdőképernyőkön."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nincs több hely ezen a kezdőképernyőn."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Nincs több hely az egyéni mezőben."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ez a modul túl nagy az egyéni mező számára."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ez a widget túl nagy a Kedvencek tálcán való elhelyezéshez"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon létrehozva."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon eltávolítva."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon már létezik."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e18b7e25e6..1faae76274 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Վիջեթներ"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Այլևս տեղ չկա ձեր հիմնական էկրաններին:"</string>
     <string name="out_of_space" msgid="4691004494942118364">"Այլևս տեղ չկա այս հիմնական էկրանին:"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Թեժ նստատեղերում այլևս տեղ չկա:"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Այս վիջեթը չափազանց մեծ է թեժ նստատեղերի համար:"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Ընտրյալների ցուցակում այլևս ազատ տեղ չկա"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Այս վիջեթը շատ մեծ է Ընտրյալների ցուցակի համար"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"«<xliff:g id="NAME">%s</xliff:g>» դյուրանցումը ստեղծված է:"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"«<xliff:g id="NAME">%s</xliff:g>» դյուրանցումը հեռացվեց:"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"«<xliff:g id="NAME">%s</xliff:g>» դյուրանցումն արդեն գոյություն ունի:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5b59a8b8a9..f2c6f6e683 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tidak ada ruang lagi di layar Utama Anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi pada layar Utama ini."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Tidak ada ruang lagi di hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Widget ini terlalu besar untuk hotseat tersebut."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dihapus."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah ada."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 52548be272..f379ae7b1b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Spazio nelle schermate Home esaurito."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Spazio nella schermata Home esaurito."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Spazio nell\'area hotseat esaurito."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Questo widget è troppo grande per l\'area hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spazio esaurito nella barra dei Preferiti"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Questo widget è troppo grande per la barra dei Preferiti"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" creata."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"La scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" è stata rimossa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Scorciatoia \"<xliff:g id="NAME">%s</xliff:g>\" già presente."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 38d1cee35c..da79225684 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"רכיבי ווידג\'ט"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"אין יותר מקום במסכי דף הבית."</string>
     <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"אין יותר מקום בפס האפליקציות."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"הווידג\'ט הזה גדול מדי עבור פס האפליקציות."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש ה\'מועדפים\'"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"הווידג\'ט הזה גדול מדי עבור מגש ה\'מועדפים\'."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' נוצר."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' הוסר."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' כבר קיים."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 63ac20e1d3..7a95f8e0de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ウィジェット"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ホーム画面に空きスペースがありません。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"このホーム画面に空きスペースがありません。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ホットシートに空きスペースがありません。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"このウィジェットはホットシートには大きすぎます。"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を作成しました。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を削除しました。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」は既に存在します。"</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"ホーム画面: %1$d/%2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"アプリの%1$d/%2$dページ"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"ウィジェットの%1$d/%2$dページ"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"ようこそ"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"ホームをカスタマイズします。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"アプリとフォルダの画面をもっと作成します"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"アプリのアイコンをコピー"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"古いホーム画面からアイコンとフォルダをインポートしますか？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"アイコンをコピー"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"初期状態にリセットする"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"スペースを整理"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"壁紙、ウィジェット、設定を管理するには、背景を押し続けます。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"これがフォルダです"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index e55ae844ae..4fdd2a07e6 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ვიჯეტები"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"მთავარ ეკრანებზე ადგილი აღარ არის."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ამ მთავარ ეკრანზე ადგილი აღარ არის."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"hotseat-ში მეტი ადგილი არ არის."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ეს ვიჯეტი ძალიან დიდია hotseat-ისთვის."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"შეიქმნა მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"მასლახმობი „<xliff:g id="NAME">%s</xliff:g>“ წაშლილია."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“ უკვე არსებობს."</string>
@@ -90,7 +92,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"აპებისა და საქაღალდეებისთვის კიდევ ერთი ეკრანის შექმნა"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"თქვენი აპის ხატულების კოპირება"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"გსურთ ძვლი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"გსურთ, ძველი მთავარი ეკრანიდან ხატულების და საქაღ. იმპორტი?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"ხატულების კოპირება"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"სტანდარტული განლაგება"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"თქვენი სივრცის ორგანიზება"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index a15ef21cbc..d655622a0c 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​រស់​អ្នក​ទៀត​ទេ។"</string>
     <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"គ្មាន​បន្ទប់​នៅ​ក្នុង​មជ្ឈមណ្ឌល​ទៀត​ទេ។"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ធាតុ​ក្រាហ្វិក​នេះ​ធំ​ពេក​សម្រាប់​មជ្ឈមណ្ឌល។"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"បាន​បង្កើត​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"បាន​លុប​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"មាន​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" រួច​ហើយ។"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 942f30bbbc..ef1b3093d4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"위젯"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"홈 화면에 더 이상 공간이 없습니다."</string>
     <string name="out_of_space" msgid="4691004494942118364">"홈 화면에 더 이상 공간이 없습니다."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"즐겨찾는 앱 모음에 더 이상 빈 공간이 없습니다."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"이 위젯은 너무 커서 즐겨찾는 앱 모음에 들어갈 수 없습니다."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 생성되었습니다."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 삭제되었습니다."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 이미 있습니다."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index fbc7bf063a..d7e103d6a4 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"ວິດເຈັດ"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກຂອງທ່ານ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກນີ້."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ບໍ່ມີຫ້ອງຫວ່າງໃນ hotseat ແລ້ວ."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"ວິດເຈັດ ມີຂະໜາດໃຫຍ່ເກີນໄປສຳລັບ hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກສ້າງແລ້ວ."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກລຶບແລ້ວ."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ມີຢູ່ແລ້ວ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 482b7a4105..977f6a9ab0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Valdikliai"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Pagrindiniuose ekranuose vietos nebėra."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šiame pagrindiniame ekrane vietos nebėra."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Įtvirtintojoje srityje nebėra vietos."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Šis valdiklis įtvirtintajai sričiai per didelis."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ sukurtas."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ pašalintas."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ jau yra."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2b2dba8d3a..b2d6152fe6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Logrīki"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Sākuma ekrānos vairs nav vietas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šajā sākuma ekrānā vairs nav vietas."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Režīmā “hotseat” vairs nav vietas."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Šis logrīks ir pārāk liels režīmam “hotseat”."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Tika izveidota saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Tika noņemta saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Saīsne “<xliff:g id="NAME">%s</xliff:g>” jau pastāv."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 9f489cfdf7..0430ac5b3b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виджет"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Таны Нүүр дэлгэц зайгүй."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Энэ Нүүр дэлгэц зайгүй."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Суурь зайгүй."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Энэ виджет сууринд хэт томдож байна."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"\"Дуртай\" трей дээр өөр зай байхгүй байна"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Энэ виджет трей дээр хэт томдож байна"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"\"<xliff:g id="NAME">%s</xliff:g>\" товчлол үүсэв."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"\"<xliff:g id="NAME">%s</xliff:g>\" товчлол устгагдав."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" товчлол өмнө үүссэн байна."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 2aee204059..c7d59e3c55 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tiada lagi ruang pada skrin Laman Utama anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Tiada lagi ruang pada kerusi panas."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Widget ini terlalu besar untuk kerusi panas."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dialih keluar."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah wujud."</string>
@@ -90,7 +92,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Buat lebih banyak skrin untuk apl dan folder"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Salin ikon apl anda"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"Import ikon dan folder dari skrin Laman Utama anda?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Import ikon dan folder dari skrin Laman Utama lama anda?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"SALIN IKON"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"MULAKAN YANG BAHARU"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Susun ruang anda"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4703291eb8..0e163753aa 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Moduler"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Ikke mer plass på startsidene dine."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Denne startsiden er full."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Dokksonen er full."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Denne modulen er for stor for dokksonen."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritter-skuffen er full"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Denne modulen er for stor for Favoritter-skuffen."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» er opprettet."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» er fjernet."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» fins allerede."</string>
@@ -90,7 +90,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Opprett flere sider for apper og mapper"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Kopiér appikonene dine"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra de gamle startsidene?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Vil du importere ikoner og mapper fra dine gamle startsider?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"KOPIÉR IKONENE"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"START PÅ NYTT"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Organiser plassen din"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 658f379122..f6c1b09c95 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Er is geen ruimte meer op uw startschermen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Er is geen ruimte meer op dit startscherm."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Er is geen ruimte meer op de hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Deze widget is te groot voor de hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Geen ruimte meer in het vak \'Favorieten\'"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Deze widget is te groot voor het vak \'Favorieten\'"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' is gemaakt."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' is verwijderd."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Snelkoppeling \'<xliff:g id="NAME">%s</xliff:g>\' bestaat al."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f8a34a480e..5a2efbfbc6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widżety"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Brak miejsca na ekranach głównych."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Brak miejsca na tym ekranie głównym."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Brak miejsca w kieszonce."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ten widżet jest za duży, by umieścić go w kieszonce."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Brak miejsca w Ulubionych"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ten widżet jest za duży, by zmieścił się w Ulubionych"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Skrót „<xliff:g id="NAME">%s</xliff:g>” został utworzony."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Skrót „<xliff:g id="NAME">%s</xliff:g>” został usunięty."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Skrót „<xliff:g id="NAME">%s</xliff:g>” już istnieje."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5490a4fdd5..c6f5710414 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Sem espaço suficiente nos Ecrãs principais."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sem espaço suficiente neste Ecrã principal."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Sem espaço suficiente na barra personalizável."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget é demasiado grande para a barra personalizável."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Não existe mais espaço no tabuleiro de Favoritos"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Este widget é demasiado grande para o tabuleiro de Favoritos"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Atalho “<xliff:g id="NAME">%s</xliff:g>” criado."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho “<xliff:g id="NAME">%s</xliff:g>” foi removido."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho “<xliff:g id="NAME">%s</xliff:g>” já existe."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2bf38e546b..df7f056e9d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Não há mais espaço nas telas iniciais."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Não há mais espaço na tela inicial."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Não há mais espaço no hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Este widget é muito grande para o hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Atalho \"<xliff:g id="NAME">%s</xliff:g>\" criado."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index ce6093f153..8563d7da40 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -64,9 +64,9 @@
     <skip />
     <!-- no translation found for out_of_space (4691004494942118364) -->
     <skip />
-    <!-- no translation found for hotseat_out_of_space (9139760413395605841) -->
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
     <skip />
-    <!-- no translation found for invalid_hotseat_item (1211534262129849507) -->
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
     <skip />
     <!-- no translation found for shortcut_installed (1701742129426969556) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a23a0cd2c0..1c0460be8c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeturi"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nu mai este loc pe ecranele de pornire."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nu mai este loc pe acest Ecran de pornire."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Nu mai este loc în bara de lansare rapidă."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Acest widget este prea mare pentru bara de lansare rapidă."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>\" a fost creată."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” a fost eliminată."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” există deja."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 46c84af6cd..ec723cb7e3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виджеты"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На главных экранах все занято"</string>
     <string name="out_of_space" msgid="4691004494942118364">"На этом экране все занято"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Нет свободного места в слоте"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Виджет слишком велик для слота"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" создан"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" удален"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" уже существует"</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Главные экран %1$d из %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Приложения: стр. %1$d из %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Виджеты: стр. %1$d из %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Добро пожаловать!"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Будьте как дома"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Создание дополнительных экранов для приложений и папок"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Копировать значки приложений"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Импортировать значки и папки со старого главного экрана?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРОВАТЬ ЗНАЧКИ"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ИСПОЛЬЗОВАТЬ СТАНДАРТНЫЙ МАКЕТ"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Организация рабочего пространства"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Чтобы перейти к управлению обоями, виджетами и настройками, нажмите на фоновое изображение и удерживайте его."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Это папка"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 64de07f5ee..271d8b81d6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Miniaplikácie"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na plochách už nie je miesto."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tejto ploche už nie je miesto"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"V časti hotseat už nie je miesto."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Táto miniaplikácia je pre hotseat príliš veľká."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol vytvorený."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol odstránený."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Odkaz <xliff:g id="NAME">%s</xliff:g> už existuje."</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Stránka aplikácií %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Stránka miniaplikácií %1$d z %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Vitajte"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Cíťte sa tu ako doma."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Vytvorte viac obrazoviek pre aplikácie a priečinky"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Kopírovanie ikon aplikácií"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Chcete importovať ikony a priečinky zo starých plôch?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"SKOPÍROVAŤ IKONY"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"ZAČAŤ S PREDVOLENÝM ROZLOŽENÍM"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Usporiadajte svoj priestor"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Ak chcete spravovať tapetu, miniaplikácie a nastavenia, dotknite sa pozadia a podržte."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"Tu je priečinok"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f6d755643c..dfd63e2c0f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Pripomočki"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na začetnih zaslonih ni več prostora."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tem začetnem zaslonu ni več prostora."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"V vrstici z ikonami ni več prostora."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Ta pripomoček je prevelik za vrstico z ikonami."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"V vrstici za priljubljene ni več prostora"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ta pripomoček je prevelik za vrstico s priljubljenimi"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Bližnjica »<xliff:g id="NAME">%s</xliff:g>« je ustvarjena."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Bližnjica »<xliff:g id="NAME">%s</xliff:g>« je bila odstranjena."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Bližnjica »<xliff:g id="NAME">%s</xliff:g>« že obstaja."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0d35b2f0ce..a8299c2e43 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виџети"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Нема више простора на почетним екранима."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Нема више простора на овом почетном екрану."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Нема више простора на траци актуелности."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Овај виџет је превелики за траку актуелности."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је направљена."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је уклоњена."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ већ постоји."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3fa6a5e03a..4005b7e6ea 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgetar"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Det finns inte plats för mer på dina startsidor."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Det finns inte plats för mer på den här startskärmen."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Utrymmet på Hotseat är fullt."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Denna widget är för stor för Hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoritfältet är fullt"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Denna widget är för stor för favoritfältet"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Genvägen <xliff:g id="NAME">%s</xliff:g> har skapats."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Genvägen <xliff:g id="NAME">%s</xliff:g> har tagits bort."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Genvägen <xliff:g id="NAME">%s</xliff:g> finns redan."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fca5a47e9c..4397d3bae5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Wijeti"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Hakuna nafasi zaidi kwenye skrini zako za Nyumbani."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Hakuna nafasi katika skrini hii ya Mwanzo."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Hakuna nafasi zaidi kwenye eneo kali."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Wijeti hii ni kubwa zaidi kwa eneo kali."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Hakuna nafasi zaidi katika treya ya Vipendeleo"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Wijeti hii ni kubwa mno kwa treya ya Vipendeleo"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" imeundwa."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" iliondolewa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" la njia ya mkato tayari lipo."</string>
@@ -92,7 +92,7 @@
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Unda skrini zaidi za programu na folda"</string>
     <string name="migration_cling_title" msgid="9181776667882933767">"Nakili ikoni za programu yako"</string>
-    <string name="migration_cling_description" msgid="2752413805582227644">"Je, ungependa kuingiza ikoni na folda kutoka kwa skrini zako za Mwanzo za zamani?"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Je, ungependa kuingiza ikoni na folda kutoka kwenye skrini zako za Mwanzo za zamani?"</string>
     <string name="migration_cling_copy_apps" msgid="946331230090919440">"NAKILI IKONI"</string>
     <string name="migration_cling_use_default" msgid="2626475813981258626">"ANZA UPYA"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Panga nafasi yako"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 70c2134e94..de8ce198a4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"วิดเจ็ต"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ไม่มีที่ว่างในหน้าจอหลักของคุณ"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"ไม่มีที่ว่างใน hotseat"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"วิดเจ็ตนี้มีขนาดใหญ่เกินไปสำหรับ hotseat"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"สร้างทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" แล้ว"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"นำทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" ออกแล้ว"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"มีทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" อยู่แล้ว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 190565e5fd..2f03be1185 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Mga Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Wala nang lugar sa iyong mga Home screen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Wala nang lugar sa Home screen na ito."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Wala nang lugar sa hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Masyadong malaki ang widget na ito para sa hotseat."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Nagawa ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Inalis ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Umiiral na ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bb8f6be466..0712f92d17 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget\'lar"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Ana ekranlarınızda yer kalmadı."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Bu Ana ekranda yer kalmadı."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Favori kısa yollarda yer yok"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Bu widget, favori kısa yollar için çok büyük."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu oluşturuldu."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu kaldırıldı."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu zaten var."</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"Ana ekran %1$d / %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"Uygulama sayfası %1$d / %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"Widget sayfası %1$d / %2$d"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"Hoş geldiniz"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"Rahatınıza bakın."</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"Uygulamalar ve klasörler için daha fazla ekran oluşturun"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"Uygulama simgelerini kopyala"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"Eski Ana ekranlarınızdaki simgeler ve klasörler içe aktarılsın mı?"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"SİMGELERİ KOPYALA"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"VARSAYILANI KULLAN"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"Alanınızı düzenleyin"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"Duvar kağıdını, widget\'ları ve ayarları yönetmek için arka plana uzun basın."</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"İşte bir klasör"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8ceb8e8bda..7cef32139f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Віджети"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На головних екранах більше немає місця."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На цьому головному екрані більше немає місця."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Немає вільного місця."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Цей віджет завеликий."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"В області \"Вибране\" немає місця"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Цей віджет завеликий для області \"Вибране\""</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Ярлик \"<xliff:g id="NAME">%s</xliff:g>\" створено."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Ярлик \"<xliff:g id="NAME">%s</xliff:g>\" вилучено."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Ярлик \"<xliff:g id="NAME">%s</xliff:g>\" уже існує."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index abe17c2bc6..23b208ddd2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"Tiện ích con"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Không còn chỗ trên Màn hình chính của bạn."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Không còn chỗ trên Màn hình chính này."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Không còn chỗ trên vùng gắn."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Tiện ích con này quá lớn cho vùng gắn."</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã được tạo."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã bị xóa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã tồn tại."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f01b695732..7e221d1b5c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"小部件"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"您的主屏幕上没有空间了。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"底部区域已无空间。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"该小部件太大，底部区域容纳不下。"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"已创建“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已删除“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已存在。"</string>
@@ -84,20 +86,15 @@
     <string name="workspace_scroll_format" msgid="8458889198184077399">"主屏幕：第%1$d屏，共%2$d屏"</string>
     <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"应用：第%1$d页，共%2$d页"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"小部件：第%1$d页，共%2$d页"</string>
-    <!-- no translation found for first_run_cling_title (2459738000155917941) -->
-    <skip />
+    <string name="first_run_cling_title" msgid="2459738000155917941">"欢迎使用"</string>
     <string name="first_run_cling_description" msgid="6447072552696253358">"您的主屏幕您做主。"</string>
     <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
     <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
     <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"添加更多屏幕来容纳应用和文件夹"</string>
-    <!-- no translation found for migration_cling_title (9181776667882933767) -->
-    <skip />
-    <!-- no translation found for migration_cling_description (2752413805582227644) -->
-    <skip />
-    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-    <skip />
-    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-    <skip />
+    <string name="migration_cling_title" msgid="9181776667882933767">"复制应用图标"</string>
+    <string name="migration_cling_description" msgid="2752413805582227644">"要导入旧的主屏幕中的图标和文件夹吗？"</string>
+    <string name="migration_cling_copy_apps" msgid="946331230090919440">"复制图标"</string>
+    <string name="migration_cling_use_default" msgid="2626475813981258626">"使用全新配置"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"整理您的空间"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"触摸并按住背景，即可管理壁纸、小部件和设置。"</string>
     <string name="folder_cling_title" msgid="3894908818693254164">"这是一个文件夹"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c12c03f0e3..d40292ecdb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主畫面已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"停駐區已無可用空間。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"這個小工具過大，停駐區沒有足夠空間。"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏系統匣沒有足夠空間"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，我的收藏系統匣沒有足夠空間"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b0cc1e8318..079ec75abe 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -42,8 +42,10 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主螢幕已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"這個主螢幕已無空間。"</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"停駐區已無空間。"</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"這個小工具過大，停駐區無法容納。"</string>
+    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
+    <skip />
+    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
+    <skip />
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 57bc7d4db3..c07f6a96c5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Amawijethi"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Akusenagumbi ezikrinini zakho Zekhaya."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Asisekho isikhala kulesi sikrini Sasekhaya."</string>
-    <string name="hotseat_out_of_space" msgid="9139760413395605841">"Akusenagumbi ku-hotseat."</string>
-    <string name="invalid_hotseat_item" msgid="1211534262129849507">"Le wijethi inkulu kakhulu ukuba ku-hotseat."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Asisekho isikhala kwitreyi lezintandokazi"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Le wijethi inkulu kakhulu ukuba kwitreyi lezintandokazi."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Isinqamuleli esithi \"<xliff:g id="NAME">%s</xliff:g>\" sidaliwe."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Isinqamuleli esithi \"<xliff:g id="NAME">%s</xliff:g>\" sisusiwe."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Isinqamuleli esithi \"<xliff:g id="NAME">%s</xliff:g>\" sesivele sikhona."</string>

From 556f6135f992dcd5bfbfffe0172627bfbf57d24e Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 15 Jan 2014 15:18:08 -0800
Subject: [PATCH 125/147] Don't migrate shortcuts for components that no longer
 exist

Bug 12570791

Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
---
 src/com/android/launcher3/LauncherModel.java  |  5 +-
 .../android/launcher3/LauncherProvider.java   | 48 ++++++++++++-------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4478e9bbd3..2102a1faca 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2709,7 +2709,7 @@ public class LauncherModel extends BroadcastReceiver {
         return widgetsAndShortcuts;
     }
 
-    private boolean isPackageDisabled(PackageManager pm, String packageName) {
+    private static boolean isPackageDisabled(PackageManager pm, String packageName) {
         try {
             PackageInfo pi = pm.getPackageInfo(packageName, 0);
             return !pi.applicationInfo.enabled;
@@ -2718,7 +2718,8 @@ public class LauncherModel extends BroadcastReceiver {
         }
         return false;
     }
-    private boolean isValidPackageComponent(PackageManager pm, ComponentName cn) {
+
+    public static boolean isValidPackageComponent(PackageManager pm, ComponentName cn) {
         if (cn == null) {
             return false;
         }
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 5676a9adb7..d4ce322c8e 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1516,6 +1516,7 @@ public class LauncherProvider extends ContentProvider {
                         final int width = (int) grid.numColumns;
                         final int height = (int) grid.numRows;
                         final int hotseatWidth = (int) grid.numHotseatIcons;
+                        PackageManager pm = mContext.getPackageManager();
 
                         final HashSet<String> seenIntents = new HashSet<String>(c.getCount());
 
@@ -1538,29 +1539,40 @@ public class LauncherProvider extends ContentProvider {
                                 + c.getString(titleIndex) + "\": " + intentStr, true);
 
                             if (itemType != Favorites.ITEM_TYPE_FOLDER) {
+
+                                final Intent intent;
+                                final ComponentName cn;
+                                try {
+                                    intent = Intent.parseUri(intentStr, 0);
+                                } catch (URISyntaxException e) {
+                                    // bogus intent?
+                                    Launcher.addDumpLog(TAG,
+                                            "skipping invalid intent uri", true);
+                                    continue;
+                                }
+
+                                cn = intent.getComponent();
+
                                 if (TextUtils.isEmpty(intentStr)) {
                                     // no intent? no icon
                                     Launcher.addDumpLog(TAG, "skipping empty intent", true);
                                     continue;
+                                } else if (!LauncherModel.isValidPackageComponent(pm, cn)) {
+                                    // component no longer exists.
+                                    Launcher.addDumpLog(TAG, "skipping item whose component" +
+                                            "no longer exists.", true);
+                                    continue;
                                 } else {
-                                    try {
-                                        // Canonicalize
-                                        final Intent intent = Intent.parseUri(intentStr, 0);
-                                        // the Play Store sets the package parameter, but Launcher
-                                        // does not, so we clear that out to keep them the same
-                                        intent.setPackage(null);
-                                        final String key = intent.toUri(0);
-                                        if (seenIntents.contains(key)) {
-                                            Launcher.addDumpLog(TAG, "skipping duplicate", true);
-                                            continue;
-                                        } else {
-                                            seenIntents.add(key);
-                                        }
-                                    } catch (URISyntaxException e) {
-                                        // bogus intent?
-                                        Launcher.addDumpLog(TAG,
-                                                "skipping invalid intent uri", true);
+                                    // Canonicalize
+                                    // the Play Store sets the package parameter, but Launcher
+                                    // does not, so we clear that out to keep them the same
+                                    intent.setPackage(null);
+                                    final String key = intent.toUri(0);
+                                    if (seenIntents.contains(key)) {
+                                        Launcher.addDumpLog(TAG, "skipping duplicate", true);
                                         continue;
+                                    } else {
+                                        seenIntents.add(key);
                                     }
                                 }
                             }
@@ -1712,4 +1724,4 @@ public class LauncherProvider extends ContentProvider {
             }
         }
     }
-}
+}
\ No newline at end of file

From 9c5cc5a8938320c818ed21ce3e3d06fc0eae4245 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 9 Jan 2014 14:59:22 +0100
Subject: [PATCH 126/147] Lazy load the widget preview loader class

Bug: 12109621

Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
---
 .../launcher3/AppsCustomizePagedView.java     | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 2865bc5d5c..f90189cedc 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -301,6 +301,13 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         mPageLayoutPaddingBottom = pageIndicatorHeight;
     }
 
+    WidgetPreviewLoader getWidgetPreviewLoader() {
+        if (mWidgetPreviewLoader == null) {
+            mWidgetPreviewLoader = new WidgetPreviewLoader(mLauncher);
+        }
+        return mWidgetPreviewLoader;
+    }
+
     /** Returns the item index of the center item on this page so that we can restore to this
      *  item index when we rotate. */
     private int getMiddleComponentIndexOnCurrentPage() {
@@ -366,10 +373,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
     }
 
     protected void onDataReady(int width, int height) {
-        if (mWidgetPreviewLoader == null) {
-            mWidgetPreviewLoader = new WidgetPreviewLoader(mLauncher);
-        }
-
         // Now that the data is ready, we can calculate the content width, the number of cells to
         // use for each page
         LauncherAppState app = LauncherAppState.getInstance();
@@ -729,13 +732,13 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
 
             int[] previewSizeBeforeScale = new int[1];
 
-            preview = mWidgetPreviewLoader.generateWidgetPreview(createWidgetInfo.componentName,
+            preview = getWidgetPreviewLoader().generateWidgetPreview(createWidgetInfo.componentName,
                     createWidgetInfo.previewImage, createWidgetInfo.icon, spanX, spanY,
                     maxWidth, maxHeight, null, previewSizeBeforeScale);
 
             // Compare the size of the drag preview to the preview in the AppsCustomize tray
             int previewWidthInAppsCustomize = Math.min(previewSizeBeforeScale[0],
-                    mWidgetPreviewLoader.maxWidthForWidgetPreview(spanX));
+                    getWidgetPreviewLoader().maxWidthForWidgetPreview(spanX));
             scale = previewWidthInAppsCustomize / (float) preview.getWidth();
 
             // The bitmap in the AppsCustomize tray is always the the same size, so there
@@ -1149,7 +1152,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                     // do cleanup inside onSyncWidgetPageItems
                     onSyncWidgetPageItems(data, false);
                 }
-            }, mWidgetPreviewLoader);
+            }, getWidgetPreviewLoader());
 
         // Ensure that the task is appropriately prioritized and runs in parallel
         AppsCustomizeAsyncTask t = new AppsCustomizeAsyncTask(page,
@@ -1210,7 +1213,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                 createItemInfo.minSpanX = minSpanXY[0];
                 createItemInfo.minSpanY = minSpanXY[1];
 
-                widget.applyFromAppWidgetProviderInfo(info, -1, spanXY, mWidgetPreviewLoader);
+                widget.applyFromAppWidgetProviderInfo(info, -1, spanXY, getWidgetPreviewLoader());
                 widget.setTag(createItemInfo);
                 widget.setShortPressListener(this);
             } else if (rawInfo instanceof ResolveInfo) {
@@ -1220,7 +1223,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                 createItemInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
                 createItemInfo.componentName = new ComponentName(info.activityInfo.packageName,
                         info.activityInfo.name);
-                widget.applyFromResolveInfo(mPackageManager, info, mWidgetPreviewLoader);
+                widget.applyFromResolveInfo(mPackageManager, info, getWidgetPreviewLoader());
                 widget.setTag(createItemInfo);
             }
             widget.setOnClickListener(this);
@@ -1257,11 +1260,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                     maxPreviewHeight = maxSize[1];
                 }
 
-                mWidgetPreviewLoader.setPreviewSize(
+                getWidgetPreviewLoader().setPreviewSize(
                         maxPreviewWidth, maxPreviewHeight, mWidgetSpacingLayout);
                 if (immediate) {
                     AsyncTaskPageData data = new AsyncTaskPageData(page, items,
-                            maxPreviewWidth, maxPreviewHeight, null, null, mWidgetPreviewLoader);
+                            maxPreviewWidth, maxPreviewHeight, null, null, getWidgetPreviewLoader());
                     loadWidgetPreviewsInBackground(null, data);
                     onSyncWidgetPageItems(data, immediate);
                 } else {
@@ -1298,7 +1301,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                 task.syncThreadPriority();
             }
 
-            images.add(mWidgetPreviewLoader.getPreview(items.get(i)));
+            images.add(getWidgetPreviewLoader().getPreview(items.get(i)));
         }
     }
 

From 72960975d8367e7ce789d8a5b6f0763fb0ec78bf Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 15 Jan 2014 18:13:55 -0800
Subject: [PATCH 127/147] Migration update: ensuring all folders go first

-> Also, leave the last row empty on every screen
-> Fix bug where shortcuts weren't getting moved (introduced in
   previous CL)
-> Only dedupe items directly on the workspace

Bug 12416411
Bug 12572727

Change-Id: Id95cc6081c57cc289c2a85b2a6872ee0bf3eb98a
---
 .../android/launcher3/LauncherProvider.java   | 77 ++++++++++++-------
 1 file changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index d4ce322c8e..c797cc4121 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1474,7 +1474,6 @@ public class LauncherProvider extends ContentProvider {
                 // Ignore
             }
 
-
             // We already have a favorites database in the old provider
             if (c != null) {
                 try {
@@ -1520,7 +1519,8 @@ public class LauncherProvider extends ContentProvider {
 
                         final HashSet<String> seenIntents = new HashSet<String>(c.getCount());
 
-                        final ContentValues[] rows = new ContentValues[c.getCount()];
+                        final ArrayList<ContentValues> shortcuts = new ArrayList<ContentValues>();
+                        final ArrayList<ContentValues> folders = new ArrayList<ContentValues>();
 
                         while (c.moveToNext()) {
                             final int itemType = c.getInt(itemTypeIndex);
@@ -1552,17 +1552,20 @@ public class LauncherProvider extends ContentProvider {
                                 }
 
                                 cn = intent.getComponent();
-
                                 if (TextUtils.isEmpty(intentStr)) {
                                     // no intent? no icon
                                     Launcher.addDumpLog(TAG, "skipping empty intent", true);
                                     continue;
-                                } else if (!LauncherModel.isValidPackageComponent(pm, cn)) {
+                                } else if (cn != null &&
+                                        !LauncherModel.isValidPackageComponent(pm, cn)) {
                                     // component no longer exists.
-                                    Launcher.addDumpLog(TAG, "skipping item whose component" +
+                                    Launcher.addDumpLog(TAG, "skipping item whose component " +
                                             "no longer exists.", true);
                                     continue;
-                                } else {
+                                } else if (container ==
+                                        LauncherSettings.Favorites.CONTAINER_DESKTOP) {
+                                    // Dedupe icons directly on the workspace
+
                                     // Canonicalize
                                     // the Play Store sets the package parameter, but Launcher
                                     // does not, so we clear that out to keep them the same
@@ -1595,7 +1598,8 @@ public class LauncherProvider extends ContentProvider {
                                     c.getInt(displayModeIndex));
 
                             if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
-                                    && screen >= hotseatWidth) {
+                                    && (screen >= hotseatWidth ||
+                                        screen == grid.hotseatAllAppsRank)) {
                                 // no room for you in the hotseat? it's off to the desktop with you
                                 container = Favorites.CONTAINER_DESKTOP;
                             }
@@ -1606,32 +1610,53 @@ public class LauncherProvider extends ContentProvider {
                                 values.put(LauncherSettings.Favorites.CELLX, cellX);
                                 values.put(LauncherSettings.Favorites.CELLY, cellY);
                             } else {
-                                values.put(LauncherSettings.Favorites.SCREEN, curScreen);
-                                values.put(LauncherSettings.Favorites.CELLX, curX);
-                                values.put(LauncherSettings.Favorites.CELLY, curY);
-                                curX = (curX + 1) % width;
-                                if (curX == 0) {
-                                    curY = (curY + 1);
-                                }
-                                // Leave the last row of icons blank on screen 0
-                                if (curScreen == 0 && curY == height - 1 || curY == height) {
-                                    curScreen = (int) generateNewScreenId();
-                                    curY = 0;
-                                }
+                                // For items contained directly on one of the workspace screen,
+                                // we'll determine their location (screen, x, y) in a second pass.
                             }
 
                             values.put(LauncherSettings.Favorites.CONTAINER, container);
 
-                            rows[i++] = values;
+                            if (itemType != Favorites.ITEM_TYPE_FOLDER) {
+                                shortcuts.add(values);
+                            } else {
+                                folders.add(values);
+                            }
                         }
 
-                        if (i > 0) {
+                        final ArrayList<ContentValues> allItems = new ArrayList<ContentValues>();
+                        // Folders first
+                        allItems.addAll(folders);
+                        // Then shortcuts
+                        allItems.addAll(shortcuts);
+
+                        // Layout all the folders
+                        for (ContentValues values: allItems) {
+                            if (values.getAsInteger(LauncherSettings.Favorites.CONTAINER) !=
+                                    LauncherSettings.Favorites.CONTAINER_DESKTOP) {
+                                // Hotseat items and folder items have already had their
+                                // location information set. Nothing to be done here.
+                                continue;
+                            }
+                            values.put(LauncherSettings.Favorites.SCREEN, curScreen);
+                            values.put(LauncherSettings.Favorites.CELLX, curX);
+                            values.put(LauncherSettings.Favorites.CELLY, curY);
+                            curX = (curX + 1) % width;
+                            if (curX == 0) {
+                                curY = (curY + 1);
+                            }
+                            // Leave the last row of icons blank on every screen
+                            if (curY == height - 1) {
+                                curScreen = (int) generateNewScreenId();
+                                curY = 0;
+                            }
+                        }
+
+                        if (allItems.size() > 0) {
                             db.beginTransaction();
                             try {
-                                final int N = rows.length;
-                                for (i = 0; i < N; i++) {
-                                    if (rows[i] == null) continue;
-                                    if (dbInsertAndCheck(this, db, TABLE_FAVORITES, null, rows[i])
+                                for (ContentValues row: allItems) {
+                                    if (row == null) continue;
+                                    if (dbInsertAndCheck(this, db, TABLE_FAVORITES, null, row)
                                             < 0) {
                                         return;
                                     } else {
@@ -1724,4 +1749,4 @@ public class LauncherProvider extends ContentProvider {
             }
         }
     }
-}
\ No newline at end of file
+}

From 205cd7727f3bd8b65892c580e6f243464878fe6e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 15 Jan 2014 14:31:59 -0800
Subject: [PATCH 128/147] Updating Tablet clings. (Bug 11973614)

Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
---
 res/layout-land/folder_cling.xml              |   5 +-
 res/layout-land/launcher.xml                  |  11 +-
 res/layout-land/migration_workspace_cling.xml |  31 +++---
 res/layout-land/workspace_cling.xml           |  63 ++++++++---
 res/layout-port/folder_cling.xml              |   3 +-
 res/layout-port/migration_workspace_cling.xml |   2 +-
 res/layout-port/workspace_cling.xml           |   1 +
 res/layout-sw600dp-port/first_run_cling.xml   | 100 ++++++++++++++++++
 res/layout-sw600dp-port/folder_cling.xml      |  51 ---------
 .../migration_workspace_cling.xml             |  70 ++++++++++++
 res/layout-sw600dp/first_run_cling.xml        | 100 ++++++++++++++++++
 res/layout-sw600dp/folder_cling.xml           |  66 ++++++++++++
 res/layout-sw600dp/migration_cling.xml        |  98 +++++++++++++++++
 res/layout-sw600dp/workspace_cling.xml        |  65 ++++++++++++
 res/layout-sw720dp-port/folder_cling.xml      |  46 --------
 res/layout-sw720dp/first_run_cling.xml        |  98 +++++++++++++++++
 res/layout-sw720dp/launcher.xml               |  16 ++-
 .../migration_workspace_cling.xml             |  70 ++++++++++++
 res/values-sw600dp/styles.xml                 |  29 -----
 res/values-sw720dp/styles.xml                 |  32 ------
 src/com/android/launcher3/Cling.java          |  95 ++++++++++++++---
 src/com/android/launcher3/DeviceProfile.java  |  19 +++-
 src/com/android/launcher3/Launcher.java       |  16 +--
 src/com/android/launcher3/LauncherClings.java |  34 +++---
 24 files changed, 888 insertions(+), 233 deletions(-)
 create mode 100644 res/layout-sw600dp-port/first_run_cling.xml
 delete mode 100644 res/layout-sw600dp-port/folder_cling.xml
 create mode 100644 res/layout-sw600dp-port/migration_workspace_cling.xml
 create mode 100644 res/layout-sw600dp/first_run_cling.xml
 create mode 100644 res/layout-sw600dp/folder_cling.xml
 create mode 100644 res/layout-sw600dp/migration_cling.xml
 create mode 100644 res/layout-sw600dp/workspace_cling.xml
 delete mode 100644 res/layout-sw720dp-port/folder_cling.xml
 create mode 100644 res/layout-sw720dp/first_run_cling.xml
 create mode 100644 res/layout-sw720dp/migration_workspace_cling.xml

diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml
index 86286d71ba..5dd372973a 100644
--- a/res/layout-land/folder_cling.xml
+++ b/res/layout-land/folder_cling.xml
@@ -16,7 +16,7 @@
 <com.android.launcher3.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    launcher:drawIdentifier="folder_portrait">
+    launcher:drawIdentifier="folder_landscape">
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -25,6 +25,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp">
         <LinearLayout
+            android:id="@+id/folder_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -59,6 +60,6 @@
         android:id="@+id/cling_dismiss"
         android:layout_marginBottom="15dp"
         android:layout_marginEnd="20dp"
-        android:layout_gravity="bottom|end"
+        android:layout_gravity="bottom|right"
         android:onClick="dismissFolderCling" />
 </com.android.launcher3.Cling>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 2880c18bfb..7791609252 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -65,12 +65,21 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
+        <include layout="@layout/migration_cling"
+            android:id="@+id/migration_cling"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+        <include layout="@layout/migration_workspace_cling"
+            android:id="@+id/migration_workspace_cling"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
         <include layout="@layout/workspace_cling"
             android:id="@+id/workspace_cling"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
-
         <include layout="@layout/folder_cling"
             android:id="@+id/folder_cling"
             android:layout_width="match_parent"
diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml
index bf7075b3da..2d71940757 100644
--- a/res/layout-land/migration_workspace_cling.xml
+++ b/res/layout-land/migration_workspace_cling.xml
@@ -19,25 +19,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:drawIdentifier="migration_workspace_landscape">
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_width="400dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|center_vertical"
+        android:paddingEnd="60dp"
+        android:orientation="vertical">
         <LinearLayout
             android:id="@+id/migration_workspace_cling_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="25dp"
-            android:layout_marginEnd="25dp"
-            android:orientation="vertical">
+            android:orientation="horizontal">
             <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="4dp"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"
                 android:paddingTop="20dp"
                 android:paddingBottom="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:background="@drawable/cling">
                 <TextView
@@ -54,17 +55,15 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/cling_arrow_down" />
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/cling_arrow_end" />
         </LinearLayout>
-
         <Button
             style="@style/ClingButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="15dp"
-            android:layout_marginRight="20dp"
-            android:layout_gravity="bottom|right"
+            android:layout_marginTop="5dp"
+            android:layout_gravity="right"
             android:onClick="dismissMigrationWorkspaceCling" />
-    </FrameLayout>
+    </LinearLayout>
 </com.android.launcher3.Cling>
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml
index db33db06f3..d3b07d74d6 100644
--- a/res/layout-land/workspace_cling.xml
+++ b/res/layout-land/workspace_cling.xml
@@ -18,24 +18,20 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    launcher:drawIdentifier="workspace_portrait">
+    launcher:drawIdentifier="workspace_landscape">
     <FrameLayout
         android:id="@+id/content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginTop="310dp">
+        android:layout_height="match_parent">
         <LinearLayout
+            android:id="@+id/workspace_cling_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginTop="30dp"
             android:orientation="vertical">
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/cling_arrow_up" />
             <LinearLayout
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"
@@ -56,14 +52,57 @@
                     android:layout_height="wrap_content"
                     android:text="@string/workspace_cling_move_item" />
             </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_down" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/focused_hotseat_app_bubble"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|left"
+            android:layout_marginLeft="25dp"
+            android:layout_marginBottom="90dp"
+            android:orientation="vertical"
+            android:visibility="gone">
+            <LinearLayout
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:layout_width="240dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    android:id="@+id/focused_hotseat_app_title"
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                <TextView
+                    android:id="@+id/focused_hotseat_app_description"
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginLeft="78dp"
+                android:src="@drawable/cling_arrow_down" />
         </LinearLayout>
     </FrameLayout>
+
     <Button
         style="@style/ClingButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
-        android:layout_marginEnd="20dp"
-        android:layout_gravity="bottom|end"
+        android:layout_marginRight="20dp"
+        android:layout_gravity="bottom|right"
         android:onClick="dismissWorkspaceCling" />
 </com.android.launcher3.Cling>
diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml
index 86286d71ba..1a1b11fce0 100644
--- a/res/layout-port/folder_cling.xml
+++ b/res/layout-port/folder_cling.xml
@@ -25,6 +25,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp">
         <LinearLayout
+            android:id="@+id/folder_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -59,6 +60,6 @@
         android:id="@+id/cling_dismiss"
         android:layout_marginBottom="15dp"
         android:layout_marginEnd="20dp"
-        android:layout_gravity="bottom|end"
+        android:layout_gravity="bottom|right"
         android:onClick="dismissFolderCling" />
 </com.android.launcher3.Cling>
diff --git a/res/layout-port/migration_workspace_cling.xml b/res/layout-port/migration_workspace_cling.xml
index bc5e22ff12..576bb41f24 100644
--- a/res/layout-port/migration_workspace_cling.xml
+++ b/res/layout-port/migration_workspace_cling.xml
@@ -63,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="15dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_gravity="bottom|right"
             android:onClick="dismissMigrationWorkspaceCling" />
     </FrameLayout>
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index b926ca9675..6245686684 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -24,6 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <LinearLayout
+            android:id="@+id/workspace_cling_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
diff --git a/res/layout-sw600dp-port/first_run_cling.xml b/res/layout-sw600dp-port/first_run_cling.xml
new file mode 100644
index 0000000000..d80c084aba
--- /dev/null
+++ b/res/layout-sw600dp-port/first_run_cling.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="first_run_portrait">
+    <FrameLayout 
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/bubble_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
+            android:orientation="vertical">
+            <TextView
+                style="@style/ClingAltTitleText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="10dp"
+                android:text="@string/first_run_cling_title"
+                android:textColor="#FFFFFFFF"
+                android:gravity="center" />
+            <TextView
+                style="@style/ClingAltText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/first_run_cling_description"
+                android:textColor="#80000000"
+                android:gravity="center" />
+        </LinearLayout>
+        <TextView
+            style="@style/ClingHintText"
+            android:id="@+id/search_bar_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="30dp"
+            android:layout_marginTop="80dp"
+            android:gravity="center_horizontal"
+            android:maxWidth="160dp"
+            android:visibility="gone"
+            android:drawableTop="@drawable/cling_arrow_up"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_search_bar_hint" />
+        <TextView
+            style="@style/ClingHintText"
+            android:id="@+id/custom_content_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|start"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="120dp"
+            android:gravity="start"
+            android:maxWidth="160dp"
+            android:visibility="gone"
+            android:drawableStart="@drawable/cling_arrow_start"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_custom_content_hint" />
+        <TextView
+            style="@style/ClingHintText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="120dp"
+            android:maxWidth="180dp"
+            android:drawableEnd="@drawable/cling_arrow_end"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_create_screens_hint" />
+    </FrameLayout>
+    <Button
+        style="@style/ClingButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_gravity="bottom|end"
+        android:onClick="dismissFirstRunCling" />
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
deleted file mode 100644
index 87086cb62d..0000000000
--- a/res/layout-sw600dp-port/folder_cling.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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
-
-          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
-     limitations under the License.
--->
-<com.android.launcher3.Cling
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    launcher:drawIdentifier="folder_portrait">
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginTop="@dimen/folderClingMarginTop">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <TextView
-                style="@style/ClingTitleText"
-                android:id="@+id/folder_cling_title"
-                android:text="@string/folder_cling_title" />
-            <TextView
-                style="@style/ClingText"
-                android:id="@+id/folder_cling_create_folder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/folder_cling_create_folder" />
-        </LinearLayout>
-    </FrameLayout>
-    <Button
-        style="@style/ClingButton"
-        android:id="@+id/cling_dismiss"
-        android:minWidth="168dp"
-        android:textSize="24sp"
-        android:layout_marginBottom="27dp"
-        android:layout_marginEnd="36dp"
-        android:layout_gravity="bottom|end"
-        android:onClick="dismissFolderCling" />
-</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp-port/migration_workspace_cling.xml b/res/layout-sw600dp-port/migration_workspace_cling.xml
new file mode 100644
index 0000000000..eb13137a13
--- /dev/null
+++ b/res/layout-sw600dp-port/migration_workspace_cling.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_workspace_large_portrait">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="480dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="bottom|center_horizontal">
+        <LinearLayout
+            android:id="@+id/migration_workspace_cling_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="4dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_move_item" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_down" />
+            <Button
+                style="@style/ClingButton"
+                android:id="@+id/dismiss_migration_workspace_cling_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:onClick="dismissMigrationWorkspaceCling" />
+        </LinearLayout>
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp/first_run_cling.xml b/res/layout-sw600dp/first_run_cling.xml
new file mode 100644
index 0000000000..295765b6e5
--- /dev/null
+++ b/res/layout-sw600dp/first_run_cling.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="first_run_landscape">
+    <FrameLayout 
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/bubble_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
+            android:orientation="vertical">
+            <TextView
+                style="@style/ClingAltTitleText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="10dp"
+                android:text="@string/first_run_cling_title"
+                android:textColor="#FFFFFFFF"
+                android:gravity="center" />
+            <TextView
+                style="@style/ClingAltText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/first_run_cling_description"
+                android:textColor="#80000000"
+                android:gravity="center" />
+        </LinearLayout>
+        <TextView
+            style="@style/ClingHintText"
+            android:id="@+id/search_bar_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|start"
+            android:layout_marginStart="60dp"
+            android:layout_marginTop="105dp"
+            android:gravity="start"
+            android:maxWidth="160dp"
+            android:visibility="gone"
+            android:drawableStart="@drawable/cling_arrow_start"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_search_bar_hint" />
+        <TextView
+            style="@style/ClingHintText"
+            android:id="@+id/custom_content_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|start"
+            android:layout_marginStart="60dp"
+            android:layout_marginTop="200dp"
+            android:gravity="start"
+            android:maxWidth="160dp"
+            android:visibility="gone"
+            android:drawableStart="@drawable/cling_arrow_start"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_custom_content_hint" />
+        <TextView
+            style="@style/ClingHintText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="120dp"
+            android:maxWidth="180dp"
+            android:drawableEnd="@drawable/cling_arrow_end"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_create_screens_hint" />
+    </FrameLayout>
+    <Button
+        style="@style/ClingButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_gravity="bottom|end"
+        android:onClick="dismissFirstRunCling" />
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp/folder_cling.xml b/res/layout-sw600dp/folder_cling.xml
new file mode 100644
index 0000000000..f21aef4e49
--- /dev/null
+++ b/res/layout-sw600dp/folder_cling.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    launcher:drawIdentifier="folder_large">
+    <LinearLayout
+        android:id="@+id/folder_bubble"
+        android:layout_width="300dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="left|top"
+        android:paddingTop="28dp"
+        android:paddingRight="10dp"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/cling_arrow_start" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="4dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:id="@+id/folder_cling_title"
+                    android:text="@string/folder_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:id="@+id/folder_cling_create_folder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/folder_cling_create_folder" />
+            </LinearLayout>
+        </LinearLayout>
+        <Button
+            style="@style/ClingButton"
+            android:id="@+id/cling_dismiss"
+            android:layout_marginTop="5dp"
+            android:layout_gravity="right"
+            android:onClick="dismissFolderCling" />
+    </LinearLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp/migration_cling.xml b/res/layout-sw600dp/migration_cling.xml
new file mode 100644
index 0000000000..19def6a565
--- /dev/null
+++ b/res/layout-sw600dp/migration_cling.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_portrait">
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="360dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_marginBottom="15dp"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/first_run_cling_title"
+                android:textSize="42dp"
+                android:textColor="#FFffffff" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="0dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/on_boarding_welcome" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_up" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/migration_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/migration_cling_description" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migration_cling_copy_apps"
+                android:onClick="dismissMigrationClingCopyApps" />
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migration_cling_use_default"
+                android:onClick="dismissMigrationClingUseDefault" />
+        </LinearLayout>
+    </LinearLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp/workspace_cling.xml b/res/layout-sw600dp/workspace_cling.xml
new file mode 100644
index 0000000000..63b5522ca6
--- /dev/null
+++ b/res/layout-sw600dp/workspace_cling.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="workspace_large">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/workspace_cling_bubble"
+            android:layout_width="400dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_move_item" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_down" />
+            <Button
+                style="@style/ClingButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:onClick="dismissWorkspaceCling" />
+        </LinearLayout>
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp-port/folder_cling.xml b/res/layout-sw720dp-port/folder_cling.xml
deleted file mode 100644
index 40d4e20a5d..0000000000
--- a/res/layout-sw720dp-port/folder_cling.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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
-
-          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
-     limitations under the License.
--->
-<com.android.launcher3.Cling
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    launcher:drawIdentifier="folder_large">
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/cling_text_block_offset_x"
-        android:layout_marginTop="@dimen/cling_text_block_offset_y">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <TextView
-                style="@style/ClingTitleText"
-                android:id="@+id/folder_cling_title"
-                android:text="@string/folder_cling_title" />
-            <TextView
-                style="@style/ClingText"
-                android:id="@+id/folder_cling_create_folder"
-                android:layout_width="480dp"
-                android:layout_height="wrap_content"
-                android:text="@string/folder_cling_create_folder" />
-            <Button
-                style="@style/ClingButton"
-                android:id="@+id/cling_dismiss"
-                android:layout_marginTop="15dp"
-                android:onClick="dismissFolderCling" />
-        </LinearLayout>
-    </FrameLayout>
-</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/first_run_cling.xml b/res/layout-sw720dp/first_run_cling.xml
new file mode 100644
index 0000000000..c43d8d32ea
--- /dev/null
+++ b/res/layout-sw720dp/first_run_cling.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="first_run_portrait">
+    <FrameLayout 
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/bubble_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
+            android:orientation="vertical">
+            <TextView
+                style="@style/ClingAltTitleText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="10dp"
+                android:text="@string/first_run_cling_title"
+                android:textColor="#FFFFFFFF"
+                android:gravity="center" />
+            <TextView
+                style="@style/ClingAltText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/first_run_cling_description"
+                android:textColor="#80000000"
+                android:gravity="center" />
+        </LinearLayout>
+        <TextView
+            style="@style/ClingHintText"
+            android:id="@+id/search_bar_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="120dp"
+            android:layout_marginTop="80dp"
+            android:gravity="center_horizontal"
+            android:maxWidth="160dp"
+            android:visibility="gone"
+            android:drawableTop="@drawable/cling_arrow_up"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_search_bar_hint" />
+        <TextView
+            style="@style/ClingHintText"
+            android:id="@+id/custom_content_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|start"
+            android:layout_marginStart="30dp"
+            android:gravity="start"
+            android:maxWidth="160dp"
+            android:visibility="gone"
+            android:drawableStart="@drawable/cling_arrow_start"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_custom_content_hint" />
+        <TextView
+            style="@style/ClingHintText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginEnd="30dp"
+            android:maxWidth="180dp"
+            android:drawableEnd="@drawable/cling_arrow_end"
+            android:drawablePadding="10dp"
+            android:text="@string/first_run_cling_create_screens_hint" />
+    </FrameLayout>
+    <Button
+        style="@style/ClingButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginEnd="40dp"
+        android:layout_gravity="bottom|end"
+        android:onClick="dismissFirstRunCling" />
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 64b0fa0d64..685d03c6f9 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -64,17 +64,31 @@
         <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure
              that it is still visible during the transition to AllApps and doesn't overlay on
              top of that view. -->
+        <com.android.launcher3.ScrimView
+            android:id="@+id/cling_scrim"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
         <include layout="@layout/first_run_cling"
             android:id="@+id/first_run_cling"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
+        <include layout="@layout/migration_cling"
+            android:id="@+id/migration_cling"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+        <include layout="@layout/migration_workspace_cling"
+            android:id="@+id/migration_workspace_cling"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
         <include layout="@layout/workspace_cling"
             android:id="@+id/workspace_cling"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
-
         <include layout="@layout/folder_cling"
             android:id="@+id/folder_cling"
             android:layout_width="match_parent"
diff --git a/res/layout-sw720dp/migration_workspace_cling.xml b/res/layout-sw720dp/migration_workspace_cling.xml
new file mode 100644
index 0000000000..eb13137a13
--- /dev/null
+++ b/res/layout-sw720dp/migration_workspace_cling.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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
+
+          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
+     limitations under the License.
+-->
+<com.android.launcher3.Cling
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    launcher:drawIdentifier="migration_workspace_large_portrait">
+    <FrameLayout
+        android:id="@+id/content"
+        android:layout_width="480dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="bottom|center_horizontal">
+        <LinearLayout
+            android:id="@+id/migration_workspace_cling_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="4dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:orientation="vertical"
+                android:background="@drawable/cling">
+                <TextView
+                    style="@style/ClingTitleText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_title" />
+                <TextView
+                    style="@style/ClingText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/workspace_cling_move_item" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/cling_arrow_down" />
+            <Button
+                style="@style/ClingButton"
+                android:id="@+id/dismiss_migration_workspace_cling_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:onClick="dismissMigrationWorkspaceCling" />
+        </LinearLayout>
+    </FrameLayout>
+</com.android.launcher3.Cling>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 200c0a0bde..bcbbafdbbb 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -18,33 +18,4 @@
 -->
 
 <resources>
-    <style name="ClingButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">15dp</item>
-        <item name="android:paddingLeft">35dp</item>
-        <item name="android:paddingRight">35dp</item>
-        <item name="android:text">@string/cling_dismiss</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:background">@drawable/cling_button_bg</item>
-    </style>
-    <style name="ClingTitleText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">5dp</item>
-        <item name="android:textSize">30sp</item>
-        <item name="android:textColor">#33B5E5</item>
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDy">2</item>
-        <item name="android:shadowRadius">2.0</item>
-    </style>
-    <style name="ClingText">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">#FFFFFF</item>
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDy">2</item>
-        <item name="android:shadowRadius">2.0</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
 </resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 507af1d16e..71f0304009 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -18,38 +18,6 @@
 -->
 
 <resources>
-<!-- Clings -->
-    <style name="ClingButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">15dp</item>
-        <item name="android:paddingLeft">35dp</item>
-        <item name="android:paddingRight">35dp</item>
-        <item name="android:text">@string/cling_dismiss</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:background">@drawable/cling_button_bg</item>
-    </style>
-    <style name="ClingTitleText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">5dp</item>
-        <item name="android:textSize">32sp</item>
-        <item name="android:textColor">#49C0EC</item>
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDy">2</item>
-        <item name="android:shadowRadius">2.0</item>
-    </style>
-    <style name="ClingText">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">#FFFFFF</item>
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDy">2</item>
-        <item name="android:shadowRadius">2.0</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
 <!-- Workspace -->
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingLeft">32dp</item>
diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java
index 185b49b088..a6139ccbc5 100644
--- a/src/com/android/launcher3/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -30,6 +30,7 @@ import android.util.DisplayMetrics;
 import android.view.FocusFinder;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.FrameLayout;
 import android.widget.TextView;
@@ -49,6 +50,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
     private static String MIGRATION_LANDSCAPE = "migration_landscape";
 
     private static String MIGRATION_WORKSPACE_PORTRAIT = "migration_workspace_portrait";
+    private static String MIGRATION_WORKSPACE_LARGE_PORTRAIT = "migration_workspace_large_portrait";
     private static String MIGRATION_WORKSPACE_LANDSCAPE = "migration_workspace_landscape";
 
     private static String FOLDER_PORTRAIT = "folder_portrait";
@@ -56,6 +58,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
     private static String FOLDER_LARGE = "folder_large";
 
     private static float FIRST_RUN_CIRCLE_BUFFER_DPS = 60;
+    private static float FIRST_RUN_MAX_CIRCLE_RADIUS_DPS = 180;
     private static float WORKSPACE_INNER_CIRCLE_RADIUS_DPS = 50;
     private static float WORKSPACE_OUTER_CIRCLE_RADIUS_DPS = 60;
     private static float WORKSPACE_CIRCLE_Y_OFFSET_DPS = 30;
@@ -106,7 +109,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         if (!mIsInitialized) {
             mLauncher = l;
             mScrimView = scrim;
-            mBackgroundColor = 0xdd000000;
+            mBackgroundColor = 0xcc000000;
             setOnLongClickListener(this);
             setOnClickListener(this);
             setOnTouchListener(this);
@@ -141,7 +144,9 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         Resources r = getResources();
         int appIconId = drawableId;
         Hotseat hotseat = mLauncher.getHotseat();
-        if (hotseat != null && appIconId > -1 && appRank > -1 && !title.isEmpty() &&
+        // Skip the focused app in the large layouts
+        if (!mDrawIdentifier.equals(WORKSPACE_LARGE) &&
+                hotseat != null && appIconId > -1 && appRank > -1 && !title.isEmpty() &&
                 !description.isEmpty()) {
             // Set the app bounds
             int x = hotseat.getCellXFromOrder(appRank);
@@ -175,6 +180,18 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         }
     }
 
+    void setOpenFolderRect(Rect r) {
+        if (mDrawIdentifier.equals(FOLDER_LANDSCAPE) ||
+            mDrawIdentifier.equals(FOLDER_LARGE)) {
+            ViewGroup vg = (ViewGroup) findViewById(R.id.folder_bubble);
+            ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) vg.getLayoutParams();
+            lp.topMargin = r.top - mInsets.bottom;
+            lp.leftMargin = r.right;
+            vg.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
+            vg.requestLayout();
+        }
+    }
+
     void updateMigrationWorkspaceBubblePosition() {
         DisplayMetrics metrics = new DisplayMetrics();
         mLauncher.getWindowManager().getDefaultDisplay().getMetrics(metrics);
@@ -184,10 +201,59 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
         DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
         Rect pageIndicatorBounds = grid.getWorkspacePageIndicatorBounds(mInsets);
 
-        View bubble = findViewById(R.id.migration_workspace_cling_bubble);
-        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) bubble.getLayoutParams();
-        lp.bottomMargin = grid.heightPx - pageIndicatorBounds.top;
-        bubble.requestLayout();
+        if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT)) {
+            View bubble = findViewById(R.id.migration_workspace_cling_bubble);
+            ViewGroup.MarginLayoutParams lp =
+                    (ViewGroup.MarginLayoutParams) bubble.getLayoutParams();
+            lp.bottomMargin = grid.heightPx - pageIndicatorBounds.top;
+            bubble.requestLayout();
+        } else if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_LARGE_PORTRAIT)) {
+            View bubble = findViewById(R.id.content);
+            ViewGroup.MarginLayoutParams lp =
+                    (ViewGroup.MarginLayoutParams) bubble.getLayoutParams();
+            lp.bottomMargin = grid.heightPx - pageIndicatorBounds.top;
+            bubble.requestLayout();
+        } else if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
+            View bubble = findViewById(R.id.content);
+            ViewGroup.MarginLayoutParams lp =
+                    (ViewGroup.MarginLayoutParams) bubble.getLayoutParams();
+            if (grid.isLayoutRtl) {
+                lp.leftMargin = pageIndicatorBounds.right;
+            } else {
+                lp.rightMargin = (grid.widthPx - pageIndicatorBounds.left);
+            }
+            bubble.requestLayout();
+        }
+    }
+
+    void updateWorkspaceBubblePosition() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        mLauncher.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        // Get the cut-out bounds
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+        Rect cutOutBounds = getWorkspaceCutOutBounds(metrics);
+
+        if (mDrawIdentifier.equals(WORKSPACE_LARGE)) {
+            View bubble = findViewById(R.id.workspace_cling_bubble);
+            ViewGroup.MarginLayoutParams lp =
+                    (ViewGroup.MarginLayoutParams) bubble.getLayoutParams();
+            lp.bottomMargin = grid.heightPx - cutOutBounds.top - mInsets.bottom;
+            bubble.requestLayout();
+        }
+    }
+
+    private Rect getWorkspaceCutOutBounds(DisplayMetrics metrics) {
+        int halfWidth = metrics.widthPixels / 2;
+        int halfHeight = metrics.heightPixels / 2;
+        int yOffset = DynamicGrid.pxFromDp(WORKSPACE_CIRCLE_Y_OFFSET_DPS, metrics);
+        if (mDrawIdentifier.equals(WORKSPACE_LARGE)) {
+            yOffset = 0;
+        }
+        int radius = DynamicGrid.pxFromDp(WORKSPACE_OUTER_CIRCLE_RADIUS_DPS, metrics);
+        return new Rect(halfWidth - radius, halfHeight - yOffset - radius, halfWidth + radius,
+                halfHeight - yOffset + radius);
     }
 
     void show(boolean animate, int duration) {
@@ -198,6 +264,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                 mDrawIdentifier.equals(WORKSPACE_LARGE) ||
                 mDrawIdentifier.equals(WORKSPACE_CUSTOM) ||
                 mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                mDrawIdentifier.equals(MIGRATION_WORKSPACE_LARGE_PORTRAIT) ||
                 mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
             View content = getContent();
             content.setAlpha(0f);
@@ -381,6 +448,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
             mLauncher.getLauncherClings().dismissWorkspaceCling(null);
             return true;
         } else if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                mDrawIdentifier.equals(MIGRATION_WORKSPACE_LARGE_PORTRAIT) ||
                 mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
             mLauncher.getLauncherClings().dismissMigrationWorkspaceCling(null);
             return true;
@@ -417,6 +485,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                     mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
                     mDrawIdentifier.equals(WORKSPACE_LARGE) ||
                     mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                    mDrawIdentifier.equals(MIGRATION_WORKSPACE_LARGE_PORTRAIT) ||
                     mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
                 // Initialize the draw buffer (to allow punching through)
                 eraseBg = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(),
@@ -443,24 +512,23 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                 bubbleContent.getGlobalVisibleRect(bubbleRect);
                 mBubblePaint.setAlpha((int) (255 * alpha));
                 float buffer = DynamicGrid.pxFromDp(FIRST_RUN_CIRCLE_BUFFER_DPS, metrics);
+                float maxRadius = DynamicGrid.pxFromDp(FIRST_RUN_MAX_CIRCLE_RADIUS_DPS, metrics);
+                float radius = Math.min(maxRadius, (bubbleContent.getMeasuredWidth() + buffer) / 2);
                 canvas.drawCircle(metrics.widthPixels / 2,
-                        bubbleRect.centerY(),
-                        (bubbleContent.getMeasuredWidth() + buffer) / 2,
+                        bubbleRect.centerY(), radius,
                         mBubblePaint);
             } else if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT) ||
                     mDrawIdentifier.equals(WORKSPACE_LANDSCAPE) ||
                     mDrawIdentifier.equals(WORKSPACE_LARGE)) {
-                int offset = DynamicGrid.pxFromDp(WORKSPACE_CIRCLE_Y_OFFSET_DPS, metrics);
+                Rect cutOutBounds = getWorkspaceCutOutBounds(metrics);
                 // Draw the outer circle
                 mErasePaint.setAlpha(128);
-                eraseCanvas.drawCircle(metrics.widthPixels / 2,
-                        metrics.heightPixels / 2 - offset,
+                eraseCanvas.drawCircle(cutOutBounds.centerX(), cutOutBounds.centerY(),
                         DynamicGrid.pxFromDp(WORKSPACE_OUTER_CIRCLE_RADIUS_DPS, metrics),
                         mErasePaint);
                 // Draw the inner circle
                 mErasePaint.setAlpha(0);
-                eraseCanvas.drawCircle(metrics.widthPixels / 2,
-                        metrics.heightPixels / 2 - offset,
+                eraseCanvas.drawCircle(cutOutBounds.centerX(), cutOutBounds.centerY(),
                         DynamicGrid.pxFromDp(WORKSPACE_INNER_CIRCLE_RADIUS_DPS, metrics),
                         mErasePaint);
                 canvas.drawBitmap(eraseBg, 0, 0, null);
@@ -476,6 +544,7 @@ public class Cling extends FrameLayout implements Insettable, View.OnClickListen
                     mFocusedHotseatApp.draw(canvas);
                 }
             } else if (mDrawIdentifier.equals(MIGRATION_WORKSPACE_PORTRAIT) ||
+                    mDrawIdentifier.equals(MIGRATION_WORKSPACE_LARGE_PORTRAIT) ||
                     mDrawIdentifier.equals(MIGRATION_WORKSPACE_LANDSCAPE)) {
                 int offset = DynamicGrid.pxFromDp(WORKSPACE_CIRCLE_Y_OFFSET_DPS, metrics);
                 // Draw the outer circle
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 7ce0446766..8bcf6c32e0 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -483,9 +483,22 @@ public class DeviceProfile {
     /** Returns the bounds of the workspace page indicators. */
     Rect getWorkspacePageIndicatorBounds(Rect insets) {
         Rect workspacePadding = getWorkspacePadding();
-        int pageIndicatorTop = heightPx - insets.bottom - workspacePadding.bottom;
-        return new Rect(workspacePadding.left, pageIndicatorTop,
-                widthPx - workspacePadding.right, pageIndicatorTop + pageIndicatorHeightPx);
+        if (isLandscape && transposeLayoutWithOrientation) {
+            if (isLayoutRtl) {
+                return new Rect(workspacePadding.left, workspacePadding.top,
+                        workspacePadding.left + pageIndicatorHeightPx,
+                        heightPx - workspacePadding.bottom - insets.bottom);
+            } else {
+                int pageIndicatorLeft = widthPx - workspacePadding.right;
+                return new Rect(pageIndicatorLeft, workspacePadding.top,
+                        pageIndicatorLeft + pageIndicatorHeightPx,
+                        heightPx - workspacePadding.bottom - insets.bottom);
+            }
+        } else {
+            int pageIndicatorTop = heightPx - insets.bottom - workspacePadding.bottom;
+            return new Rect(workspacePadding.left, pageIndicatorTop,
+                    widthPx - workspacePadding.right, pageIndicatorTop + pageIndicatorHeightPx);
+        }
     }
 
     /** Returns the workspace padding in the specified orientation */
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c119999e8a..61a594f214 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4367,17 +4367,17 @@ public class Launcher extends Activity
     }
 
     void showWorkspaceSearchAndHotseat() {
-        mWorkspace.setAlpha(1f);
-        mHotseat.setAlpha(1f);
-        mPageIndicators.setAlpha(1f);
-        mSearchDropTargetBar.showSearchBar(false);
+        if (mWorkspace != null) mWorkspace.setAlpha(1f);
+        if (mHotseat != null) mHotseat.setAlpha(1f);
+        if (mPageIndicators != null) mPageIndicators.setAlpha(1f);
+        if (mSearchDropTargetBar != null) mSearchDropTargetBar.showSearchBar(false);
     }
 
     void hideWorkspaceSearchAndHotseat() {
-        mWorkspace.setAlpha(0f);
-        mHotseat.setAlpha(0f);
-        mPageIndicators.setAlpha(0f);
-        mSearchDropTargetBar.hideSearchBar(false);
+        if (mWorkspace != null) mWorkspace.setAlpha(0f);
+        if (mHotseat != null) mHotseat.setAlpha(0f);
+        if (mPageIndicators != null) mPageIndicators.setAlpha(0f);
+        if (mSearchDropTargetBar != null) mSearchDropTargetBar.hideSearchBar(false);
     }
 
 
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 42a134fdbb..94b062ddc4 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -23,6 +23,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.view.LayoutInflater;
@@ -34,7 +35,8 @@ import android.widget.TextView;
 class LauncherClings {
     private static final String FIRST_RUN_CLING_DISMISSED_KEY = "cling_gel.first_run.dismissed";
     private static final String MIGRATION_CLING_DISMISSED_KEY = "cling_gel.migration.dismissed";
-    private static final String MIGRATION_WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.migration.dismissed";
+    private static final String MIGRATION_WORKSPACE_CLING_DISMISSED_KEY =
+            "cling_gel.migration_workspace.dismissed";
     private static final String WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.workspace.dismissed";
     private static final String FOLDER_CLING_DISMISSED_KEY = "cling_gel.folder.dismissed";
 
@@ -61,7 +63,7 @@ class LauncherClings {
         Cling cling = (Cling) mLauncher.findViewById(clingId);
         View scrim = null;
         if (scrimId > 0) {
-            scrim = mLauncher.findViewById(R.id.cling_scrim);
+            scrim = mLauncher.findViewById(scrimId);
         }
         if (cling != null) {
             cling.init(mLauncher, scrim);
@@ -76,21 +78,11 @@ class LauncherClings {
     }
 
     /** Returns whether the clings are enabled or should be shown */
-    private boolean isClingsEnabled() {
+    private boolean areClingsEnabled() {
         if (DISABLE_CLINGS) {
             return false;
         }
 
-        // For now, limit only to phones
-        LauncherAppState app = LauncherAppState.getInstance();
-        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
-        if (grid.isTablet()) {
-            return false;
-        }
-        if (grid.isLandscape) {
-            return false;
-        }
-
         // disable clings when running in a test harness
         if(ActivityManager.isRunningInTestHarness()) return false;
 
@@ -202,7 +194,7 @@ class LauncherClings {
 
     public boolean shouldShowFirstRunOrMigrationClings() {
         SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
-        return isClingsEnabled() &&
+        return areClingsEnabled() &&
             !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) &&
             !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false);
     }
@@ -271,7 +263,7 @@ class LauncherClings {
 
     public void showMigrationWorkspaceCling() {
         // Enable the clings only if they have not been dismissed before
-        if (isClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
+        if (areClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
                 MIGRATION_WORKSPACE_CLING_DISMISSED_KEY, false)) {
             Cling c = initCling(R.id.migration_workspace_cling, 0, false, true);
             c.updateMigrationWorkspaceBubblePosition();
@@ -284,9 +276,10 @@ class LauncherClings {
 
     public void showWorkspaceCling() {
         // Enable the clings only if they have not been dismissed before
-        if (isClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
+        if (areClingsEnabled() && !mLauncher.getSharedPrefs().getBoolean(
                 WORKSPACE_CLING_DISMISSED_KEY, false)) {
             Cling c = initCling(R.id.workspace_cling, 0, false, true);
+            c.updateWorkspaceBubblePosition();
 
             // Set the focused hotseat app if there is one
             c.setFocusedHotseatApp(mLauncher.getFirstRunFocusedHotseatAppDrawableId(),
@@ -301,11 +294,18 @@ class LauncherClings {
     public Cling showFoldersCling() {
         SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
         // Enable the clings only if they have not been dismissed before
-        if (isClingsEnabled() &&
+        if (areClingsEnabled() &&
                 !sharedPrefs.getBoolean(FOLDER_CLING_DISMISSED_KEY, false) &&
                 !sharedPrefs.getBoolean(Launcher.USER_HAS_MIGRATED, false)) {
             Cling cling = initCling(R.id.folder_cling, R.id.cling_scrim,
                     true, true);
+            Folder openFolder = mLauncher.getWorkspace().getOpenFolder();
+            if (openFolder != null) {
+                Rect openFolderRect = new Rect();
+                openFolder.getHitRect(openFolderRect);
+                cling.setOpenFolderRect(openFolderRect);
+                openFolder.bringToFront();
+            }
             return cling;
         } else {
             removeCling(R.id.folder_cling);

From fd0394cc6d989e826bd2ce986ea6480930c3412c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 16 Jan 2014 14:41:21 -0800
Subject: [PATCH 129/147] Updating screen background assets. (Bug 12136457)

Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
---
 res/drawable-hdpi/screenpanel_hover.9.png   | Bin 1189 -> 1096 bytes
 res/drawable-mdpi/screenpanel_hover.9.png   | Bin 913 -> 975 bytes
 res/drawable-xhdpi/screenpanel_hover.9.png  | Bin 1586 -> 1704 bytes
 res/drawable-xxhdpi/screenpanel_hover.9.png | Bin 4418 -> 2605 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png
index 3321fc92550f863244c34aa96e749191ac5f3bc8..0fed7c9d8dddade348f679e2136bb6ab2ae24629 100644
GIT binary patch
delta 1039
zcmV+q1n~Q%3CIYLNPh$BNkl<Zc%0o_TW%XM4CLAg`at_ppdZa0djF&JAT5vpbrba?
z(ngjjQ4~k!wgVWkH`-ZBqR63kZK7+0_?p7DvxM-Y+i=^yGlyUD52t9!#xyK(Pega|
zoYel5{Xg909|W>bMD$EVf8yWtIwcDe*@$Idi0DE@Px0@Ch<|=Z@+~Jjac39!MnsQ9
z^eYlRMvI;)_DW;f0}=hCw{Z*6stXm}9I@<cY=6l}o^nGpmVJ%{AL+G=_e6Bg4M}fC
z$UYF!dm?(r5tWunu95ugToCPsjEq%|EqhhaIIRe+WeG3bK`mJ~s<?Giyx8oRv9NTr
zYJUjVfRQzOFn{A`O}M)TWCe%``Vg+cUU<ovjR+R5&DCeO*%SeFTCHVVoBfz2YMA0#
zXuRJ6b=n!rV6Fj+XK=DEW@nQ<=ANCJfQD`N5Y)6#8-lv4z_J1$QKM<yVZ>gAnH+GN
z5Tr@MBCM(I>ey@uf|NTs$y({|x&q)b6jldx2@zp?KY!+)>fkwm#cU2>v8)ni7jJPg
zyhMaYTDBMNQKJdhIsh(^VKsWUo!e}tHi2IK%#;J*^(KrAzR-tVLkdA9ag$6dsaT(b
zs%_1fCEseU1cYl$ZAGZore-!-xJfE#A=b@IS~9VXRUVk?fMeF^sz^Jcg1W@B2?ery
z(1q(pd4HGCa(fM;X>VKbkC2JM(@i<1HcP}_)3T(wM!^!gZN_oqWzrg5%&dTBJGbI>
zi9l{zs1+`ucwNB~wjpb?3D>+?`kHBN4qFCIb<fh3B{GZJ?gq!13dJ0P*aTdXjkpHa
z##Es+F)Q|1xL3lE5)mG0yLofAsuTT8TAO0=>VGzyC6T!h>s}bTw{3~EYh~!NTaqJw
zwj>8YA}#lR$1<^}kyIj?Rv=dk-}3lVb<VPVjZr^q_QJK?=^k@`X0NHbXO>eEFy<r-
z?dI|^W63mQCX$)Q%>B;mkZX)A^zOJ?XY)9P*f7~>LTQp8Vk^R|&zc1oN2X1}5PjCf
zOn(xFIxR#}RhC%DmeiX~a`&eq*nOaq3_1ZbwNq2L%<gOK_<!z*`4nPWtx>gKc28Kl
zgIr-r5}qk{stX+Ak$%VobT2&P8t`tiK<ps1<&LX9t3JEcPNh76sUWkTwTM|VX#!Nr
z(NZFY88TQxSt_Y2EDJ#+v)LtE_Bf~ZPJc!D-v0*kP`RU-P4ixm2sft{$(Cu_89!sm
zAS&qJ`1+t`%*@~2f!CYRt%xo(V<!G=#&N$0q#;W`=y97QthEeAmUppy?7AY8TqFGu
zOt%3HZqIF>dqhNF%iJFR$h*n5-9iYoZEwHZ)F2WaHiSTb0fDV(2MjA(m;e9(00>D%
JPDHLkV1m$#_Uixu

delta 1132
zcmV-y1e5#72&D;-NPh%JNkl<Zc%0o_+iuh_5Ixy$#YOOd)Cc$(et?fg;&<Q)q*kKs
zrVq7)lg!2A8P_Qzt#)Hijwkk9<79y~&FRxb(}FV3BFHpNS48urJUAywP5^!a_{Ct|
z0Ju)P7yP?|Qvo=iHz!HbeE{$X;30kI&jOgiChF`BeFAU~;D0WC-vjuYz^4-IQ~~xG
zz%7733Gg;a^q8;6BH0%JztcIV1n`g~TwP|3WH*Wbz5ux^1+hr>F#){C^CeybxGDw7
zKWf0<0eB1G4F$B7Ow#^20h|*^3A6}OGgl=|#b-wrrB%r)S*8osXay6!%DIxU>hdj;
zser9>Mv`YWcYnOY=Bx`CD`ktGu{2yYsw_YoT@BEOPz@5i%bd*`Bj{;Z9d}#JWBD_y
z3!?g$HjmeE`LlU*yrWR1wc4i0V^xhXe-;iVQp=pNZNsAzOID=~Ux1K+Qu4UXsRU8Y
z$!Y<j*I-9v0C&8@R70hf7!al!Rk?<y;V%;ER&A{=D1W5fDM9+C?n5mgJPi%214O`x
zY<p>IO<c&q4-o@MYK;LTc`QIRC(?k6fx=6~a8FBK!Emp^($G2}JV6et(M6tNt62_s
zp?JI1n=h`kp@v?q8k!4|j#psTl#0|jPqODyjdCM~1dC9OrLUXYwyY*e-BK!zIkXTH
zBa>A!wSV869=Pg&(10Qi=*=8OFf9ubrE3i+B;T-rVoF16Mi&7++iM{?ZCI`mHfOB2
z$TTc-)Ocdc>TN`~rU$F`VK?Kbepjv`Qi}z!`Zlb1HTkoAl141BHE|KWhsSM)*d|M%
z#cQjly%g;Wy^c^f<N1LhNvg0c$m|>~s^LoZGJlZ)cneme8dU!R+*LJdlRc7#SHh}l
zlp{-0iPT!5xN}++tduN2%tukFs3B=+=xT0(T((*Eh20GeOZG(2&@{B`mZTH|RFi6r
z0U@4t3+$526gO*Asw%J=rKJW~fz?E8)i%4`*QoJlqP}%2cUUH&kM(Dv`I#me$Foz7
z+<#bOPMOagghMaWWSe0zz%pkln8=8VIUBz7TCEydKoRc;c~`U9pM_?QCa~Io!h#>-
zR)jl0V+$}2%o2pfIU^Y?{g&dD;&Cf&NJ_Pn!~>?PjmMw4S5qX<j+knjVGE!!mwlvk
z5%)C~`hRxBM9{8<m?hWP@pj!4w%kG9QGb^pZ1J@00Ec*_KV$*8;~f~wRP>1!Fzn3*
zZr+vw4wIklj)&Dws(p4-T1_%;09G<-0nC}BcA2C^xoz0v0$o$89d&a-HLEFtb$#jB
zvQx4BJ${3kwa?boR11D`Gz$$=S{1BoPHWXO5-cPOdL6G1S`uXUyF1%Cb6bFzab+Lk
z0YH+5KD8?H4BK8aEkM-?wO|%Q-#&Itg1K%*40{{btQs$NnJQqYp5?!(InDF@9l#HU
y@9Q*8-|##Q<u=@<_?|OZ{`(nj^qN1~nV$g1Q9&Fu3W>e|0000<MNUMnLSTXwj1CC^

diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png
index dd7740665de2e4efe9124a2d77d1ef68b5d1aa3c..7dd885860fdb183424bd781bdd1b63ea16349369 100644
GIT binary patch
delta 916
zcmV;F18e+|2hRtPNq=!kL_t(&fxTM6avLEGeaqTSJWWsSx&6Q%`*r=1_A@+_9300B
z^kCKjBq6~%)r=<&AoP%)B<wZtE)hoA0YHrLCxE{I{@iwm@wapCSGG2+Z`^gB8o699
zGk}M*u}d!ihz<Zk2vdT0d%e88JOKC#;0eGZfEmEFT3VF~Ie#9HPXK-Z_?8rRtI`et
zy!X?7zb}-YpPxSi_?``&0GykaUSD4y6TB}hJkAlzvdjPu06qcOXO6hSTfIUwuRFVX
zaE;UIwOnHL_a<Z)Mu<`io=7W;C9=UT8{{mp)-><2Vufc`QsIdUxN-4JLcrVbripO4
zv@}hVMx$b0^M78qBgD9A+>6}2#nMn}5XIb5s1^nR!8Y%43pOVqYw7MuIOGUo(c*Gq
zZByO5n<K>ktw}fpkM*7eXDD;KEs5j36*k^1rNUS<qK4L0BZycDTgVV$Eph5*1S>6g
z_oY#*Kbcrwz{{?iL#aXLHaE3aa9Jg?YgPjIx;ITzsDCXn_in;+VhIgLd|0EtZ-v!*
z?w#tMa>XVaXmxL>MzHe#FCVQM(M2OQPFgi$;elCTs(V9(_0?R+=4fHbY8+>YC~k5@
z7b7-b2_(W2;<oZBw?34)tWrP~rx>HJVC$JH+{_B4{sz#v@AajIr2$CrSXPLsA&|IG
zD$G|KiGSSV;?&<hG2%TiOt32DW2MVEmaE;Jvs7Jky3X`5#geN=tTn64&0WLPsB7<W
zttQ@-oO4<=D&Dsmz*<<Ej%XDYTiwg3MHEGsr;8(tLgOBL0cm~c>d&VXCsm2_o(xa0
zG+ZO(IHe?&@=1)-ed?ZtMp|l6OO4>lN<u!h;eQE%T$T8H1UH#jt~P2epIEUJ7NEoB
zHTTS!+l&)|ASr0@)JviiCswRwIS?hm(q``2l$fzHPU%cV=6dfpH8s)Ys3%*`0D9V|
zekN$2)H-@@8=iV54xW{;W=rEwP#WH2QD|Q+^ffi_eY@3gHNrX9-vE|n$t}>#RW82#
znSVG-Ap}*4oC%Br3Z=v0K)yh`TrQ}`RvCYS(zrY|^9l8Y_g+=v7$GuNjFaHeHoTTt
zEZLjdvMjYy$?}v2HH~sdQ15X(dwY8W(i43aUI>Bgc0Ql;Uoudo1h1H!=Q%*2*$yZU
qeUsDaRR3n;U9#Iu6c<(N{{cA;Z$5IoSq<<20000<MNUMnLSTZpAG4VN

delta 853
zcmV-b1FHPb2ayMmNq;j*L_t(&fyG%}Zrd;n{^WXVhjmZeo(8OU>Sgx01MNV&Mt~q#
zhQQJuDkqdgQl#u)1cIiLDSjqD{@4L-l3<hx08&anQ%XogVvN7?{`$Gf{HBwBgb;qy
zjmzb70`Lf60TA<Y1dt{Gh%v74uAkHC^a$WHfM)<t03HB@D}THgW2kW-4u@v|F95z|
z#d%elC8gu>_z}Q&vh)YQU)9q2e16LCKC$ppN{!O8EDr!a0C*4J9f${Ka$OOploImE
zg}bTJ>NQT9_2v|d(oCS#n<A}5OCc1#DGm@Fp;^<s=ZB|B@19h6t~hCq5Dyx<rx^f3
z2;8ZO{4Mr-mVbP4>cSJ0YRK2`7EAWjun;!kR@-WL?j&@3Z(o)VaqlkGi1i?aSGc?)
zaiKI`_qfemSY$_V`Bc%UIMfnc5uTK}tm3{Ec8eu;-CJQ3wZtW1pclgEa#5^=EkuJi
zanMwFgjz1bikL-sAp}1>2^z3N5^@z*Rg$2v9^71(Yk%)Wi;@{0Ei95Fn*S{|Lang9
z64qBD#nMh#>p-RT-0g(5_T1tCEB8c8TvKD^{|q17U0#(i_dun>GuQIoQ;i&_jDKO2
zSeO%0DukI>*#6{pgo_d5BSH3_MA#a^eJ2)?Ms=LlvK+}Zx+UT9s8RC8NjY`r2EfG$
zHz&9=mwy#8xYmiKh*NjO7A(<q@t%g}2(G)+wLXn1*hBE{SS+`+8g|sNG&NVFme$-O
zLAoj_Z$9b{-@q#fYhn3rb&tKDTFLElEx3*Bo=;sRcC!ahbGbbUwO0$CXZI#fO@Fes
z8aIu4sUcdD9KkCY^2r8|93;*W8oWj}y?*RfSbtY7XZdGwgex^n?Q_UdZ}@Oqiky;U
z$;Z7eBe*9`Mya2<DB0j{YWoMbzNh*iQ&Xb@qC0c#ju0Ni8cPMdX`0yiRkft7sSn2{
zmUFdy-LpAD81QdOc{1+xTsF88%U$VC4`VaepM;#HEuD~Ce^Z*KNpdfHpPPO`X)INQ
z9ZsqduI{eFYc3jc`Or(j(P_C}XIZYjhjqD}mCf(>ip|VN*-{AMD}dKZ=^F$_guD>y
f4cvYVX(0at`o4e12bt|p00000NkvXXu0mjf4nCS&

diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png
index a44dc113fba2efbe755103001a8ebfe3e83415cb..251bf208553acef1384d35e09e0e56ae230134ff 100644
GIT binary patch
delta 1651
zcmV-(28{W#45$r|NPh-ONkl<Zc%0>3>yGRu40bZJm0GD)wSU@&=$oC#uX@>?N$8IQ
zISv7AW1GXMpA_xvEaU@>Z$PpDSA=+(U^(s@!WRJe!m6|^e^mao=U=Q4Tf6W3aw%TN
z4*+nF*NPg7KLY@SJN^auL-Q8P?f|f%&$xbo*a83m*tTt1*MF7UgJ0u~9{}(~KR5U`
zOlN`+L~{Kx-tYzhpINKZwd6fuHy;3g2Y?R%_!j{F0f4{bl}HX@_x9lDSoaoh_=K-L
z*<#BV$cO0hcu0EiTWtBCh$M~wBYr;jKsZf*O6`h7Z;@z?*MVMwU*e56_$r6L5Xpl6
z_KhusAXT)tcz-2XBqclD=OF0N<eVfCl!qvSJC#;+El_AVF4&6&{jB!B*A}s%=>bNy
zVN(-?>}L_Zvxp6=Au=am_td=ymU>XEYcY$O(9R;V{Is(OquC308B9AwLluo}?4*ju
zDzEJUNifb_3u99`fdWlgxKGnV2J5=!DG-++uXFl+T7OLj7~~H~XoW0Nv>sDI!b8Yr
zv#2>e6Rd>%deODqRDf(2wM<2ofGkW972)pDUM?=WkXi`2`Tf-X0APmjy;l$Lx}011
z&cf8eFN?%VldFxJHoC@9MKi*%HWe4VMEKr>#-p*KyP?5vkB}#_rt7*|EzFw4rb7cS
zfa@050e|f*`u>5JWsYWU?B>wqp+1=`+ykpw<d&nkCE}N@_3ZoWZY;M&(z4S=cI+&3
zdSgezQpl#pj*a}#fL0GKu+ZcotMAnwO*@O+!<G_>OA1B8B86%~6FRy_6)aeoil*tF
zHmWF1QFCh=va5*yuSXk_Ldk}xbFIS7;mC(*S$`Id)5jj|bPt?}i&|EIi=vUx2sv+%
zsYk1hdH(yf))av0(Z<E5oYoY|&9xY!(SvF|%@DZ?8Q<JBE*icdb*XO=I_BS>@Dc}F
zd9z5EWu~%jiq;jjNGj%vR?RY}6*9Xq!!sQA8U!l;eRDLc45!)?_vqT<WC+{g^bnB1
zwtuK+h)7t@B2viJLc~p7^ng7?mU}oXJ&>3R7LFmh-EKYOpHR&ghVErbDkd4^Lt1?3
z&=t8R_Xyc7_+?qtX@g((EV7uU?pbEDp2k#QKU^i5)*rYFnN4DmC$kd}jX$W8Xx58x
zgQ~q5dfv2Hpn{=0flc5ZqzB4P3EY>|4u68U@+-M{DMz>vdK|$z!6G(o=4sk3cm6CA
z<_E1-n?!bO^m;V+45!QKlZ7ipqWoYQJ#bH<*bTDU%beg`Mbu=jKOkpMg8QKX%QL^l
z`r2ulmv0hi!uNS*k;a<3<Ogm^ATIBk#*!GitT~m-WRqF#fY1cOJskFMP8$~`kbnCJ
zmWg;VR`NQ?cYN+mKuQF~@A0~+@csvya&v!7Cf5V0sc?&n*z&R-BD1KX)*#cUg4K(0
z8BRx3f#LQf5ee;XtXl%or3a#l2rjmW4bAC&_bk&@$e6^HAd#>FFUhK7k^#0y?X`-I
z!!xY%7J7i|nC=9+M%Qec<$j=5>wgbg=T6TAl2%E|PW>VPd~=r+iX|^i3dL%aW}7R&
zxyxDwiK7ScT!qCDnIs@Nf%z<ALo<t9BfFuCAx&5=j+^R%dyWQheHPgzsvu##<$h_P
z)yvwd1R6bHMc6O#G*`3ExEJOrJeo@n5&;Rz$LLKpxm1n}9W_ZH?J^aQ2Y<Llb}WqZ
z2g10hMRNN7Ah_S}+G$$E)bG}05ov8v>2sNYD##?dK)Ye>zLdasnVk=Qwtk)oywDp}
z)XI@zi`G=s2|CR+*<;JqchY5QGMoucC4fH5G|vxYagk64mp3id;Q3Tz02pv;*}~X0
z;qH^i#YJ8RyETuCi3yqo3x7A9;~leF8IV?W+SjVc_YZ`#2;i!0ZF9ZvyG9S_CriE7
zi>7|~Ru=pUW#Dd2OJqe@89SO_-*-_(F4;lw{{G&hXeF7I^Ml!ZG8^Okfx;Fw>rK0#
zoCwGqp;yt;KfNRC3}4>&%MXO6g8g3+$F2NEJuqKV>m4HZWz7WFH*9XW%76_EkA~~j
zS6jAilk}i=zNkr1Yyp8GVT&69EBHEw==ps58oS5i!LB5M$NTI|2-rA===1ZlM+T&z
x4}y=6k7mIJNweM(LV#sCIVg&R?ae|6@E@ttAxxheG=TsB002ovPDHLkV1jUkF_HiP

delta 1532
zcmV<Y1q1r14YCZ7NPh*?Nkl<Zc%0>3+m6#P5S?VVD}e;!0SUf_FW{fxFZmF}bxFcQ
z?d-(yWo)1EPPIp>nznXMY|nTuc2c4<Hur*H-p{&iU$!gAy^?VCVy_eK-PKO(x=!;v
ze-m8Pdm?%uqSbv~>8aH-9eZHA4=PK$=Hkk(M6|GDUVrl~xPM;8wFScS(>r(KM<V*i
z-WPgm*^%JdwPL(-C%hw~zrj`e*K{CQmSw(NE>ePzMD&M<eiP9zBKqlGp2WAJxdm@r
z-8*-}f378qyYh*`E?SmFJOD)W!Cm=xM&kSb(H$RKu&(P=LGaqWKRTj|BRc6rE5TcL
zqJ^&G@Pm;|?0>g|Cf5)=xD#IJX)I=X>i-=(L1habA|#$5-bD@)Q3~gxi6U3-Q6o7a
zCib3eed}B#Mo$Ykk{4#0U<=-(Xq6%{P+bHk5Vu0T1xP)J)<sBB7QIqbEN@ndII^u!
z9|N;pG*r>xlN~RsE~Z6-mpff^WXD2XO!qOE=eZ`j%zsUIhtH<RV2C{^qIZy06s@YP
z#vsF_C@Y>Gs6oCx@49}fsH`aVjm$e<sszuXXeUy{AZNcfZ4ZbnxbLlc!1Hoy?z;%4
zonKKslqM&ADzo18mN<qG)RemoG0mdKqKUjalg=+MXJ|I9h;T|}Ain8P$BXE^#I>VW
zik{!`LVw0+@X5}GCY!X$L(@6MaWE;SL~OM+@%?!<wt_%BRTCMNqOhE*q8YMi4n2dc
znhZ$-tp_I{G<it&J=r3&Ql##-#LB9KP(>g@s4RM1M|H141VkX7ox06>6)_Qox{my$
zS;c#~7HvofH7vqW@viH;Xqu*~iUGJqJDh_PoPT~yU`UK6E{jw&s6|WmdHC7vY|4p-
zWPYIpLySHr%K{Z2B<rasLl9X<RljI>LhAGz!gb7&-^7MiwS<(&0-ASQ{BbhMG&{)R
zZW`{JN^%fk-#>4RhKg{KE$Pt%HARb&K?#Oryq-l5RFZ;fHd)+7y<$p{_bh=pT`9%h
zMSpHBvj)6;GF~vbmdVE;?9x*go3;n3&sl<&T*YlVzhWsuh^e|g$hN3ws^E4wNn+L>
zs1LFyDnfmC4$2-RNqX`{d^SzC#^ip}Y(x`c_++<4OQlb$nlBQGDJQ7$Dq`9k-G7SA
z{6>L@53+HZ$y5SS{;DCKofxftk$QwP%zx;|;shu`5$aJULea87EwR|yS0S+n{3$0y
zg>F*cG=N+IiAolFH5Nt?*0Cc+J+rAwe4rKt@?+I7wus?rO{r6>ZZgGWs2~tZ;LC}+
z)1)S^!LeGtDEHldthJGEKi<c{Z9S<$o%8DgkQQXeO?}fquRT!ni^SuF?joqsSAX{^
zM6DPe;nYY`SP$-1GzB2FtFdYUh`JtdsLVxTXyhs&1iq|ll<7%S2|S6|FOo)?u}Bk^
ztEeiET4M2lt^}%j*W%o@`rTZ;_8_<KG)mCpI!0moK>+;ZDj}3elGHa-B5krtuA+#R
zz3-)26cT`h1aK)5V|Z%W%=&>CNPm+F)q^3vX?QQPidRttVs{Sz?(`e#VQoo*9z76w
z*e3NrWCuKkKQOPwqN%ii6J>!M1E?nFl&zZ}W{;sJlb2Po$yFCJ&K^|yMLCkg_bod^
z!g98zidx63T1;!_q8MqGpv5Muje$t&Og}hMWcW?4LggaNqTA9tRX_-M*?(e-k=b{V
zMQe?4?CeVDi8A5wfoha_deTw~ns+sBL^`Wb2bj&9if!`nIJq~<EE2T1?{ETN&c-ul
zd&i(StD1eR%Fy)#6^j-EdS_`BOy7Ll<owpI;S9+aWl7B5MlY_j6Er+yHszbb;saHi
zEQVQo5UydWc-QJ<Ac_&xw{_&IXS@)%aKj0za8sFI7(q?B?x{lci5se8AO?Ed11z1B
z+Ft}s=ZMOiwrC>fYxwpbGm~9$Ur{fC80xD~{(p|AWm&$?vj3R=G)>cII&SFm8vswY
i4(tSxE6iP#6x)BORHQ_ahmm*y0000<MNUMnLSTY&;^tof

diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png
index 1ab18da6a27c949378e11da635a8d497704f3f52..e8b36d8f14acdb03ba2a4c1677c8768c0f272ac8 100644
GIT binary patch
literal 2605
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

literal 4418
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
IM6N<$f;yK{*Z=?k


From 6d110117bee23d7fb25b08442614b3e0b4c47a75 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 16 Jan 2014 14:03:55 -0800
Subject: [PATCH 130/147] Adding new bucket for inbetween phone-tablet layouts.
 (Bug 11993166)

Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
---
 src/com/android/launcher3/DynamicGrid.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 3aced1faea..cbde99113f 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -71,6 +71,8 @@ public class DynamicGrid {
                 296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Nexus 4",
                 359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
+        deviceProfiles.add(new DeviceProfile("Large Phone",
+                400, 680,  5, 5,  64, 14.4f,  5, 56));
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",

From f3a8e8c0bd8b0dbe3991e5ad9d315e6e253e92eb Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 16 Jan 2014 10:38:38 -0800
Subject: [PATCH 131/147] Disabled the wallpaper when completely in -1 Now
 space.

Bug: 11186234
Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
---
 src/com/android/launcher3/Launcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5e1e31900d..4d0349bed5 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2869,7 +2869,7 @@ public class Launcher extends Activity
                 mWorkspaceBackgroundDrawable : null);
     }
 
-    void updateWallpaperVisibility(boolean visible) {
+    protected void changeWallpaperVisiblity(boolean visible) {
         int wpflags = visible ? WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER : 0;
         int curflags = getWindow().getAttributes().flags
                 & WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;

From efb31e399d335351a8db3de54ed66fabd30606ba Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 16 Jan 2014 16:07:50 -0800
Subject: [PATCH 132/147] Fix overlapping pages (issue 12551580)

Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
---
 src/com/android/launcher3/DeviceProfile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 8bcf6c32e0..7ca4f811c2 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -557,7 +557,7 @@ public class DeviceProfile {
             // In portrait, we want the pages spaced such that there is no
             // overhang of the previous / next page into the current page viewport.
             // We assume symmetrical padding in portrait mode.
-            return 2 * getWorkspacePadding().left;
+            return Math.max(defaultPageSpacingPx, 2 * getWorkspacePadding().left);
         }
     }
 

From 849aff7553a5daffa34b4c38d1d29dec5a87fde1 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 16 Jan 2014 14:58:00 +0100
Subject: [PATCH 133/147] Disable Set Wallpaper button while loading image

Bug: 12472111

Change-Id: I2a0cba47f31af2416b0dd062929f277fcbf80481
---
 WallpaperPicker/res/layout/actionbar_set_wallpaper.xml       | 1 +
 .../src/com/android/launcher3/WallpaperCropActivity.java     | 5 +++++
 .../src/com/android/launcher3/WallpaperPickerActivity.java   | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
index 1622742a52..2a0188ae2b 100644
--- a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
+++ b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
@@ -20,6 +20,7 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:actionButtonStyle"
+    android:id="@+id/set_wallpaper_button"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
     <TextView style="?android:actionBarTabTextStyle"
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index ee7b819512..96c972334a 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@ -75,6 +75,7 @@ public class WallpaperCropActivity extends Activity {
 
     protected CropView mCropView;
     protected Uri mUri;
+    private View mSetWallpaperButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -111,10 +112,12 @@ public class WallpaperCropActivity extends Activity {
                         cropImageAndSetWallpaper(imageUri, null, finishActivityWhenDone);
                     }
                 });
+        mSetWallpaperButton = findViewById(R.id.set_wallpaper_button);
 
         // Load image in background
         final BitmapRegionTileSource.UriBitmapSource bitmapSource =
                 new BitmapRegionTileSource.UriBitmapSource(this, imageUri, 1024);
+        mSetWallpaperButton.setVisibility(View.INVISIBLE);
         Runnable onLoad = new Runnable() {
             public void run() {
                 if (bitmapSource.getLoadingState() != BitmapSource.State.LOADED) {
@@ -122,6 +125,8 @@ public class WallpaperCropActivity extends Activity {
                             getString(R.string.wallpaper_load_fail),
                             Toast.LENGTH_LONG).show();
                     finish();
+                } else {
+                    mSetWallpaperButton.setVisibility(View.VISIBLE);
                 }
             }
         };
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index c54e4779c1..aa43def66f 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -90,6 +90,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
     private static final String DEFAULT_WALLPAPER_THUMBNAIL_FILENAME = "default_thumb2.jpg";
 
     private View mSelectedTile;
+    private View mSetWallpaperButton;
     private boolean mIgnoreNextTap;
     private OnClickListener mThumbnailOnClickListener;
 
@@ -146,11 +147,13 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                 onLoad = null;
             } else {
                 mFirstClick = false;
+                a.mSetWallpaperButton.setVisibility(View.INVISIBLE);
                 onLoad = new Runnable() {
                     public void run() {
                         if (mBitmapSource != null &&
                                 mBitmapSource.getLoadingState() == BitmapSource.State.LOADED) {
                             a.selectTile(mView);
+                            a.mSetWallpaperButton.setVisibility(View.VISIBLE);
                         } else {
                             ViewGroup parent = (ViewGroup) mView.getParent();
                             if (parent != null) {
@@ -466,6 +469,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                         }
                     }
                 });
+        mSetWallpaperButton = findViewById(R.id.set_wallpaper_button);
 
         // CAB for deleting items
         mActionModeCallback = new ActionMode.Callback() {

From e029874bcfd6e55cb93fb6609f3342f180b5995c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 17 Jan 2014 12:03:00 -0800
Subject: [PATCH 134/147] Dismissing search and other overlays when the menu
 button is pressed. (Bug 12524591)

---
 src/com/android/launcher3/Launcher.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c119999e8a..ce304ba28e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2053,7 +2053,16 @@ public class Launcher extends Activity
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        showOverviewMode(true);
+        // Close any open folders
+        closeFolder();
+        // Stop resizing any widgets
+        mWorkspace.exitWidgetResizeMode();
+        if (!mWorkspace.isInOverviewMode()) {
+            // Show the overview mode
+            showOverviewMode(true);
+        } else {
+            showWorkspace(true);
+        }
         return false;
     }
 

From 3abfd16e5d8f4af36fbe7e8c429cdd1227af1a50 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 17 Jan 2014 14:43:02 -0800
Subject: [PATCH 135/147] Adding specific buckets for N5 in dynamic grid. (Bug
 12604220)

Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
---
 src/com/android/launcher3/DynamicGrid.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index cbde99113f..447bb1cd87 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -70,9 +70,11 @@ public class DynamicGrid {
         deviceProfiles.add(new DeviceProfile("Nexus S",
                 296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48));
         deviceProfiles.add(new DeviceProfile("Nexus 4",
-                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
+                335, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
+        deviceProfiles.add(new DeviceProfile("Nexus 5",
+                359, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));
         deviceProfiles.add(new DeviceProfile("Large Phone",
-                400, 680,  5, 5,  64, 14.4f,  5, 56));
+                406, 694,  5, 5,  64, 14.4f,  5, 56));
         // The tablet profile is odd in that the landscape orientation
         // also includes the nav bar on the side
         deviceProfiles.add(new DeviceProfile("Nexus 7",

From 944491587e8a8f77233a1916cc16cd07edd97f2e Mon Sep 17 00:00:00 2001
From: Ian Parkinson <ianp@google.com>
Date: Tue, 21 Jan 2014 13:09:59 +0000
Subject: [PATCH 136/147] Avoid NPE from delayed Runnable

Naive fix to b/12656485. Other Runnables in Launcher similarly check
that mWorkspace hasn't become null between being posted and being
executed, so I think this is probably appropriate.

Bug: 12656485
Change-Id: Ib4f3d0e8686c6249fe838144b1e8120c85f66f01
---
 src/com/android/launcher3/Launcher.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9a16037ae4..50bbe51a5b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3951,9 +3951,11 @@ public class Launcher extends Activity
                     // when we are loading right after we return to launcher.
                     mWorkspace.postDelayed(new Runnable() {
                         public void run() {
-                            mWorkspace.snapToPage(newScreenIndex);
-                            mWorkspace.postDelayed(startBounceAnimRunnable,
-                                    NEW_APPS_ANIMATION_DELAY);
+                            if (mWorkspace != null) {
+                                mWorkspace.snapToPage(newScreenIndex);
+                                mWorkspace.postDelayed(startBounceAnimRunnable,
+                                        NEW_APPS_ANIMATION_DELAY);
+                            }
                         }
                     }, NEW_APPS_PAGE_MOVE_DELAY);
                 } else {

From 2b4717447e7afddf1011875fe70971b6e105f4c5 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 21 Jan 2014 14:14:41 -0500
Subject: [PATCH 137/147] Defend against missing DB during migration.

Bug: 12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
---
 src/com/android/launcher3/LauncherProvider.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index c797cc4121..977446b01e 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -321,9 +321,11 @@ public class LauncherProvider extends ContentProvider {
     public void deleteDatabase() {
         // Are you sure? (y/n)
         final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        final String dbFile = db.getPath();
+        final File dbFile = new File(db.getPath());
         mOpenHelper.close();
-        SQLiteDatabase.deleteDatabase(new File(dbFile));
+        if (dbFile.exists()) {
+            SQLiteDatabase.deleteDatabase(dbFile);
+        }
         mOpenHelper = new DatabaseHelper(getContext());
     }
 

From 0b560dda27dfd341393c1290798a709e6ae57987 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 21 Jan 2014 13:00:26 -0800
Subject: [PATCH 138/147] Adding tighter first run checks for migration clings.
 (Bug 12626290)

Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
---
 src/com/android/launcher3/LauncherClings.java   |  3 ++-
 src/com/android/launcher3/LauncherProvider.java | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 94b062ddc4..9d2778cfac 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -196,7 +196,8 @@ class LauncherClings {
         SharedPreferences sharedPrefs = mLauncher.getSharedPrefs();
         return areClingsEnabled() &&
             !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) &&
-            !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false);
+            !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false) &&
+            LauncherAppState.getLauncherProvider().wasNewDbCreated();
     }
 
     public void removeFirstRunAndMigrationClings() {
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index c797cc4121..eca776931c 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -108,6 +108,10 @@ public class LauncherProvider extends ContentProvider {
         return true;
     }
 
+    public boolean wasNewDbCreated() {
+        return mOpenHelper.wasNewDbCreated();
+    }
+
     @Override
     public String getType(Uri uri) {
         SqlArguments args = new SqlArguments(uri, null, null);
@@ -343,6 +347,8 @@ public class LauncherProvider extends ContentProvider {
         private long mMaxItemId = -1;
         private long mMaxScreenId = -1;
 
+        private boolean mNewDbCreated = false;
+
         DatabaseHelper(Context context) {
             super(context, DATABASE_NAME, null, DATABASE_VERSION);
             mContext = context;
@@ -358,6 +364,10 @@ public class LauncherProvider extends ContentProvider {
             }
         }
 
+        public boolean wasNewDbCreated() {
+            return mNewDbCreated;
+        }
+
         /**
          * Send notification that we've deleted the {@link AppWidgetHost},
          * probably as part of the initial database creation. The receiver may
@@ -375,6 +385,7 @@ public class LauncherProvider extends ContentProvider {
 
             mMaxItemId = 1;
             mMaxScreenId = 0;
+            mNewDbCreated = true;
 
             db.execSQL("CREATE TABLE favorites (" +
                     "_id INTEGER PRIMARY KEY," +

From b1f50d70e9eae490765f599fb0cc2db2cb033760 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 23 Jan 2014 14:37:59 +0100
Subject: [PATCH 139/147] Catch exceptions if Exif is malformed

Bug: 11650650

Change-Id: Iee8f1675850c692fe54dc619f3e969ba180e4206
---
 .../src/com/android/launcher3/WallpaperCropActivity.java    | 3 +++
 .../src/com/android/photos/BitmapRegionTileSource.java      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index 96c972334a..23fbe73a32 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@ -276,6 +276,9 @@ public class WallpaperCropActivity extends Activity {
             }
         } catch (IOException e) {
             Log.w(LOGTAG, "Getting exif data failed", e);
+        } catch (NullPointerException e) {
+            // Sometimes the ExifInterface has an internal NPE if Exif data isn't valid
+            Log.w(LOGTAG, "Getting exif data failed", e);
         } finally {
             Utils.closeSilently(bis);
             Utils.closeSilently(is);
diff --git a/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
index cdc5cdcbd6..764156de03 100644
--- a/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
+++ b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
@@ -245,6 +245,9 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource {
             try {
                 ei.readExif(mPath);
                 return true;
+            } catch (NullPointerException e) {
+                Log.w("BitmapRegionTileSource", "reading exif failed", e);
+                return false;
             } catch (IOException e) {
                 Log.w("BitmapRegionTileSource", "getting decoder failed", e);
                 return false;
@@ -311,6 +314,9 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource {
             } catch (IOException e) {
                 Log.e("BitmapRegionTileSource", "Failed to load URI " + mUri, e);
                 return false;
+            } catch (NullPointerException e) {
+                Log.e("BitmapRegionTileSource", "Failed to read EXIF for URI " + mUri, e);
+                return false;
             } finally {
                 Utils.closeSilently(is);
             }

From c2abb6b443592cd1d070e2fa196511e2f6957077 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 23 Jan 2014 10:26:35 -0800
Subject: [PATCH 140/147] Import translations. DO NOT MERGE

Change-Id: I9a8480fdd1e29c679711c256f4e2a0d2d0687c36
Auto-generated-cl: translation import
---
 res/values-bg/strings.xml     | 6 ++----
 res/values-et-rEE/strings.xml | 6 ++----
 res/values-fa/strings.xml     | 4 ++--
 res/values-fi/strings.xml     | 6 ++----
 res/values-hi/strings.xml     | 6 ++----
 res/values-hr/strings.xml     | 6 ++----
 res/values-hu/strings.xml     | 2 +-
 res/values-in/strings.xml     | 6 ++----
 res/values-iw/strings.xml     | 4 ++--
 res/values-ja/strings.xml     | 6 ++----
 res/values-ka-rGE/strings.xml | 6 ++----
 res/values-km-rKH/strings.xml | 6 ++----
 res/values-ko/strings.xml     | 6 ++----
 res/values-lo-rLA/strings.xml | 6 ++----
 res/values-lt/strings.xml     | 6 ++----
 res/values-lv/strings.xml     | 6 ++----
 res/values-ms-rMY/strings.xml | 6 ++----
 res/values-pt/strings.xml     | 6 ++----
 res/values-ro/strings.xml     | 6 ++----
 res/values-ru/strings.xml     | 6 ++----
 res/values-sk/strings.xml     | 6 ++----
 res/values-sr/strings.xml     | 6 ++----
 res/values-th/strings.xml     | 6 ++----
 res/values-tl/strings.xml     | 6 ++----
 res/values-tr/strings.xml     | 6 ++----
 res/values-vi/strings.xml     | 6 ++----
 res/values-zh-rCN/strings.xml | 6 ++----
 res/values-zh-rHK/strings.xml | 4 ++--
 res/values-zh-rTW/strings.xml | 6 ++----
 29 files changed, 57 insertions(+), 107 deletions(-)

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6d5680a93d..9082929d16 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Приспособления"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На началните ви екрани няма повече място."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На този начален екран няма повече място."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Няма повече място в областта с любимите"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Това приспособление е твърде голямо за областта с любимите"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Прекият път към <xliff:g id="NAME">%s</xliff:g> е създаден."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Прекият път към <xliff:g id="NAME">%s</xliff:g> бе премахнат."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Прекият път към <xliff:g id="NAME">%s</xliff:g> вече съществува."</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 55fa73e776..a2f3125bb6 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Vidinad"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Teie avaekraanidel ei ole enam ruumi."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"See vidin on salve Lemmikud jaoks liiga suur"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on loodud."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on eemaldatud."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on juba olemas."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f4f445ed65..9f22f933d6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ابزارک‌ها"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"فضای بیشتری در صفحات نمایش اصلی شما موجود نیست."</string>
     <string name="out_of_space" msgid="4691004494942118364">"فضای بیشتری در این صفحه اصلی موجود نیست."</string>
-    <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی مورد علاقه‌ها وجود ندارد"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"این ابزارک برای سینی مورد علاقه‌ها بسیار بزرگ است"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی موارد دلخواه وجود ندارد"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"این ابزارک برای سینی موارد دلخواه بسیار بزرگ است"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» ایجاد شد."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» حذف شد."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» در حال حاضر وجود دارد."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1feb28c61f..af461a5d29 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgetit"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Aloitusruuduilla ei ole enää tilaa."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Suosikit-valikossa ei ole enää tilaa"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Tämä widget on liian suuri Suosikit-valikkoon lisättäväksi"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> luotiin."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> poistettiin."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> on jo olemassa."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 42bb397d89..058f5340ac 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"विजेट"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"आपकी होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
     <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"पसंदीदा ट्रे में और स्थान नहीं है"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"पसंदीदा ट्रे के लिए यह विजेट बहुत ही बड़ा है"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" बनाया गया."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" निकाल दिया गया था."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" पहले से मौजूद है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2c9d5487f8..52a91a3e12 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeti"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na vašim početnim zaslonima više nema mjesta."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Favoriti"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Widget je prevelik za traku Favoriti"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Izrađen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Uklonjen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Prečac za \"<xliff:g id="NAME">%s</xliff:g>\" već postoji."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1734fe37ea..38b6b5c6d0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -43,7 +43,7 @@
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nincs több hely a kezdőképernyőkön."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nincs több hely ezen a kezdőképernyőn."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ez a widget túl nagy a Kedvencek tálcán való elhelyezéshez"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ez a modul túl nagy a Kedvencek tálcán való elhelyezéshez"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon létrehozva."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon eltávolítva."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon már létezik."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f2c6f6e683..732dd4574d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tidak ada ruang lagi di layar Utama Anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi pada layar Utama ini."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tidak ada ruang tersisa di baki Favorit"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Widget ini terlalu besar untuk baki Favorit"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dihapus."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah ada."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index da79225684..af853a85b9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"רכיבי ווידג\'ט"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"אין יותר מקום במסכי דף הבית."</string>
     <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
-    <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש ה\'מועדפים\'"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"הווידג\'ט הזה גדול מדי עבור מגש ה\'מועדפים\'."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"הווידג\'ט הזה גדול מדי עבור מגש המועדפים."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' נוצר."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' הוסר."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' כבר קיים."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7a95f8e0de..b396893b1f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ウィジェット"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ホーム画面に空きスペースがありません。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"このホーム画面に空きスペースがありません。"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"お気に入りトレイに空きスペースがありません"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"このウィジェットはお気に入りトレイには大きすぎます"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を作成しました。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を削除しました。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」は既に存在します。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 4fdd2a07e6..4c53cc81e9 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ვიჯეტები"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"მთავარ ეკრანებზე ადგილი აღარ არის."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ამ მთავარ ეკრანზე ადგილი აღარ არის."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"რჩეულების თაროზე ადგილი არ არის"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ეს ვიჯეტი ძალიან დიდია რჩეულების თაროსთვის"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"შეიქმნა მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"მასლახმობი „<xliff:g id="NAME">%s</xliff:g>“ წაშლილია."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“ უკვე არსებობს."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d655622a0c..eb30a16da7 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​រស់​អ្នក​ទៀត​ទេ។"</string>
     <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"គ្មាន​បន្ទប់​​ក្នុង​ថាស​និយម​ប្រើ"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ធាតុ​ក្រាហ្វិក​នេះ​ធំ​ពេក​សម្រាប់​ថាស​និយម​ប្រើ"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"បាន​បង្កើត​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"បាន​លុប​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"មាន​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" រួច​ហើយ។"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ef1b3093d4..656c9728a9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"위젯"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"홈 화면에 더 이상 공간이 없습니다."</string>
     <string name="out_of_space" msgid="4691004494942118364">"홈 화면에 더 이상 공간이 없습니다."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"즐겨찾기 트레이에 더 이상 공간이 없습니다."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"위젯이 너무 커서 즐겨찾기 트레이에 들어갈 수 없습니다."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 생성되었습니다."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 삭제되었습니다."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 이미 있습니다."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index d7e103d6a4..6a12dbdbb6 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ວິດເຈັດ"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກຂອງທ່ານ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກນີ້."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ວິດເຈັດນີ້ໃຫຍ່ເກີນໄປທີ່ຈະເກັບໄວ້ໃນຖາດເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກສ້າງແລ້ວ."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກລຶບແລ້ວ."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ມີຢູ່ແລ້ວ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 977f6a9ab0..aed0e84d5e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Valdikliai"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Pagrindiniuose ekranuose vietos nebėra."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šiame pagrindiniame ekrane vietos nebėra."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Mėgstamiausių dėkle nebėra vietos"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Mėgstamiausių dėklui šis valdiklis per didelis."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ sukurtas."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ pašalintas."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ jau yra."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b2d6152fe6..74ae7a4657 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Logrīki"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Sākuma ekrānos vairs nav vietas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šajā sākuma ekrānā vairs nav vietas."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Izlases joslā vairs nav vietas."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Šis logrīks ir pārāk liels izlases joslai."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Tika izveidota saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Tika noņemta saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Saīsne “<xliff:g id="NAME">%s</xliff:g>” jau pastāv."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index c7d59e3c55..802aa952dc 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tiada lagi ruang pada skrin Laman Utama anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tiada ruang dalam dulang Kegemaran lagi"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Widget ini terlalu besar untuk dulang Kegemaran"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dialih keluar."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah wujud."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index df7f056e9d..0252d61c30 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Não há mais espaço nas telas iniciais."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Não há mais espaço na tela inicial."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Sem espaço na bandeja de favoritos"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"O widget é muito grande para a bandeja de favoritos"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Atalho \"<xliff:g id="NAME">%s</xliff:g>\" criado."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1c0460be8c..75479ed577 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeturi"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nu mai este loc pe ecranele de pornire."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nu mai este loc pe acest Ecran de pornire."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spațiu epuizat în bara Preferate"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Acest widget este prea mare pentru bara Preferate"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>\" a fost creată."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” a fost eliminată."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” există deja."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ec723cb7e3..a93583db41 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виджеты"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На главных экранах все занято"</string>
     <string name="out_of_space" msgid="4691004494942118364">"На этом экране все занято"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"В разделе \"Избранное\" больше нет места"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Виджет слишком велик для раздела \"Избранное\""</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" создан"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" удален"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" уже существует"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 271d8b81d6..485a2ec4fa 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Miniaplikácie"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na plochách už nie je miesto."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tejto ploche už nie je miesto"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na paneli Obľúbené položky už nie je miesto"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Táto miniaplikácia je príliš veľká pre panel Obľúbené položky"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol vytvorený."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol odstránený."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Odkaz <xliff:g id="NAME">%s</xliff:g> už existuje."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a8299c2e43..dd28fa3b98 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виџети"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Нема више простора на почетним екранима."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Нема више простора на овом почетном екрану."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема више простора на траци Омиљено"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Виџет је превелик за траку Омиљено"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је направљена."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је уклоњена."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ већ постоји."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index de8ce198a4..413c78af6b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"วิดเจ็ต"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ไม่มีที่ว่างในหน้าจอหลักของคุณ"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"ไม่มีพื้นที่เหลือในถาดรายการโปรด"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"วิดเจ็ตนี้มีขนาดใหญ่เกินไปสำหรับถาดรายการโปรด"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"สร้างทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" แล้ว"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"นำทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" ออกแล้ว"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"มีทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" อยู่แล้ว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2f03be1185..897631a7c2 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Mga Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Wala nang lugar sa iyong mga Home screen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Wala nang lugar sa Home screen na ito."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Wala nang lugar sa tray ng Mga Paborito"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Masyadong malaki ang widget na ito para sa tray ng Mga Paborito"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Nagawa ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Inalis ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Umiiral na ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0712f92d17..42fa17242a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget\'lar"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Ana ekranlarınızda yer kalmadı."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Bu Ana ekranda yer kalmadı."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoriler tepsisinde başka yer kalmadı"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Bu widget, Favoriler tepsisi için çok geniş"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu oluşturuldu."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu kaldırıldı."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu zaten var."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 23b208ddd2..20a9b3a62e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Tiện ích con"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Không còn chỗ trên Màn hình chính của bạn."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Không còn chỗ trên Màn hình chính này."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Không còn chỗ trong khay Mục yêu thích"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Tiện ích con này có kích thước quá lớn để đặt vào khay Mục yêu thích"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã được tạo."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã bị xóa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã tồn tại."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7e221d1b5c..540291e0fb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小部件"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"您的主屏幕上没有空间了。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"收藏栏已满"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"该小部件太大，收藏栏中放不下"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已创建“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已删除“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已存在。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d40292ecdb..c1486ef9b4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主畫面已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
-    <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏系統匣沒有足夠空間"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，我的收藏系統匣沒有足夠空間"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，我的收藏寄存區沒有足夠空間"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 079ec75abe..d4acb20736 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主螢幕已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"這個主螢幕已無空間。"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"「我的最愛」匣已無可用空間"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，「我的最愛」匣無法容納"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>

From 4635a40596067650e618423637a88accc7ddad8a Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 23 Jan 2014 10:28:57 -0800
Subject: [PATCH 141/147] Import translations. DO NOT MERGE

Change-Id: I2e2a6f98fd63d04c55e08e0c11d256105701457a
Auto-generated-cl: translation import
---
 res/values-bg/strings.xml     | 6 ++----
 res/values-et-rEE/strings.xml | 6 ++----
 res/values-fa/strings.xml     | 4 ++--
 res/values-fi/strings.xml     | 6 ++----
 res/values-hi/strings.xml     | 6 ++----
 res/values-hr/strings.xml     | 6 ++----
 res/values-hu/strings.xml     | 2 +-
 res/values-in/strings.xml     | 6 ++----
 res/values-iw/strings.xml     | 4 ++--
 res/values-ja/strings.xml     | 6 ++----
 res/values-ka-rGE/strings.xml | 6 ++----
 res/values-km-rKH/strings.xml | 6 ++----
 res/values-ko/strings.xml     | 6 ++----
 res/values-lo-rLA/strings.xml | 6 ++----
 res/values-lt/strings.xml     | 6 ++----
 res/values-lv/strings.xml     | 6 ++----
 res/values-ms-rMY/strings.xml | 6 ++----
 res/values-pt/strings.xml     | 6 ++----
 res/values-ro/strings.xml     | 6 ++----
 res/values-ru/strings.xml     | 6 ++----
 res/values-sk/strings.xml     | 6 ++----
 res/values-sr/strings.xml     | 6 ++----
 res/values-th/strings.xml     | 6 ++----
 res/values-tl/strings.xml     | 6 ++----
 res/values-tr/strings.xml     | 6 ++----
 res/values-vi/strings.xml     | 6 ++----
 res/values-zh-rCN/strings.xml | 6 ++----
 res/values-zh-rHK/strings.xml | 4 ++--
 res/values-zh-rTW/strings.xml | 6 ++----
 29 files changed, 57 insertions(+), 107 deletions(-)

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6d5680a93d..9082929d16 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Приспособления"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На началните ви екрани няма повече място."</string>
     <string name="out_of_space" msgid="4691004494942118364">"На този начален екран няма повече място."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Няма повече място в областта с любимите"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Това приспособление е твърде голямо за областта с любимите"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Прекият път към <xliff:g id="NAME">%s</xliff:g> е създаден."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Прекият път към <xliff:g id="NAME">%s</xliff:g> бе премахнат."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Прекият път към <xliff:g id="NAME">%s</xliff:g> вече съществува."</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 55fa73e776..a2f3125bb6 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Vidinad"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Teie avaekraanidel ei ole enam ruumi."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"See vidin on salve Lemmikud jaoks liiga suur"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on loodud."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on eemaldatud."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on juba olemas."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f4f445ed65..9f22f933d6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ابزارک‌ها"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"فضای بیشتری در صفحات نمایش اصلی شما موجود نیست."</string>
     <string name="out_of_space" msgid="4691004494942118364">"فضای بیشتری در این صفحه اصلی موجود نیست."</string>
-    <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی مورد علاقه‌ها وجود ندارد"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"این ابزارک برای سینی مورد علاقه‌ها بسیار بزرگ است"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"فضای بیشتری در سینی موارد دلخواه وجود ندارد"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"این ابزارک برای سینی موارد دلخواه بسیار بزرگ است"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» ایجاد شد."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» حذف شد."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"میان‌بر «<xliff:g id="NAME">%s</xliff:g>» در حال حاضر وجود دارد."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1feb28c61f..af461a5d29 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgetit"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Aloitusruuduilla ei ole enää tilaa."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tässä aloitusruudussa ei ole enää tilaa."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Suosikit-valikossa ei ole enää tilaa"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Tämä widget on liian suuri Suosikit-valikkoon lisättäväksi"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> luotiin."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> poistettiin."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pikakuvake <xliff:g id="NAME">%s</xliff:g> on jo olemassa."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 42bb397d89..058f5340ac 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"विजेट"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"आपकी होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
     <string name="out_of_space" msgid="4691004494942118364">"इस होम स्‍क्रीन पर स्थान शेष नहीं है."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"पसंदीदा ट्रे में और स्थान नहीं है"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"पसंदीदा ट्रे के लिए यह विजेट बहुत ही बड़ा है"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" बनाया गया."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" निकाल दिया गया था."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"शॉर्टकट \"<xliff:g id="NAME">%s</xliff:g>\" पहले से मौजूद है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2c9d5487f8..52a91a3e12 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeti"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na vašim početnim zaslonima više nema mjesta."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na ovom početnom zaslonu više nema mjesta."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nema više prostora na traci Favoriti"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Widget je prevelik za traku Favoriti"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Izrađen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Uklonjen je prečac za \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Prečac za \"<xliff:g id="NAME">%s</xliff:g>\" već postoji."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1734fe37ea..38b6b5c6d0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -43,7 +43,7 @@
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nincs több hely a kezdőképernyőkön."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nincs több hely ezen a kezdőképernyőn."</string>
     <string name="hotseat_out_of_space" msgid="7448809638125333693">"Nincs több hely a Kedvencek tálcán"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ez a widget túl nagy a Kedvencek tálcán való elhelyezéshez"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Ez a modul túl nagy a Kedvencek tálcán való elhelyezéshez"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon létrehozva."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon eltávolítva."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"A(z) „<xliff:g id="NAME">%s</xliff:g>” parancsikon már létezik."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f2c6f6e683..732dd4574d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tidak ada ruang lagi di layar Utama Anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tidak ada ruang lagi pada layar Utama ini."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tidak ada ruang tersisa di baki Favorit"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Widget ini terlalu besar untuk baki Favorit"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dihapus."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah ada."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index da79225684..af853a85b9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"רכיבי ווידג\'ט"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"אין יותר מקום במסכי דף הבית."</string>
     <string name="out_of_space" msgid="4691004494942118364">"אין עוד מקום במסך דף הבית הזה."</string>
-    <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש ה\'מועדפים\'"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"הווידג\'ט הזה גדול מדי עבור מגש ה\'מועדפים\'."</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"אין עוד מקום במגש המועדפים"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"הווידג\'ט הזה גדול מדי עבור מגש המועדפים."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' נוצר."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' הוסר."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"קיצור הדרך \'<xliff:g id="NAME">%s</xliff:g>\' כבר קיים."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7a95f8e0de..b396893b1f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ウィジェット"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ホーム画面に空きスペースがありません。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"このホーム画面に空きスペースがありません。"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"お気に入りトレイに空きスペースがありません"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"このウィジェットはお気に入りトレイには大きすぎます"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を作成しました。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」を削除しました。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ショートカット「<xliff:g id="NAME">%s</xliff:g>」は既に存在します。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 4fdd2a07e6..4c53cc81e9 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ვიჯეტები"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"მთავარ ეკრანებზე ადგილი აღარ არის."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ამ მთავარ ეკრანზე ადგილი აღარ არის."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"რჩეულების თაროზე ადგილი არ არის"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ეს ვიჯეტი ძალიან დიდია რჩეულების თაროსთვის"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"შეიქმნა მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"მასლახმობი „<xliff:g id="NAME">%s</xliff:g>“ წაშლილია."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"მალსახმობი „<xliff:g id="NAME">%s</xliff:g>“ უკვე არსებობს."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d655622a0c..eb30a16da7 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ធាតុ​ក្រាហ្វិក"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​រស់​អ្នក​ទៀត​ទេ។"</string>
     <string name="out_of_space" msgid="4691004494942118364">"គ្មាន​បន្ទប់​នៅ​លើ​អេក្រង់​ដើម​នេះ​ទៀត​ទេ។"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"គ្មាន​បន្ទប់​​ក្នុង​ថាស​និយម​ប្រើ"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ធាតុ​ក្រាហ្វិក​នេះ​ធំ​ពេក​សម្រាប់​ថាស​និយម​ប្រើ"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"បាន​បង្កើត​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"បាន​លុប​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" ។"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"មាន​ផ្លូវកាត់ \"<xliff:g id="NAME">%s</xliff:g>\" រួច​ហើយ។"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ef1b3093d4..656c9728a9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"위젯"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"홈 화면에 더 이상 공간이 없습니다."</string>
     <string name="out_of_space" msgid="4691004494942118364">"홈 화면에 더 이상 공간이 없습니다."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"즐겨찾기 트레이에 더 이상 공간이 없습니다."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"위젯이 너무 커서 즐겨찾기 트레이에 들어갈 수 없습니다."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 생성되었습니다."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 삭제되었습니다."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"바로가기(\'<xliff:g id="NAME">%s</xliff:g>\')가 이미 있습니다."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index d7e103d6a4..6a12dbdbb6 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"ວິດເຈັດ"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກຂອງທ່ານ."</string>
     <string name="out_of_space" msgid="4691004494942118364">"ບໍ່ມີຫ້ອງເຫຼືອໃນໜ້າຈໍຫຼັກນີ້."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"ບໍ່ມີບ່ອນຫວ່າງໃນຖາດສຳລັບເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"ວິດເຈັດນີ້ໃຫຍ່ເກີນໄປທີ່ຈະເກັບໄວ້ໃນຖາດເກັບສິ່ງທີ່ໃຊ້ເປັນປະຈຳ"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກສ້າງແລ້ວ."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ຖືກລຶບແລ້ວ."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"ທາງລັດ \"<xliff:g id="NAME">%s</xliff:g>\" ມີຢູ່ແລ້ວ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 977f6a9ab0..aed0e84d5e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Valdikliai"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Pagrindiniuose ekranuose vietos nebėra."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šiame pagrindiniame ekrane vietos nebėra."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Mėgstamiausių dėkle nebėra vietos"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Mėgstamiausių dėklui šis valdiklis per didelis."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ sukurtas."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ pašalintas."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Spartusis klavišas „<xliff:g id="NAME">%s</xliff:g>“ jau yra."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b2d6152fe6..74ae7a4657 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Logrīki"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Sākuma ekrānos vairs nav vietas."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Šajā sākuma ekrānā vairs nav vietas."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Izlases joslā vairs nav vietas."</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Šis logrīks ir pārāk liels izlases joslai."</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Tika izveidota saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Tika noņemta saīsne “<xliff:g id="NAME">%s</xliff:g>”."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Saīsne “<xliff:g id="NAME">%s</xliff:g>” jau pastāv."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index c7d59e3c55..802aa952dc 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Tiada lagi ruang pada skrin Laman Utama anda."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tiada ruang dalam dulang Kegemaran lagi"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Widget ini terlalu besar untuk dulang Kegemaran"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dibuat."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dialih keluar."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah wujud."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index df7f056e9d..0252d61c30 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgets"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Não há mais espaço nas telas iniciais."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Não há mais espaço na tela inicial."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Sem espaço na bandeja de favoritos"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"O widget é muito grande para a bandeja de favoritos"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Atalho \"<xliff:g id="NAME">%s</xliff:g>\" criado."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1c0460be8c..75479ed577 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widgeturi"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Nu mai este loc pe ecranele de pornire."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Nu mai este loc pe acest Ecran de pornire."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Spațiu epuizat în bara Preferate"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Acest widget este prea mare pentru bara Preferate"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>\" a fost creată."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” a fost eliminată."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Comanda rapidă „<xliff:g id="NAME">%s</xliff:g>” există deja."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ec723cb7e3..a93583db41 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виджеты"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"На главных экранах все занято"</string>
     <string name="out_of_space" msgid="4691004494942118364">"На этом экране все занято"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"В разделе \"Избранное\" больше нет места"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Виджет слишком велик для раздела \"Избранное\""</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" создан"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" удален"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Ярлык \"<xliff:g id="NAME">%s</xliff:g>\" уже существует"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 271d8b81d6..485a2ec4fa 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Miniaplikácie"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Na plochách už nie je miesto."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Na tejto ploche už nie je miesto"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Na paneli Obľúbené položky už nie je miesto"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Táto miniaplikácia je príliš veľká pre panel Obľúbené položky"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol vytvorený."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Odkaz <xliff:g id="NAME">%s</xliff:g> bol odstránený."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Odkaz <xliff:g id="NAME">%s</xliff:g> už existuje."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a8299c2e43..dd28fa3b98 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Виџети"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Нема више простора на почетним екранима."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Нема више простора на овом почетном екрану."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Нема више простора на траци Омиљено"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Виџет је превелик за траку Омиљено"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је направљена."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ је уклоњена."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Пречица „<xliff:g id="NAME">%s</xliff:g>“ већ постоји."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index de8ce198a4..413c78af6b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"วิดเจ็ต"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"ไม่มีที่ว่างในหน้าจอหลักของคุณ"</string>
     <string name="out_of_space" msgid="4691004494942118364">"ไม่มีที่ว่างในหน้าจอหลักนี้"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"ไม่มีพื้นที่เหลือในถาดรายการโปรด"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"วิดเจ็ตนี้มีขนาดใหญ่เกินไปสำหรับถาดรายการโปรด"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"สร้างทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" แล้ว"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"นำทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" ออกแล้ว"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"มีทางลัด \"<xliff:g id="NAME">%s</xliff:g>\" อยู่แล้ว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2f03be1185..897631a7c2 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Mga Widget"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Wala nang lugar sa iyong mga Home screen."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Wala nang lugar sa Home screen na ito."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Wala nang lugar sa tray ng Mga Paborito"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Masyadong malaki ang widget na ito para sa tray ng Mga Paborito"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Nagawa ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Inalis ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Umiiral na ang shortcut na \"<xliff:g id="NAME">%s</xliff:g>.\""</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0712f92d17..42fa17242a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Widget\'lar"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Ana ekranlarınızda yer kalmadı."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Bu Ana ekranda yer kalmadı."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Favoriler tepsisinde başka yer kalmadı"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Bu widget, Favoriler tepsisi için çok geniş"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu oluşturuldu."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu kaldırıldı."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu zaten var."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 23b208ddd2..20a9b3a62e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"Tiện ích con"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"Không còn chỗ trên Màn hình chính của bạn."</string>
     <string name="out_of_space" msgid="4691004494942118364">"Không còn chỗ trên Màn hình chính này."</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Không còn chỗ trong khay Mục yêu thích"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"Tiện ích con này có kích thước quá lớn để đặt vào khay Mục yêu thích"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã được tạo."</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã bị xóa."</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã tồn tại."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7e221d1b5c..540291e0fb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小部件"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"您的主屏幕上没有空间了。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"此主屏幕上已没有空间。"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"收藏栏已满"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"该小部件太大，收藏栏中放不下"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已创建“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已删除“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已存在。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d40292ecdb..c1486ef9b4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -42,8 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主畫面已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
-    <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏系統匣沒有足夠空間"</string>
-    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，我的收藏系統匣沒有足夠空間"</string>
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，我的收藏寄存區沒有足夠空間"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 079ec75abe..d4acb20736 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -42,10 +42,8 @@
     <string name="group_widgets" msgid="1569030723286851002">"小工具"</string>
     <string name="completely_out_of_space" msgid="6106288382070760318">"主螢幕已無空間。"</string>
     <string name="out_of_space" msgid="4691004494942118364">"這個主螢幕已無空間。"</string>
-    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->
-    <skip />
-    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->
-    <skip />
+    <string name="hotseat_out_of_space" msgid="7448809638125333693">"「我的最愛」匣已無可用空間"</string>
+    <string name="invalid_hotseat_item" msgid="5779907847267573691">"這個小工具過大，「我的最愛」匣無法容納"</string>
     <string name="shortcut_installed" msgid="1701742129426969556">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_uninstalled" msgid="8176767991305701821">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
     <string name="shortcut_duplicate" msgid="9167217446062498127">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已存在。"</string>

From f4d081107f5984bfb92cb1a627667fea5bf1498c Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Thu, 16 Jan 2014 18:13:56 -0500
Subject: [PATCH 142/147] handle shortcut restore for missing packages

Bug: 10778992
Change-Id: I8766b8d4dd9c0269d52a7ec3da58dd408bc5f09f
---
 .../launcher3/LauncherBackupHelper.java       |   4 +
 src/com/android/launcher3/LauncherModel.java  | 104 ++++++++++++++++--
 .../android/launcher3/LauncherProvider.java   |  23 +++-
 .../android/launcher3/LauncherSettings.java   |   6 +
 4 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 57cdfb94aa..74eefcaec8 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -842,6 +842,10 @@ public class LauncherBackupHelper implements BackupHelper {
             }
             values.put(Favorites.APPWIDGET_ID, favorite.appWidgetId);
         }
+
+        // Let LauncherModel know we've been here.
+        values.put(LauncherSettings.Favorites.RESTORED, 1);
+
         return values;
     }
 
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 2102a1faca..6839bb3e53 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1714,6 +1714,7 @@ public class LauncherModel extends BroadcastReceiver {
                 clearSBgDataStructures();
 
                 final ArrayList<Long> itemsToRemove = new ArrayList<Long>();
+                final ArrayList<Long> restoredRows = new ArrayList<Long>();
                 final Uri contentUri = LauncherSettings.Favorites.CONTENT_URI;
                 if (DEBUG_LOADERS) Log.d(TAG, "loading model from " + contentUri);
                 final Cursor c = contentResolver.query(contentUri, null, null, null, null);
@@ -1754,6 +1755,8 @@ public class LauncherModel extends BroadcastReceiver {
                             (LauncherSettings.Favorites.SPANX);
                     final int spanYIndex = c.getColumnIndexOrThrow(
                             LauncherSettings.Favorites.SPANY);
+                    final int restoredIndex = c.getColumnIndexOrThrow(
+                            LauncherSettings.Favorites.RESTORED);
                     //final int uriIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.URI);
                     //final int displayModeIndex = c.getColumnIndexOrThrow(
                     //        LauncherSettings.Favorites.DISPLAY_MODE);
@@ -1769,6 +1772,7 @@ public class LauncherModel extends BroadcastReceiver {
                         AtomicBoolean deleteOnInvalidPlacement = new AtomicBoolean(false);
                         try {
                             int itemType = c.getInt(itemTypeIndex);
+                            boolean restored = 0 != c.getInt(restoredIndex);
 
                             switch (itemType) {
                             case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
@@ -1779,24 +1783,44 @@ public class LauncherModel extends BroadcastReceiver {
                                     intent = Intent.parseUri(intentDescription, 0);
                                     ComponentName cn = intent.getComponent();
                                     if (cn != null && !isValidPackageComponent(manager, cn)) {
-                                        if (!mAppsCanBeOnRemoveableStorage) {
-                                            // Log the invalid package, and remove it from the db
-                                            Launcher.addDumpLog(TAG, "Invalid package removed: " + cn, true);
-                                            itemsToRemove.add(id);
+                                        if (restored) {
+                                            // might be installed later
+                                            Launcher.addDumpLog(TAG,
+                                                    "package not yet restored: " + cn, true);
                                         } else {
-                                            // If apps can be on external storage, then we just
-                                            // leave them for the user to remove (maybe add
-                                            // visual treatment to it)
-                                            Launcher.addDumpLog(TAG, "Invalid package found: " + cn, true);
+                                            if (!mAppsCanBeOnRemoveableStorage) {
+                                                // Log the invalid package, and remove it
+                                                Launcher.addDumpLog(TAG,
+                                                        "Invalid package removed: " + cn, true);
+                                                itemsToRemove.add(id);
+                                            } else {
+                                                // If apps can be on external storage, then we just
+                                                // leave them for the user to remove (maybe add
+                                                // visual treatment to it)
+                                                Launcher.addDumpLog(TAG,
+                                                        "Invalid package found: " + cn, true);
+                                            }
+                                            continue;
                                         }
-                                        continue;
+                                    } else if (restored) {
+                                        // no special handling necessary for this restored item
+                                        restoredRows.add(id);
+                                        restored = false;
                                     }
                                 } catch (URISyntaxException e) {
-                                    Launcher.addDumpLog(TAG, "Invalid uri: " + intentDescription, true);
+                                    Launcher.addDumpLog(TAG,
+                                            "Invalid uri: " + intentDescription, true);
                                     continue;
                                 }
 
-                                if (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
+                                if (restored) {
+                                    Launcher.addDumpLog(TAG,
+                                            "constructing info for partially restored package",
+                                            true);
+                                    info = getRestoredItemInfo(c, titleIndex);
+                                    intent = getRestoredItemIntent(c, context, intent);
+                                } else if (itemType ==
+                                        LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
                                     info = getShortcutInfo(manager, intent, context, c, iconIndex,
                                             titleIndex, mLabelCache);
                                 } else {
@@ -1890,6 +1914,11 @@ public class LauncherModel extends BroadcastReceiver {
                                         break;
                                 }
 
+                                if (restored) {
+                                    // no special handling required for restored folders
+                                    restoredRows.add(id);
+                                }
+
                                 sBgItemsIdMap.put(folderInfo.id, folderInfo);
                                 sBgFolders.put(folderInfo.id, folderInfo);
                                 break;
@@ -1990,6 +2019,25 @@ public class LauncherModel extends BroadcastReceiver {
                     }
                 }
 
+                if (restoredRows.size() > 0) {
+                    ContentProviderClient updater = contentResolver.acquireContentProviderClient(
+                            LauncherSettings.Favorites.CONTENT_URI);
+                    // Update restored items that no longer require special handling
+                    try {
+                        StringBuilder selectionBuilder = new StringBuilder();
+                        selectionBuilder.append(LauncherSettings.Favorites._ID);
+                        selectionBuilder.append(" IN (");
+                        selectionBuilder.append(TextUtils.join(", ", restoredRows));
+                        selectionBuilder.append(")");
+                        ContentValues values = new ContentValues();
+                        values.put(LauncherSettings.Favorites.RESTORED, 0);
+                        updater.update(LauncherSettings.Favorites.CONTENT_URI,
+                                values, selectionBuilder.toString(), null);
+                    } catch (RemoteException e) {
+                        Log.w(TAG, "Could not update restored rows");
+                    }
+                }
+
                 if (loadedOldDb) {
                     long maxScreenId = 0;
                     // If we're importing we use the old screen order.
@@ -2736,6 +2784,40 @@ public class LauncherModel extends BroadcastReceiver {
         }
     }
 
+    /**
+     * Make an ShortcutInfo object for a restored application or shortcut item that points
+     * to a package that is not yet installed on the system.
+     */
+    public ShortcutInfo getRestoredItemInfo(Cursor cursor, int titleIndex) {
+        final ShortcutInfo info = new ShortcutInfo();
+        info.usingFallbackIcon = true;
+        info.setIcon(getFallbackIcon());
+        if (cursor != null) {
+            info.title =  cursor.getString(titleIndex);
+        } else {
+            info.title = "";
+        }
+        info.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
+        return info;
+    }
+
+    /**
+     * Make an Intent object for a restored application or shortcut item that points
+     * to the market page for the item.
+     */
+    private Intent getRestoredItemIntent(Cursor c, Context context, Intent intent) {
+        ComponentName componentName = intent.getComponent();
+        Intent marketIntent = new Intent(Intent.ACTION_VIEW);
+        Uri marketUri = new Uri.Builder()
+                .scheme("market")
+                .authority("details")
+                .appendQueryParameter("id", componentName.getPackageName())
+                .build();
+        Log.d(TAG, "manufactured intent uri: " + marketUri.toString());
+        marketIntent.setData(marketUri);
+        return marketIntent;
+    }
+
     /**
      * This is called from the code that adds shortcuts from the intent receiver.  This
      * doesn't have a Cursor, but
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 52bcf98e7c..cec9167f39 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -68,7 +68,7 @@ public class LauncherProvider extends ContentProvider {
 
     private static final String DATABASE_NAME = "launcher.db";
 
-    private static final int DATABASE_VERSION = 15;
+    private static final int DATABASE_VERSION = 16;
 
     static final String OLD_AUTHORITY = "com.android.launcher2.settings";
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
@@ -409,7 +409,8 @@ public class LauncherProvider extends ContentProvider {
                     "uri TEXT," +
                     "displayMode INTEGER," +
                     "appWidgetProvider TEXT," +
-                    "modified INTEGER NOT NULL DEFAULT 0" +
+                    "modified INTEGER NOT NULL DEFAULT 0," +
+                    "restored INTEGER NOT NULL DEFAULT 0" +
                     ");");
             addWorkspacesTable(db);
 
@@ -716,7 +717,6 @@ public class LauncherProvider extends ContentProvider {
                 }
             }
 
-
             if (version < 15) {
                 db.beginTransaction();
                 try {
@@ -735,6 +735,23 @@ public class LauncherProvider extends ContentProvider {
                 }
             }
 
+
+            if (version < 16) {
+                db.beginTransaction();
+                try {
+                    // Insert new column for holding restore status
+                    db.execSQL("ALTER TABLE favorites " +
+                            "ADD COLUMN restored INTEGER NOT NULL DEFAULT 0;");
+                    db.setTransactionSuccessful();
+                    version = 16;
+                } catch (SQLException ex) {
+                    // Old version remains, which means we wipe old data
+                    Log.e(TAG, ex.getMessage(), ex);
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
             if (version != DATABASE_VERSION) {
                 Log.w(TAG, "Destroying all old data.");
                 db.execSQL("DROP TABLE IF EXISTS " + TABLE_FAVORITES);
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 988e5efca9..f4ee3007d3 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -275,5 +275,11 @@ class LauncherSettings {
          * @see android.provider.LiveFolders#DISPLAY_MODE_LIST
          */
         static final String DISPLAY_MODE = "displayMode";
+
+        /**
+         * Boolean indicating that his item was restored and not yet successfully bound.
+         * <P>Type: INTEGER</P>
+         */
+        static final String RESTORED = "restored";
     }
 }

From d805837a877bb503d7890c4f92cfd183dec8c5ee Mon Sep 17 00:00:00 2001
From: Sandeep Siddhartha <sansid@google.com>
Date: Tue, 28 Jan 2014 10:41:15 -0800
Subject: [PATCH 143/147] Add callback for "Widgets" button click in launcher

Bug: 12553852
Change-Id: I8befd046242b32e86dbc6c98e6d97f0307380dd0
---
 src/com/android/launcher3/Launcher.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 709f4cf532..fca443c588 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2373,7 +2373,7 @@ public class Launcher extends Activity
                 final String shortcutClass = intent.getComponent().getClassName();
 
                 if (shortcutClass.equals(WidgetAdder.class.getName())) {
-                    showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
+                    onClickAddWidgetButton();
                     return;
                 } else if (shortcutClass.equals(MemoryDumpActivity.class.getName())) {
                     MemoryDumpActivity.startDump(this);
@@ -2466,6 +2466,14 @@ public class Launcher extends Activity
         showAllApps(true, AppsCustomizePagedView.ContentType.Applications, false);
     }
 
+    /**
+     * Event handler for the (Add) Widgets button that appears after a long press
+     * on the home screen.
+     */
+    protected void onClickAddWidgetButton() {
+        showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
+    }
+
     public void onTouchDownAllAppsButton(View v) {
         // Provide the same haptic feedback that the system offers for virtual keys.
         v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);

From 2a4f4928a964fa8eef9ea6542f835ad4a79b9bd5 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 29 Jan 2014 16:32:39 +0100
Subject: [PATCH 144/147] Fix bug: Scroll position reported incorrectly to live
 wallpapers

Bug: 11189265

Change-Id: I410f318df4e43ed13d33889a8158a03438a6174f
---
 src/com/android/launcher3/Workspace.java | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 359fd86401..687b02deff 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -209,6 +209,10 @@ public class Workspace extends SmoothPagedView
     private boolean mWorkspaceFadeInAdjacentScreens;
 
     WallpaperOffsetInterpolator mWallpaperOffset;
+    private boolean mWallpaperIsLiveWallpaper;
+    private int mNumPagesForWallpaperParallax;
+    private float mLastSetWallpaperOffsetSteps = 0;
+
     private Runnable mDelayedResizeRunnable;
     private Runnable mDelayedSnapToPageRunnable;
     private Point mDisplaySize = new Point();
@@ -1347,7 +1351,14 @@ public class Workspace extends SmoothPagedView
                 // Don't use up all the wallpaper parallax until you have at least
                 // MIN_PARALLAX_PAGE_SPAN pages
                 int numScrollingPages = getNumScreensExcludingEmptyAndCustom();
-                int parallaxPageSpan = Math.max(MIN_PARALLAX_PAGE_SPAN, numScrollingPages - 1);
+                int parallaxPageSpan;
+                if (mWallpaperIsLiveWallpaper) {
+                    parallaxPageSpan = numScrollingPages - 1;
+                } else {
+                    parallaxPageSpan = Math.max(MIN_PARALLAX_PAGE_SPAN, numScrollingPages - 1);
+                }
+                mNumPagesForWallpaperParallax = parallaxPageSpan;
+
                 // On RTL devices, push the wallpaper offset to the right if we don't have enough
                 // pages (ie if numScrollingPages < MIN_PARALLAX_PAGE_SPAN)
                 int padding = isLayoutRtl() ? parallaxPageSpan - numScrollingPages + 1 : 0;
@@ -1391,7 +1402,11 @@ public class Workspace extends SmoothPagedView
 
         private void setWallpaperOffsetSteps() {
             // Set wallpaper offset steps (1 / (number of screens - 1))
-            mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 1.0f);
+            float xOffset = 1.0f / mNumPagesForWallpaperParallax;
+            if (xOffset != mLastSetWallpaperOffsetSteps) {
+                mWallpaperManager.setWallpaperOffsetSteps(xOffset, 1.0f);
+                mLastSetWallpaperOffsetSteps = xOffset;
+            }
         }
 
         public void setFinalX(float x) {
@@ -1700,6 +1715,10 @@ public class Workspace extends SmoothPagedView
         if (LauncherAppState.getInstance().hasWallpaperChangedSinceLastCheck()) {
             setWallpaperDimension();
         }
+        mWallpaperIsLiveWallpaper = mWallpaperManager.getWallpaperInfo() != null;
+        // Force the wallpaper offset steps to be set again, because another app might have changed
+        // them
+        mLastSetWallpaperOffsetSteps = 0f;
     }
 
     @Override

From dadd984a891a574cebf3dfd38a454a0e6a4228b3 Mon Sep 17 00:00:00 2001
From: Derek Prothro <dprothro@google.com>
Date: Fri, 17 Jan 2014 13:43:50 -0500
Subject: [PATCH 145/147] Fix black flash during rotation of -1 screen with
 GEL.

We need to make sure the custom content is adding synchronously
while the rest of the workspace is being created. If we wait
for it to be added in a separate run task, we see a black
flash during rotation.
Also rename a few methods and remove obsolete methods.

Bug: 11802691
Change-Id: I3f6500aa1fabe68cef59ad8c764877f954986a99
---
 src/com/android/launcher3/Launcher.java  | 27 ++++++------------------
 src/com/android/launcher3/Workspace.java |  4 ++--
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 709f4cf532..86b4f94605 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -505,11 +505,11 @@ public class Launcher extends Activity
     }
 
     /**
-     * To be overridden by subclasses to create the custom content and call
+     * To be overridden by subclasses to populate the custom content container and call
      * {@link #addToCustomContentPage}. This will only be invoked if
      * {@link #hasCustomContentToLeft()} is {@code true}.
      */
-    protected void addCustomContentToLeft() {
+    protected void populateCustomContentContainer() {
     }
 
     /**
@@ -539,8 +539,8 @@ public class Launcher extends Activity
 
         if (!mWorkspace.hasCustomContent() && hasCustomContentToLeft()) {
             // Create the custom content page and call the subclass to populate it.
-            mWorkspace.createCustomContentPage();
-            addCustomContentToLeft();
+            mWorkspace.createCustomContentContainer();
+            populateCustomContentContainer();
         } else if (mWorkspace.hasCustomContent() && !hasCustomContentToLeft()) {
             mWorkspace.removeCustomContentPage();
         }
@@ -1033,12 +1033,6 @@ public class Launcher extends Activity
         }
     }
 
-    protected void onFinishBindingItems() {
-        if (mWorkspace != null && hasCustomContentToLeft() && mWorkspace.hasCustomContent()) {
-            addCustomContentToLeft();
-        }
-    }
-
     QSBScroller mQsbScroller = new QSBScroller() {
         int scrollY = 0;
 
@@ -3788,9 +3782,9 @@ public class Launcher extends Activity
 
         // Create the custom content page (this call updates mDefaultScreen which calls
         // setCurrentPage() so ensure that all pages are added before calling this).
-        // The actual content of the custom page will be added during onFinishBindingItems().
-        if (!mWorkspace.hasCustomContent() && hasCustomContentToLeft()) {
-            mWorkspace.createCustomContentPage();
+        if (hasCustomContentToLeft()) {
+            mWorkspace.createCustomContentContainer();
+            populateCustomContentContainer();
         }
     }
 
@@ -4072,13 +4066,6 @@ public class Launcher extends Activity
             mWorkspace.getUniqueComponents(true, null);
             mIntentsOnWorkspaceFromUpgradePath = mWorkspace.getUniqueComponents(true, null);
         }
-
-        mWorkspace.post(new Runnable() {
-            @Override
-            public void run() {
-                onFinishBindingItems();
-            }
-        });
     }
 
     public boolean isAllAppsButtonRank(int rank) {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 359fd86401..c20677d794 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -421,7 +421,7 @@ public class Workspace extends SmoothPagedView
         setClipChildren(false);
         setClipToPadding(false);
         setChildrenDrawnWithCacheEnabled(true);
-        
+
         setMinScale(mOverviewModeShrinkFactor);
         setupLayoutTransition();
 
@@ -562,7 +562,7 @@ public class Workspace extends SmoothPagedView
         return screenId;
     }
 
-    public void createCustomContentPage() {
+    public void createCustomContentContainer() {
         CellLayout customScreen = (CellLayout)
                 mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
         customScreen.disableBackground();

From f47cc890e9475b31acd1416de57d32062d395e9e Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Fri, 31 Jan 2014 15:57:58 -0800
Subject: [PATCH 146/147] Import translations. DO NOT MERGE

Change-Id: I630533bcc5d004fc677f54233f8d0578e119ab4e
Auto-generated-cl: translation import
---
 res/values-lo-rLA/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6a12dbdbb6..79a0a4a48c 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -95,8 +95,8 @@
     <string name="migration_cling_use_default" msgid="2626475813981258626">"ເລີ່ມຕົ້ນໃໝ່"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ຈັດການພື້ນທີ່ຂອງທ່ານ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"ແຕະຄ້າງໄວ້ທີ່ພາບພື້ນຫຼັງເພື່ອຈັດການພາບພື້ນຫຼັງ, ວິດເຈັດແລະການຕັ້ງຄ່າ."</string>
-    <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ່"</string>
-    <string name="folder_cling_create_folder" msgid="6158215559475836131">"ເພື່ອສ້າງອັນໃໝ່ແບບນີ້, ແຕະຄ້າງໄວ້ທີ່ແອັບຯ ແລ້ວຍ້າຍມັນໄປຫາໂຕອື່ນ."</string>
+    <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ"</string>
+    <string name="folder_cling_create_folder" msgid="6158215559475836131">"ເພື່ອ​ສ້າງ​ອັນໃໝ່​ແບບນີ້ ໃຫ້​ແຕະ​ຄ້າງ​ໄວ້​ທີ່​ແອັບຯ​ທີ່​ຕ້ອງການ​ຍ້າຍ​ແລ້ວ​ລາກ​ມັນ​ໄປ​ຫາ​ໂຕ​ອື່ນ."</string>
     <string name="cling_dismiss" msgid="8962359497601507581">"ຕົກລົງ"</string>
     <string name="folder_opened" msgid="94695026776264709">"ເປີດໂຟນເດີແລ້ວ, <xliff:g id="WIDTH">%1$d</xliff:g> ຄູນ <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="1884479294466410023">"ສຳພັດເພື່ອປິດໂຟນເດີ"</string>

From e68504f4a11296197c11b35aad71346b24af11be Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Mon, 3 Feb 2014 16:50:19 -0800
Subject: [PATCH 147/147] Import translations. DO NOT MERGE

Change-Id: Ieaf2484f1b08841a5fecd5050c4df75125e1cecf
Auto-generated-cl: translation import
---
 res/values-lo-rLA/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6a12dbdbb6..79a0a4a48c 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -95,8 +95,8 @@
     <string name="migration_cling_use_default" msgid="2626475813981258626">"ເລີ່ມຕົ້ນໃໝ່"</string>
     <string name="workspace_cling_title" msgid="5626202359865825661">"ຈັດການພື້ນທີ່ຂອງທ່ານ"</string>
     <string name="workspace_cling_move_item" msgid="528201129978005352">"ແຕະຄ້າງໄວ້ທີ່ພາບພື້ນຫຼັງເພື່ອຈັດການພາບພື້ນຫຼັງ, ວິດເຈັດແລະການຕັ້ງຄ່າ."</string>
-    <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ່"</string>
-    <string name="folder_cling_create_folder" msgid="6158215559475836131">"ເພື່ອສ້າງອັນໃໝ່ແບບນີ້, ແຕະຄ້າງໄວ້ທີ່ແອັບຯ ແລ້ວຍ້າຍມັນໄປຫາໂຕອື່ນ."</string>
+    <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ"</string>
+    <string name="folder_cling_create_folder" msgid="6158215559475836131">"ເພື່ອ​ສ້າງ​ອັນໃໝ່​ແບບນີ້ ໃຫ້​ແຕະ​ຄ້າງ​ໄວ້​ທີ່​ແອັບຯ​ທີ່​ຕ້ອງການ​ຍ້າຍ​ແລ້ວ​ລາກ​ມັນ​ໄປ​ຫາ​ໂຕ​ອື່ນ."</string>
     <string name="cling_dismiss" msgid="8962359497601507581">"ຕົກລົງ"</string>
     <string name="folder_opened" msgid="94695026776264709">"ເປີດໂຟນເດີແລ້ວ, <xliff:g id="WIDTH">%1$d</xliff:g> ຄູນ <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="1884479294466410023">"ສຳພັດເພື່ອປິດໂຟນເດີ"</string>