Merge "Cancels loading when moving out of Favorites screen" into rvc-dev am:... (63deca2c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingController.kt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,8 +38,9 @@ interface ControlsBindingController : UserAwareController {
	*		*
	* @param component The [ComponentName] of the service to bind		* @param component The [ComponentName] of the service to bind
	* @param callback a callback to return the loaded controls to (or an error).		* @param callback a callback to return the loaded controls to (or an error).
			* @return a runnable to cancel the load
	*/		*/
	fun bindAndLoad(component: ComponentName, callback: LoadCallback)		fun bindAndLoad(component: ComponentName, callback: LoadCallback): Runnable

	/**		/**
	* Request to bind to the given service.		* Request to bind to the given service.

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingControllerImpl.kt

+12 −3

Original line number	Original line	Diff line number	Diff line
	@@ -116,8 +116,10 @@ open class ControlsBindingControllerImpl @Inject constructor(
	override fun bindAndLoad(		override fun bindAndLoad(
	component: ComponentName,		component: ComponentName,
	callback: ControlsBindingController.LoadCallback		callback: ControlsBindingController.LoadCallback
	) {		): Runnable {
	retrieveLifecycleManager(component)?.maybeBindAndLoad(LoadSubscriber(callback))		val subscriber = LoadSubscriber(callback)
			retrieveLifecycleManager(component)?.maybeBindAndLoad(subscriber)
			return subscriber.loadCancel()
	}		}

	override fun subscribe(structureInfo: StructureInfo) {		override fun subscribe(structureInfo: StructureInfo) {
	@@ -208,7 +210,6 @@ open class ControlsBindingControllerImpl @Inject constructor(
	) : CallbackRunnable(token) {		) : CallbackRunnable(token) {
	override fun doRun() {		override fun doRun() {
	callback.accept(list)		callback.accept(list)
	provider?.unbindService()
	}		}
	}		}

	@@ -292,8 +293,14 @@ open class ControlsBindingControllerImpl @Inject constructor(
	) : IControlsSubscriber.Stub() {		) : IControlsSubscriber.Stub() {
	val loadedControls = ArrayList<Control>()		val loadedControls = ArrayList<Control>()
	var hasError = false		var hasError = false
			private var _loadCancelInternal: (() -> Unit)? = null
			fun loadCancel() = Runnable {
			Log.d(TAG, "Cancel load requested")
			_loadCancelInternal?.invoke()
			}

	override fun onSubscribe(token: IBinder, subs: IControlsSubscription) {		override fun onSubscribe(token: IBinder, subs: IControlsSubscription) {
			_loadCancelInternal = subs::cancel
	backgroundExecutor.execute(OnSubscribeRunnable(token, subs))		backgroundExecutor.execute(OnSubscribeRunnable(token, subs))
	}		}

	@@ -302,10 +309,12 @@ open class ControlsBindingControllerImpl @Inject constructor(
	}		}
	override fun onError(token: IBinder, s: String) {		override fun onError(token: IBinder, s: String) {
	hasError = true		hasError = true
			_loadCancelInternal = {}
	backgroundExecutor.execute(OnLoadErrorRunnable(token, s, callback))		backgroundExecutor.execute(OnLoadErrorRunnable(token, s, callback))
	}		}

	override fun onComplete(token: IBinder) {		override fun onComplete(token: IBinder) {
			_loadCancelInternal = {}
	if (!hasError) {		if (!hasError) {
	backgroundExecutor.execute(OnLoadRunnable(token, loadedControls, callback))		backgroundExecutor.execute(OnLoadRunnable(token, loadedControls, callback))
	}		}

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsController.kt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,11 @@ interface ControlsController : UserAwareController {
	dataCallback: Consumer<LoadData>		dataCallback: Consumer<LoadData>
	)		)

			/**
			* Cancels a pending load call
			*/
			fun cancelLoad()

	/**		/**
	* Request to subscribe for favorited controls per structure		* Request to subscribe for favorited controls per structure
	*		*

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt

+14 −5

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,8 @@ class ControlsControllerImpl @Inject constructor (

	private var userChanging: Boolean = true		private var userChanging: Boolean = true

			private var loadCanceller: Runnable? = null

	private var currentUser = UserHandle.of(ActivityManager.getCurrentUser())		private var currentUser = UserHandle.of(ActivityManager.getCurrentUser())
	override val currentUserId		override val currentUserId
	get() = currentUser.identifier		get() = currentUser.identifier
	@@ -213,8 +215,9 @@ class ControlsControllerImpl @Inject constructor (
	if (!confirmAvailability()) {		if (!confirmAvailability()) {
	if (userChanging) {		if (userChanging) {
	// Try again later, userChanging should not last forever. If so, we have bigger		// Try again later, userChanging should not last forever. If so, we have bigger
	// problems		// problems. This will return a runnable that allows to cancel the delayed version,
	executor.executeDelayed(		// it will not be able to cancel the load if
			loadCanceller = executor.executeDelayed(
	{ loadForComponent(componentName, dataCallback) },		{ loadForComponent(componentName, dataCallback) },
	USER_CHANGE_RETRY_DELAY,		USER_CHANGE_RETRY_DELAY,
	TimeUnit.MILLISECONDS		TimeUnit.MILLISECONDS
	@@ -224,10 +227,11 @@ class ControlsControllerImpl @Inject constructor (
	}		}
	return		return
	}		}
	bindingController.bindAndLoad(		loadCanceller = bindingController.bindAndLoad(
	componentName,		componentName,
	object : ControlsBindingController.LoadCallback {		object : ControlsBindingController.LoadCallback {
	override fun accept(controls: List<Control>) {		override fun accept(controls: List<Control>) {
			loadCanceller = null
	executor.execute {		executor.execute {
	val favoritesForComponentKeys = Favorites		val favoritesForComponentKeys = Favorites
	.getControlsForComponent(componentName).map { it.controlId }		.getControlsForComponent(componentName).map { it.controlId }
	@@ -251,12 +255,12 @@ class ControlsControllerImpl @Inject constructor (
	controlsWithFavorite,		controlsWithFavorite,
	favoritesForComponentKeys		favoritesForComponentKeys
	)		)

	dataCallback.accept(loadData)		dataCallback.accept(loadData)
	}		}
	}		}

	override fun error(message: String) {		override fun error(message: String) {
			loadCanceller = null
	executor.execute {		executor.execute {
	val loadData = Favorites.getControlsForComponent(componentName)		val loadData = Favorites.getControlsForComponent(componentName)
	.let { controls ->		.let { controls ->
	@@ -269,7 +273,6 @@ class ControlsControllerImpl @Inject constructor (
	true		true
	)		)
	}		}

	dataCallback.accept(loadData)		dataCallback.accept(loadData)
	}		}
	}		}
	@@ -277,6 +280,12 @@ class ControlsControllerImpl @Inject constructor (
	)		)
	}		}

			override fun cancelLoad() {
			loadCanceller?.let {
			executor.execute(it)
			}
			}

	private fun createRemovedStatus(		private fun createRemovedStatus(
	componentName: ComponentName,		componentName: ComponentName,
	controlInfo: ControlInfo,		controlInfo: ControlInfo,

packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt

+15 −8

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,7 @@ class ControlsFavoritingActivity @Inject constructor(
	private lateinit var iconFrame: View		private lateinit var iconFrame: View
	private lateinit var pageIndicator: ManagementPageIndicator		private lateinit var pageIndicator: ManagementPageIndicator
	private var mTooltipManager: TooltipManager? = null		private var mTooltipManager: TooltipManager? = null
			private lateinit var doneButton: View
	private var listOfStructures = emptyList<StructureContainer>()		private var listOfStructures = emptyList<StructureContainer>()

	private lateinit var comparator: Comparator<StructureContainer>		private lateinit var comparator: Comparator<StructureContainer>
	@@ -137,6 +138,7 @@ class ControlsFavoritingActivity @Inject constructor(
	StructureContainer(it.key, AllModel(it.value, favoriteKeys, emptyZoneString))		StructureContainer(it.key, AllModel(it.value, favoriteKeys, emptyZoneString))
	}.sortedWith(comparator)		}.sortedWith(comparator)
	executor.execute {		executor.execute {
			doneButton.isEnabled = true
	structurePager.adapter = StructureAdapter(listOfStructures)		structurePager.adapter = StructureAdapter(listOfStructures)
	if (error) {		if (error) {
	statusText.text = resources.getText(R.string.controls_favorite_load_error)		statusText.text = resources.getText(R.string.controls_favorite_load_error)
	@@ -180,6 +182,7 @@ class ControlsFavoritingActivity @Inject constructor(
	layoutResource = R.layout.controls_management_favorites		layoutResource = R.layout.controls_management_favorites
	inflate()		inflate()
	}		}

	statusText = requireViewById(R.id.status_message)		statusText = requireViewById(R.id.status_message)
	if (shouldShowTooltip()) {		if (shouldShowTooltip()) {
	mTooltipManager = TooltipManager(statusText.context,		mTooltipManager = TooltipManager(statusText.context,
	@@ -248,17 +251,20 @@ class ControlsFavoritingActivity @Inject constructor(
	}		}
	}		}

	requireViewById<Button>(R.id.done).setOnClickListener {		doneButton = requireViewById<Button>(R.id.done).apply {
			isEnabled = false
			setOnClickListener {
	if (component == null) return@setOnClickListener		if (component == null) return@setOnClickListener
	listOfStructures.forEach {		listOfStructures.forEach {
	val favoritesForStorage = it.model.favorites.map { it.build() }		val favoritesForStorage = it.model.favorites.map { it.build() }
	controller.replaceFavoritesForStructure(StructureInfo(component!!, it.structureName,		controller.replaceFavoritesForStructure(
	favoritesForStorage))		StructureInfo(component!!, it.structureName, favoritesForStorage)
			)
	}		}

	finishAffinity()		finishAffinity()
	}		}
	}		}
			}

	override fun onPause() {		override fun onPause() {
	super.onPause()		super.onPause()
	@@ -273,6 +279,7 @@ class ControlsFavoritingActivity @Inject constructor(
	override fun onDestroy() {		override fun onDestroy() {
	currentUserTracker.stopTracking()		currentUserTracker.stopTracking()
	listingController.removeCallback(listingCallback)		listingController.removeCallback(listingCallback)
			controller.cancelLoad()
	super.onDestroy()		super.onDestroy()
	}		}