Fix Icon disappears while dragging and dropping (9c2c37d1) · Commits · e / os / BlissLauncher

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+20 −18

Original line number	Original line	Diff line number	Diff line
	@@ -243,7 +243,6 @@ public class LauncherActivity extends AppCompatActivity implements
	@Override		@Override
	protected void onCreate(Bundle savedInstanceState) {		protected void onCreate(Bundle savedInstanceState) {
	super.onCreate(savedInstanceState);		super.onCreate(savedInstanceState);
	Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
	appProvider = BlissLauncher.getApplication(this).getAppProvider();		appProvider = BlissLauncher.getApplication(this).getAppProvider();

	prepareBroadcastReceivers();		prepareBroadcastReceivers();
	@@ -449,7 +448,6 @@ public class LauncherActivity extends AppCompatActivity implements
	@Override		@Override
	protected void onDestroy() {		protected void onDestroy() {
	super.onDestroy();		super.onDestroy();
	Log.d(TAG, "onDestroy() called");
	TimeChangeBroadcastReceiver.unregister(this, timeChangedReceiver);		TimeChangeBroadcastReceiver.unregister(this, timeChangedReceiver);
	ManagedProfileBroadcastReceiver.unregister(this, managedProfileReceiver);		ManagedProfileBroadcastReceiver.unregister(this, managedProfileReceiver);
	LocalBroadcastManager.getInstance(this).unregisterReceiver(mWeatherReceiver);		LocalBroadcastManager.getInstance(this).unregisterReceiver(mWeatherReceiver);
	@@ -486,7 +484,6 @@ public class LauncherActivity extends AppCompatActivity implements
	updateOrAddShortcut(shortcutAddEvent.getShortcutItem());		updateOrAddShortcut(shortcutAddEvent.getShortcutItem());
	DatabaseManager.getManager(this).saveLayouts(pages, mDock);		DatabaseManager.getManager(this).saveLayouts(pages, mDock);
	Toast.makeText(this, "Shortcut has been added", Toast.LENGTH_SHORT).show();		Toast.makeText(this, "Shortcut has been added", Toast.LENGTH_SHORT).show();
	Log.i(TAG, "onShortcutAddEvent: " + moveTo);
	if (moveTo != -1) {		if (moveTo != -1) {
	mHorizontalPager.setCurrentPage(moveTo);		mHorizontalPager.setCurrentPage(moveTo);
	moveTo = -1;		moveTo = -1;
	@@ -1944,7 +1941,8 @@ public class LauncherActivity extends AppCompatActivity implements
	mWobblingCountDownTimer.cancel();		mWobblingCountDownTimer.cancel();
	}		}
	}		}
	if (dragEvent.getAction() == DragEvent.ACTION_DRAG_LOCATION) {
			else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_LOCATION) {
	// Don't offer rearrange functionality when app is being dragged		// Don't offer rearrange functionality when app is being dragged
	// out of folder window		// out of folder window
	if (getAppDetails(movingApp).container != Constants.CONTAINER_DESKTOP		if (getAppDetails(movingApp).container != Constants.CONTAINER_DESKTOP
	@@ -2015,7 +2013,9 @@ public class LauncherActivity extends AppCompatActivity implements
	mDockReorderAlarm.setAlarm(REORDER_TIMEOUT);		mDockReorderAlarm.setAlarm(REORDER_TIMEOUT);
	}		}
	return true;		return true;
	} else if (dragEvent.getAction() == DragEvent.ACTION_DROP) {		}

			else if (dragEvent.getAction() == DragEvent.ACTION_DROP) {
	cleanupDockReorder(true);		cleanupDockReorder(true);
	cleanupReorder(true);		cleanupReorder(true);
	if (mFolderWindowContainer.getVisibility() != View.VISIBLE) {		if (mFolderWindowContainer.getVisibility() != View.VISIBLE) {
	@@ -2039,9 +2039,8 @@ public class LauncherActivity extends AppCompatActivity implements
	} else {		} else {
	createOrUpdateFolder(true);		createOrUpdateFolder(true);
	}		}

	}
	folderInterest = false;		folderInterest = false;
			}
	} else {		} else {
	cX = dragEvent.getX() - dragShadowBuilder.xOffset;		cX = dragEvent.getX() - dragShadowBuilder.xOffset;
	cY = mDock.getY() + dragEvent.getY() - dragShadowBuilder.yOffset;		cY = mDock.getY() + dragEvent.getY() - dragShadowBuilder.yOffset;
	@@ -2065,6 +2064,7 @@ public class LauncherActivity extends AppCompatActivity implements
	}		}
	return true;		return true;
	}		}

	return true;		return true;
	}		}
	});		});
	@@ -2084,7 +2084,7 @@ public class LauncherActivity extends AppCompatActivity implements
	}		}
	}		}

	if (dragEvent.getAction() == DragEvent.ACTION_DRAG_LOCATION) {		else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_LOCATION) {
	cX = dragEvent.getX() - dragShadowBuilder.xOffset;		cX = dragEvent.getX() - dragShadowBuilder.xOffset;
	cY = mHorizontalPager.getY() + dragEvent.getY()		cY = mHorizontalPager.getY() + dragEvent.getY()
	- dragShadowBuilder.yOffset;		- dragShadowBuilder.yOffset;
	@@ -2197,7 +2197,9 @@ public class LauncherActivity extends AppCompatActivity implements
	}		}
	}		}
	}		}
	} else if (dragEvent.getAction() == DragEvent.ACTION_DROP) {		}

			else if (dragEvent.getAction() == DragEvent.ACTION_DROP) {
	cleanupReorder(true);		cleanupReorder(true);
	cleanupDockReorder(true);		cleanupDockReorder(true);
	if (mFolderWindowContainer.getVisibility() != View.VISIBLE) {		if (mFolderWindowContainer.getVisibility() != View.VISIBLE) {
	@@ -2219,9 +2221,8 @@ public class LauncherActivity extends AppCompatActivity implements
	} else {		} else {
	createOrUpdateFolder(true);		createOrUpdateFolder(true);
	}		}

	}
	folderInterest = false;		folderInterest = false;
			}
	} else {		} else {
	cX = dragEvent.getX() - dragShadowBuilder.xOffset;		cX = dragEvent.getX() - dragShadowBuilder.xOffset;
	cY = mHorizontalPager.getY() + dragEvent.getY()		cY = mHorizontalPager.getY() + dragEvent.getY()
	@@ -2244,13 +2245,18 @@ public class LauncherActivity extends AppCompatActivity implements
	currentItem)).indexOfChild(movingApp));		currentItem)).indexOfChild(movingApp));
	}		}
	}		}
	} else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_ENDED) {		}

			else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_ENDED) {
	if (isDragging) {		if (isDragging) {
	isDragging = false;		isDragging = false;
			}

			if (movingApp.getVisibility() != VISIBLE) {
			movingApp.setVisibility(View.VISIBLE);
	}		}

	if (!dragEvent.getResult()) {		if (!dragEvent.getResult()) {
	movingApp.setVisibility(View.VISIBLE);
	if (mFolderWindowContainer.getVisibility() == View.VISIBLE) {		if (mFolderWindowContainer.getVisibility() == View.VISIBLE) {
	int currentItem = mFolderAppsViewPager.getCurrentItem();		int currentItem = mFolderAppsViewPager.getCurrentItem();
	makeAppWobble(movingApp, true,		makeAppWobble(movingApp, true,
	@@ -2296,6 +2302,7 @@ public class LauncherActivity extends AppCompatActivity implements
	}		}
	DatabaseManager.getManager(LauncherActivity.this).saveLayouts(pages, mDock);		DatabaseManager.getManager(LauncherActivity.this).saveLayouts(pages, mDock);
	}		}

	return true;		return true;
	}		}
	});		});
	@@ -2806,8 +2813,6 @@ public class LauncherActivity extends AppCompatActivity implements
	protected void onNewIntent(Intent intent) {		protected void onNewIntent(Intent intent) {
	super.onNewIntent(intent);		super.onNewIntent(intent);

	Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");

	final boolean alreadyOnHome = hasWindowFocus() &&		final boolean alreadyOnHome = hasWindowFocus() &&
	((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)		((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
	!= Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);		!= Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
	@@ -3104,9 +3109,6 @@ public class LauncherActivity extends AppCompatActivity implements
	seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {		seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
	@Override		@Override
	public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {		public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
	Log.d(TAG,
	"onProgressChanged() called with: seekBar = [" + seekBar + "], progress = ["
	+ progress + "], fromUser = [" + fromUser + "]");
	int newHeight = minHeight + (normalisedDifference * progress);		int newHeight = minHeight + (normalisedDifference * progress);
	LinearLayout.LayoutParams layoutParams =		LinearLayout.LayoutParams layoutParams =
	(LinearLayout.LayoutParams) activeRoundedWidgetView.getLayoutParams();		(LinearLayout.LayoutParams) activeRoundedWidgetView.getLayoutParams();