Merge "Remove top level interface implementation from PrivacyDotViewController" (04a4db06) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt

+8 −7

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ class PrivacyDotViewController @Inject constructor(
		private val configurationController: ConfigurationController,
		private val contentInsetsProvider: StatusBarContentInsetsProvider,
		private val animationScheduler: SystemStatusAnimationScheduler
		) : StatusBarContentInsetsChangedListener {
		) {
		private var sbHeightPortrait = 0
		private var sbHeightLandscape = 0

		@@ -98,7 +98,13 @@ class PrivacyDotViewController @Inject constructor(
		get() = if (!this::tl.isInitialized) sequenceOf() else sequenceOf(tl, tr, br, bl)

		init {
		contentInsetsProvider.addCallback(this)
		contentInsetsProvider.addCallback(object : StatusBarContentInsetsChangedListener {
		override fun onStatusBarContentInsetsChanged() {
		dlog("onStatusBarContentInsetsChanged: ")
		setNewLayoutRects()
		}
		})

		configurationController.addCallback(object : ConfigurationController.ConfigurationListener {
		override fun onLayoutDirectionChanged(isRtl: Boolean) {
		synchronized(this) {
		@@ -533,11 +539,6 @@ class PrivacyDotViewController @Inject constructor(
		return -1
		}

		override fun onStatusBarContentInsetsChanged() {
		Log.d(TAG, "onStatusBarContentInsetsChanged: ")
		setNewLayoutRects()
		}

		// Returns [left, top, right, bottom] aka [seascape, none, landscape, upside-down]
		private fun getLayoutRects(): List<Rect> {
		val left = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_SEASCAPE)