diff options
Diffstat (limited to 'src/com/android/launcher2')
3 files changed, 23 insertions, 15 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 96cf1dc4e..aeb276a65 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -1378,6 +1378,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override public void reset() { + // If we have reset, then we should not continue to restore the previous state + mSaveInstanceStateItemIndex = -1; + AppsCustomizeTabHost tabHost = getTabHost(); String tag = tabHost.getCurrentTabTag(); if (tag != null) { @@ -1385,6 +1388,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen tabHost.setCurrentTabFromContent(ContentType.Applications); } } + if (mCurrentPage != 0) { invalidatePageData(0); } diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java index ed8f29942..3cb37a724 100644 --- a/src/com/android/launcher2/InstallShortcutReceiver.java +++ b/src/com/android/launcher2/InstallShortcutReceiver.java @@ -16,8 +16,6 @@ package com.android.launcher2; -import java.util.ArrayList; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -25,6 +23,8 @@ import android.widget.Toast; import com.android.launcher.R; +import java.util.ArrayList; + public class InstallShortcutReceiver extends BroadcastReceiver { public static final String ACTION_INSTALL_SHORTCUT = "com.android.launcher.action.INSTALL_SHORTCUT"; @@ -41,16 +41,21 @@ public class InstallShortcutReceiver extends BroadcastReceiver { } int screen = Launcher.getScreen(); - - if (!installShortcut(context, data, screen)) { + String[] errorMsgs = {""}; + if (!installShortcut(context, data, screen, errorMsgs)) { // The target screen is full, let's try the other screens for (int i = 0; i < Launcher.SCREEN_COUNT; i++) { - if (i != screen && installShortcut(context, data, i)) break; + if (i != screen && installShortcut(context, data, i, errorMsgs)) break; } } + + if (!errorMsgs[0].isEmpty()) { + Toast.makeText(context, errorMsgs[0], + Toast.LENGTH_SHORT).show(); + } } - private boolean installShortcut(Context context, Intent data, int screen) { + private boolean installShortcut(Context context, Intent data, int screen, String[] errorMsgs) { String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME); if (findEmptyCell(context, mCoordinates, screen)) { @@ -69,21 +74,18 @@ public class InstallShortcutReceiver extends BroadcastReceiver { LauncherSettings.Favorites.CONTAINER_DESKTOP, screen, mCoordinates[0], mCoordinates[1], true); if (info != null) { - Toast.makeText(context, context.getString(R.string.shortcut_installed, name), - Toast.LENGTH_SHORT).show(); + errorMsgs[0] = context.getString(R.string.shortcut_installed, name); } else { return false; } } else { - Toast.makeText(context, context.getString(R.string.shortcut_duplicate, name), - Toast.LENGTH_SHORT).show(); + errorMsgs[0] = context.getString(R.string.shortcut_duplicate, name); } return true; } } else { - Toast.makeText(context, context.getString(R.string.out_of_space), - Toast.LENGTH_SHORT).show(); + errorMsgs[0] = context.getString(R.string.out_of_space); } return false; diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher2/LauncherViewPropertyAnimator.java index f5becdcbd..b31179d6a 100644 --- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java +++ b/src/com/android/launcher2/LauncherViewPropertyAnimator.java @@ -67,7 +67,9 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi @Override public void cancel() { - mViewPropertyAnimator.cancel(); + if (mViewPropertyAnimator != null) { + mViewPropertyAnimator.cancel(); + } } @Override @@ -82,7 +84,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi @Override public long getDuration() { - return mViewPropertyAnimator.getDuration(); + return mDuration; } @Override @@ -92,7 +94,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi @Override public long getStartDelay() { - return mViewPropertyAnimator.getStartDelay(); + return mStartDelay; } @Override |