Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev (cde9d6b3) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ class ControlsProviderLifecycleManager(

	companion object {		companion object {
	private const val BIND_RETRY_DELAY = 1000L // ms		private const val BIND_RETRY_DELAY = 1000L // ms
	private const val LOAD_TIMEOUT_SECONDS = 30L // seconds		private const val LOAD_TIMEOUT_SECONDS = 20L // seconds
	private const val MAX_BIND_RETRIES = 5		private const val MAX_BIND_RETRIES = 5
	private const val DEBUG = true		private const val DEBUG = true
	private val BIND_FLAGS = Context.BIND_AUTO_CREATE or Context.BIND_FOREGROUND_SERVICE		private val BIND_FLAGS = Context.BIND_AUTO_CREATE or Context.BIND_FOREGROUND_SERVICE

+24 −22

Original line number	Original line	Diff line number	Diff line
	@@ -174,7 +174,7 @@ class ControlsFavoritingActivity @Inject constructor(
	subtitleView.visibility = View.GONE		subtitleView.visibility = View.GONE
	} else {		} else {
	statusText.visibility = View.GONE		statusText.visibility = View.GONE
	}
	pageIndicator.setNumPages(listOfStructures.size)		pageIndicator.setNumPages(listOfStructures.size)
	pageIndicator.setLocation(0f)		pageIndicator.setLocation(0f)
	pageIndicator.visibility =		pageIndicator.visibility =
	@@ -192,13 +192,15 @@ class ControlsFavoritingActivity @Inject constructor(
	pageIndicator.getLocationOnScreen(p)		pageIndicator.getLocationOnScreen(p)
	val x = p[0] + pageIndicator.width / 2		val x = p[0] + pageIndicator.width / 2
	val y = p[1] + pageIndicator.height		val y = p[1] + pageIndicator.height
	mTooltipManager?.show(R.string.controls_structure_tooltip, x, y)		mTooltipManager?.show(
			R.string.controls_structure_tooltip, x, y)
	}		}
	}		}
	})		})
	}.start()		}.start()
	ControlsAnimations.enterAnimation(structurePager).start()		ControlsAnimations.enterAnimation(structurePager).start()
	}		}
			}
	}, Consumer { runnable -> cancelLoadRunnable = runnable })		}, Consumer { runnable -> cancelLoadRunnable = runnable })
	}		}
	}		}