Merge branch 'dev' with version 1.2.1 (f34b6b72) · Commits · e / os / BlissLauncher

app/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ apply plugin: 'io.fabric'
		// Manifest version information!
		def versionMajor = 1
		def versionMinor = 2
		def versionPatch = 0
		def versionPatch = 1

		android {
		compileSdkVersion rootProject.ext.compileSdkVersion

+0 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,6 @@ public class IconsHandler {
		cacheStoreDrawable(userHandle.addUserSuffixToString(componentName.flattenToString(), '/'), badgedIcon);
		}
		}

		}
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -32,10 +32,11 @@ public class PackageAddedRemovedHandler extends BroadcastReceiver {
		return;
		}

		BlissLauncher.getApplication(ctx).getIconsHandler().clearAll();
		BlissLauncher.getApplication(ctx).resetIconsHandler();

		AppAddEvent event = new AppAddEvent(packageName, user);
		EventRelay.getInstance().push(event);
		BlissLauncher.getApplication(ctx).getAppProvider().reload();
		}

		if ("android.intent.action.PACKAGE_CHANGED".equalsIgnoreCase(action)) {
		@@ -45,14 +46,16 @@ public class PackageAddedRemovedHandler extends BroadcastReceiver {
		launchIntent.getComponent(), user);
		}

		BlissLauncher.getApplication(ctx).getIconsHandler().clearAll();
		BlissLauncher.getApplication(ctx).resetIconsHandler();

		AppChangeEvent event = new AppChangeEvent(packageName, user);
		EventRelay.getInstance().push(event);
		BlissLauncher.getApplication(ctx).getAppProvider().reload();
		}
		if ("android.intent.action.PACKAGE_REMOVED".equals(action) && !replacing) {
		AppRemoveEvent event = new AppRemoveEvent(packageName, user);
		EventRelay.getInstance().push(event);
		BlissLauncher.getApplication(ctx).getAppProvider().reload();
		}
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ public class RoundedWidgetView extends AppWidgetHostView {
		private long _down;
		private boolean mChildrenFocused;

		private boolean activated = false;

		public RoundedWidgetView(Context context) {
		super(context);
		this.mContext = context;
		@@ -144,12 +146,18 @@ public class RoundedWidgetView extends AppWidgetHostView {
		ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
		resizeBorder.setLayoutParams(layoutParams);
		addView(resizeBorder);
		activated = true;
		}

		public void removeBorder() {
		if (resizeBorder != null) {
		removeView(resizeBorder);
		resizeBorder = null;
		activated = false;
		}
		}

		public boolean isWidgetActivated() {
		return activated;
		}
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ public class AppProvider {
		synchronized (AppProvider.class) {
		if (sInstance == null) {
		sInstance = new AppProvider(context);
		//sInstance.reload(false);
		sInstance.reload();
		}
		}
		}
		@@ -205,6 +205,11 @@ public class AppProvider {

		public synchronized void reload() {
		Log.d(TAG, "reload() called");

		if(mLauncherItems != null && mLauncherItems.size() > 0) {
		mAppsRepository.updateAppsRelay(mLauncherItems);
		}

		initializeAppLoading(new LoadAppsTask());
		if (Utilities.ATLEAST_OREO) {
		initializeShortcutsLoading(new LoadShortcutTask());
		@@ -400,6 +405,7 @@ public class AppProvider {
		shortcutItem.container = databaseItem.container;
		shortcutItem.screenId = databaseItem.screenId;
		shortcutItem.cell = databaseItem.cell;
		shortcutItem.user = new UserHandle();
		return shortcutItem;
		}

		@@ -450,7 +456,7 @@ public class AppProvider {
		}

		public void clear() {
		sInstance.mContext = null;
		sInstance = null;
		}

		public synchronized boolean isRunning() {