diff options
author | Winson Chung <winsonc@google.com> | 2012-07-09 17:32:37 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-09 17:32:38 -0700 |
commit | f74f02941820f14ba4c8baaeeb12b75ec552812e (patch) | |
tree | faeb2eff3da64fe9ce9026e8b9d8e7ea70ec016b | |
parent | 92750b1d7852e47ebfcb21601789540edcbfae51 (diff) | |
parent | cb9ab4f3aa04ad60355d119dfedca3052378d8f9 (diff) | |
download | android_packages_apps_Trebuchet-f74f02941820f14ba4c8baaeeb12b75ec552812e.tar.gz android_packages_apps_Trebuchet-f74f02941820f14ba4c8baaeeb12b75ec552812e.tar.bz2 android_packages_apps_Trebuchet-f74f02941820f14ba4c8baaeeb12b75ec552812e.zip |
Merge "Fixing issue where toasts were getting queued. (Bug 6572269)"
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index d55260c86..80fc62fce 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -300,6 +300,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen PendingAddWidgetInfo mCreateWidgetInfo = null; private boolean mDraggingWidget = false; + private Toast mWidgetInstructionToast; + // Deferral of loading widget previews during launcher transitions private boolean mInTransition; private ArrayList<AsyncTaskPageData> mDeferredSyncWidgetPageItems = @@ -577,8 +579,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } else if (v instanceof PagedViewWidget) { // Let the user know that they have to long press to add a widget - Toast.makeText(getContext(), R.string.long_press_widget_to_add, - Toast.LENGTH_SHORT).show(); + if (mWidgetInstructionToast != null) { + mWidgetInstructionToast.cancel(); + } + mWidgetInstructionToast = Toast.makeText(getContext(),R.string.long_press_widget_to_add, + Toast.LENGTH_SHORT); + mWidgetInstructionToast.show(); // Create a little animation to show that the widget can move float offsetY = getResources().getDimensionPixelSize(R.dimen.dragViewOffsetY); |