commit 808ba3dd1b0b2cae7e54e8eee5228cd3b2b6de56
author Sunny Goyal <sunnygoyal@google.com> Tue Jan 20 19:39:44 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 20 19:39:44 2015 +0000
tree b93548f6698b0fd09774c0c0b4ee3ac070f2bee5
parent 295a17aabb3287c8b1f240e4444c0061f427c0b9
parent 54cdef77dbb958a853387957c303e1b872489b00

Merge "Adding accessibility controls" into ub-launcher3-almonte
automerge: 54cdef7

* commit '54cdef77dbb958a853387957c303e1b872489b00':
  Adding accessibility controls

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5d8e136..84476b7 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -757,7 +757,7 @@
                 mWorkspace.removeExtraEmptyScreenDelayed(true, exitSpringLoaded,
                         ON_ACTIVITY_RESULT_ANIMATION_DELAY, false);
             } else if (resultCode == RESULT_OK) {
-                addAppWidgetImpl(appWidgetId, (PendingAddWidgetInfo) mPendingAddInfo, null,
+                addAppWidgetImpl(appWidgetId, mPendingAddInfo, null,
                         mPendingAddWidgetInfo, ON_ACTIVITY_RESULT_ANIMATION_DELAY);
             }
             return;
@@ -2243,12 +2243,12 @@
         mPendingAddInfo.dropPos = null;
     }
 
-    void addAppWidgetImpl(final int appWidgetId, final PendingAddWidgetInfo info, final
+    void addAppWidgetImpl(final int appWidgetId, final ItemInfo info, final
             AppWidgetHostView boundWidget, final LauncherAppWidgetProviderInfo appWidgetInfo) {
         addAppWidgetImpl(appWidgetId, info, boundWidget, appWidgetInfo, 0);
     }
 
-    void addAppWidgetImpl(final int appWidgetId, final PendingAddWidgetInfo info,
+    void addAppWidgetImpl(final int appWidgetId, final ItemInfo info,
             final AppWidgetHostView boundWidget, final LauncherAppWidgetProviderInfo appWidgetInfo,
             int delay) {
         if (appWidgetInfo.configure != null) {