Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev

Browse Source
This commit is contained in:
Matt Pietal
2020-06-22 17:18:42 +00:00
committed by Android (Google) Code Review
parent 72998aeaf7 850f9387e3
commit cde9d6b37f
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -174,30 +174,32 @@ 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.setLocation(0f)
pageIndicator.visibility =
if (listOfStructures.size > 1) View.VISIBLE else View.INVISIBLE
ControlsAnimations.enterAnimation(pageIndicator).apply { pageIndicator.setNumPages(listOfStructures.size)
addListener(object : AnimatorListenerAdapter() { pageIndicator.setLocation(0f)
override fun onAnimationEnd(animation: Animator?) { pageIndicator.visibility =
// Position the tooltip if necessary after animations are complete if (listOfStructures.size > 1) View.VISIBLE else View.INVISIBLE
// so we can get the position on screen. The tooltip is not
// rooted in the layout root. ControlsAnimations.enterAnimation(pageIndicator).apply {
if (pageIndicator.visibility == View.VISIBLE && addListener(object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator?) {
// Position the tooltip if necessary after animations are complete
// so we can get the position on screen. The tooltip is not
// rooted in the layout root.
if (pageIndicator.visibility == View.VISIBLE &&
mTooltipManager != null) { mTooltipManager != null) {
val p = IntArray(2) val p = IntArray(2)
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 })
} }