Merge "Revert "Clear all DragView in onSaveInstanceState"" (49141ccf) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -1682,8 +1682,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
		finishAutoCancelActionMode();

		DragView.removeAllViews(this);

		if (mPendingRequestArgs != null) {
		outState.putParcelable(RUNTIME_STATE_PENDING_REQUEST_ARGS, mPendingRequestArgs);
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -565,19 +565,4 @@ public abstract class DragView<T extends Context & ActivityContext> extends Fram
		iv.setImageDrawable(drawable);
		return iv;
		}

		/**
		* Removes any stray DragView from the DragLayer.
		*/
		public static void removeAllViews(ActivityContext activity) {
		BaseDragLayer dragLayer = activity.getDragLayer();
		// Iterate in reverse order. DragView is added later to the dragLayer,
		// and will be one of the last views.
		for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
		View child = dragLayer.getChildAt(i);
		if (child instanceof DragView) {
		dragLayer.removeView(child);
		}
		}
		}
		}