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

Merge "Fix warnings" into tm-dev

Browse Source
This commit is contained in:
Justin Weir
2022-04-29 17:28:42 +00:00
committed by Android (Google) Code Review
parent c1a0dc2c61 e2fb4b8166
commit f3aafb7a2f
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
View File

@@ -127,7 +127,7 @@ class MediaCarouselController @Inject constructor(
private val visualStabilityCallback: OnReorderingAllowedListener private val visualStabilityCallback: OnReorderingAllowedListener
private var needsReordering: Boolean = false private var needsReordering: Boolean = false
private var keysNeedRemoval = mutableSetOf<String>() private var keysNeedRemoval = mutableSetOf<String>()
protected var shouldScrollToActivePlayer: Boolean = false var shouldScrollToActivePlayer: Boolean = false
private var isRtl: Boolean = false private var isRtl: Boolean = false
set(value) { set(value) {
if (value != field) { if (value != field) {
@@ -413,9 +413,7 @@ class MediaCarouselController @Inject constructor(
.indexOfFirst { key -> it == key } .indexOfFirst { key -> it == key }
mediaCarouselScrollHandler mediaCarouselScrollHandler
.scrollToPlayer(previousVisibleIndex, activeMediaIndex) .scrollToPlayer(previousVisibleIndex, activeMediaIndex)
} ?: { } ?: mediaCarouselScrollHandler.scrollToPlayer(destIndex = activeMediaIndex)
mediaCarouselScrollHandler.scrollToPlayer(destIndex = activeMediaIndex)
}
} }
} }
} }
@@ -432,7 +430,7 @@ class MediaCarouselController @Inject constructor(
val curVisibleMediaKey = MediaPlayerData.playerKeys() val curVisibleMediaKey = MediaPlayerData.playerKeys()
.elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex) .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex)
if (existingPlayer == null) { if (existingPlayer == null) {
var newPlayer = mediaControlPanelFactory.get() val newPlayer = mediaControlPanelFactory.get()
newPlayer.attachPlayer(MediaViewHolder.create( newPlayer.attachPlayer(MediaViewHolder.create(
LayoutInflater.from(context), mediaContent)) LayoutInflater.from(context), mediaContent))
newPlayer.mediaViewController.sizeChangedListener = this::updateCarouselDimensions newPlayer.mediaViewController.sizeChangedListener = this::updateCarouselDimensions
@@ -480,7 +478,7 @@ class MediaCarouselController @Inject constructor(
MediaPlayerData.removeMediaPlayer(existingSmartspaceMediaKey) MediaPlayerData.removeMediaPlayer(existingSmartspaceMediaKey)
} }
var newRecs = mediaControlPanelFactory.get() val newRecs = mediaControlPanelFactory.get()
newRecs.attachRecommendation( newRecs.attachRecommendation(
RecommendationViewHolder.create(LayoutInflater.from(context), mediaContent)) RecommendationViewHolder.create(LayoutInflater.from(context), mediaContent))
newRecs.mediaViewController.sizeChangedListener = this::updateCarouselDimensions newRecs.mediaViewController.sizeChangedListener = this::updateCarouselDimensions
@@ -1048,7 +1046,5 @@ internal object MediaPlayerData {
return false return false
} }
fun isSsReactivated(key: String): Boolean = mediaData.get(key)?.let { fun isSsReactivated(key: String): Boolean = mediaData.get(key)?.isSsReactivated ?: false
it.isSsReactivated
} ?: false
} }