Merge branch '000-s-fixes' into 'v1-s' (30407746) · Commits · e / os / BlissLauncher3

bliss/src/foundation/e/bliss/utils/BlissUtils.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -88,9 +88,9 @@ fun getUninstallTarget(launcher: Launcher, item: ItemInfo?): ComponentName? {
		}

		if (intent != null) {
		val info: LauncherActivityInfo =
		val info: LauncherActivityInfo? =
		launcher.getSystemService(LauncherApps::class.java).resolveActivity(intent, user)
		if (info.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0) {
		if (info != null && info.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0) {
		return info.componentName
		}
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@ import android.content.Context
		import com.android.launcher3.R

		class BlissAppWidgetHost(val context: Context) : AppWidgetHost(context, WIDGET_HOST_ID) {
		private val widgetsDbHelper = WidgetsDbHelper.getInstance(context)

		fun createView(widgetId: Int, widgetInfo: AppWidgetProviderInfo): AppWidgetHostView {
		return createView(context, widgetId, widgetInfo).apply {
		val widgetTopBottom =
		@@ -39,7 +37,6 @@ class BlissAppWidgetHost(val context: Context) : AppWidgetHost(context, WIDGET_H

		override fun onAppWidgetRemoved(appWidgetId: Int) {
		deleteAppWidgetId(appWidgetId)
		widgetsDbHelper.delete(appWidgetId)
		}

		companion object {

+13 −3

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont
		opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, height)
		}
		val blacklistedComponents =
		context.resources.getStringArray(R.array.blacklisted_widget_options)
		mLauncher.resources.getStringArray(R.array.blacklisted_widget_options)
		if (!blacklistedComponents.contains(info.provider.className)) {
		widgetManager.updateAppWidgetOptions(it.appWidgetId, opts)
		}
		@@ -213,9 +213,19 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont
		private val mAppMonitorCallback: LauncherAppMonitorCallback =
		object : LauncherAppMonitorCallback {
		override fun onPackageRemoved(packageName: String?, user: UserHandle?) {
		if (!::widgetsDbHelper.isInitialized) {
		return
		}
		val widgets =
		widgetsDbHelper.getWidgets().filter {
		it.component.packageName == packageName
		}
		if (packageName != null && widgets.isNotEmpty()) {
		widgets.map { it.widgetId }.forEach { widgetsDbHelper.delete(it) }
		rebindWidgets()
		}
		}
		}

		private var initialWidgetsAdded: Boolean
		set(value) {
		@@ -440,7 +450,7 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont
		}

		val blacklistedComponents =
		context.resources.getStringArray(R.array.blacklisted_widget_options)
		launcher.resources.getStringArray(R.array.blacklisted_widget_options)
		if (!blacklistedComponents.contains(info.provider.className)) {
		mWidgetManager.updateAppWidgetOptions(it.appWidgetId, opts)
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ class WidgetsActivity : Activity(), OnActionClickListener {
		private lateinit var mAddedWidgetsAdapter: AddedWidgetsAdapter
		private lateinit var mAppWidgetManager: AppWidgetManager
		private lateinit var mAppWidgetHost: BlissAppWidgetHost
		private lateinit var widgetsDbHelper: WidgetsDbHelper

		private val mCompositeDisposable = CompositeDisposable()

		@@ -50,6 +51,7 @@ class WidgetsActivity : Activity(), OnActionClickListener {

		mAppWidgetManager = AppWidgetManager.getInstance(this)
		mAppWidgetHost = BlissAppWidgetHost(this)
		widgetsDbHelper = WidgetsDbHelper.getInstance(this)

		val addedWidgets = findViewById<RecyclerView>(R.id.added_widgets_recycler_view)
		addedWidgets.apply {
		@@ -76,6 +78,7 @@ class WidgetsActivity : Activity(), OnActionClickListener {

		override fun removeWidget(id: Int) {
		mAppWidgetHost.onAppWidgetRemoved(id)
		widgetsDbHelper.delete(id)
		CoroutineScope(Dispatchers.Main).launch {
		WidgetContainer.WidgetFragment.eventFlow.emit(Unit)
		}