Update PagerBenchmarks to reflect correct view classes.
Update AndroidViewPager benchmark to use correct VP2 class. Also, update PagerBenchmark to use the same UI structure as the VP2 benchmark.
Test: N/A
Change-Id: Ie130a5432cfab64c17fc63bf56bd1d16f4ca41f2
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt
index 3ffe581..a9466ca 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt
@@ -23,8 +23,9 @@
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PageSize
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
@@ -44,12 +45,18 @@
setContent {
val pagerState = rememberPagerState()
- Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ Box(
+ modifier = Modifier
+ .fillMaxSize(),
+ contentAlignment = Alignment.Center
+ ) {
HorizontalPager(
modifier = Modifier
+ .height(400.dp)
.semantics { contentDescription = "Pager" }
.background(Color.White),
state = pagerState,
+ pageSize = PageSize.Fill,
pageCount = itemCount
) {
PagerItem(it)
@@ -69,9 +76,8 @@
private fun PagerItem(index: Int) {
Box(
modifier = Modifier
- .size(200.dp, 400.dp)
- .background(Color.Black),
- contentAlignment = Alignment.Center
+ .fillMaxSize()
+ .background(Color.Black)
) {
Text(text = index.toString(), color = Color.White)
}
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/ViewPagerActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/ViewPagerActivity.kt
index b1be881..01ac67f 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/ViewPagerActivity.kt
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/ViewPagerActivity.kt
@@ -22,20 +22,16 @@
import android.view.ViewGroup
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.PagerSnapHelper
import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
class ViewPagerActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_view_pager)
- val pager = findViewById<RecyclerView>(R.id.pager)
- pager.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+ val pager = findViewById<ViewPager2>(R.id.pager)
val itemCount = intent.getIntExtra(ExtraItemCount, 3000)
val adapter = PagerAdapter(itemCount)
- val scroller = PagerSnapHelper()
- scroller.attachToRecyclerView(pager)
pager.adapter = adapter
launchIdlenessTracking()
}
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_pager.xml b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_pager.xml
index 1ce3f46..50631f8 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_pager.xml
+++ b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_pager.xml
@@ -20,14 +20,14 @@
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="400dp">
- <androidx.recyclerview.widget.RecyclerView
+ <androidx.viewpager2.widget.ViewPager2
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="match_parent" />
</FrameLayout>
\ No newline at end of file
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/view_pager_item.xml b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/view_pager_item.xml
index 33e2e5c..69067a4 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/view_pager_item.xml
+++ b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/view_pager_item.xml
@@ -15,9 +15,9 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="200dp"
+ android:layout_width="match_parent"
android:background="#000000"
- android:layout_height="400dp"
+ android:layout_height="match_parent"
android:layout_gravity="center">
<TextView
