Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev (7cd60859) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1074,6 +1074,7 @@ public class Launcher extends StatefulActivity<LauncherState>
	logStopAndResume(false /* isResume */);		logStopAndResume(false /* isResume */);
	mAppWidgetHolder.setActivityStarted(false);		mAppWidgetHolder.setActivityStarted(false);
	NotificationListener.removeNotificationsChangedListener(getPopupDataProvider());		NotificationListener.removeNotificationsChangedListener(getPopupDataProvider());
			FloatingIconView.resetIconLoadResult();
	}		}

	@Override		@Override

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -571,6 +571,13 @@ public class FloatingIconView extends FrameLayout implements
	return result;		return result;
	}		}

			/**
			* Resets the static icon load result used for preloading the icon for a launching app.
			*/
			public static void resetIconLoadResult() {
			sIconLoadResult = null;
			}

	/**		/**
	* Creates a floating icon view for {@param originalView}.		* Creates a floating icon view for {@param originalView}.
	* @param originalView The view to copy		* @param originalView The view to copy
	@@ -608,7 +615,7 @@ public class FloatingIconView extends FrameLayout implements
	}		}
	view.setOriginalDrawableBackground(view.mIconLoadResult.btvDrawable);		view.setOriginalDrawableBackground(view.mIconLoadResult.btvDrawable);
	}		}
	sIconLoadResult = null;		resetIconLoadResult();

	// Match the position of the original view.		// Match the position of the original view.
	view.matchPositionOf(launcher, originalView, isOpening, positionOut);		view.matchPositionOf(launcher, originalView, isOpening, positionOut);