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

Merge "Remove usage of IntegerRes in type usage target" am: d1b31d480a am: c04764cc62 am: fe42e7de7d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922979

Change-Id: I6c3bf1cf99b0fe8a9942c55e384077012dbd7f80
This commit is contained in:
Treehugger Robot
2021-12-16 01:15:51 +00:00
committed by Automerger Merge Worker
parent 96483f319a fe42e7de7d
commit 59c044073a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt
View File

@@ -21,7 +21,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.annotation.IntegerRes
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.util.animation.TransitionLayout import com.android.systemui.util.animation.TransitionLayout
@@ -47,14 +46,14 @@ class RecommendationViewHolder private constructor(itemView: View) {
itemView.requireViewById(R.id.media_cover4_container), itemView.requireViewById(R.id.media_cover4_container),
itemView.requireViewById(R.id.media_cover5_container), itemView.requireViewById(R.id.media_cover5_container),
itemView.requireViewById(R.id.media_cover6_container)) itemView.requireViewById(R.id.media_cover6_container))
val mediaCoverItemsResIds = listOf<@IntegerRes Int>( val mediaCoverItemsResIds = listOf<Int>(
R.id.media_cover1, R.id.media_cover1,
R.id.media_cover2, R.id.media_cover2,
R.id.media_cover3, R.id.media_cover3,
R.id.media_cover4, R.id.media_cover4,
R.id.media_cover5, R.id.media_cover5,
R.id.media_cover6) R.id.media_cover6)
val mediaCoverContainersResIds = listOf<@IntegerRes Int>( val mediaCoverContainersResIds = listOf<Int>(
R.id.media_cover1_container, R.id.media_cover1_container,
R.id.media_cover2_container, R.id.media_cover2_container,
R.id.media_cover3_container, R.id.media_cover3_container,