DO NOT MERGE With the change to CarUiRV now the app should use RecyclerView#layout instead of CarUiRV#layoutBothForTesting.

Dialer was using RV#layoutBothForTesting for testing which led to New Build Breakage: git_qt-car-release/run_host_tests @ 6295941

Fix: 151568406
Test: make RunCarDialerRoboTests -j96
Change-Id: I3abe16cf0c22112642049ec6f09f97289225de4c

5 files changed, 5 insertions, 5 deletions

diff --git a/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java
index 499c0cfb..8ada4412 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java
@@ -103,7 +103,7 @@ public class CallHistoryFragmentTest {
         CarUiRecyclerView recyclerView = mCallHistoryFragment.getView()
                 .findViewById(R.id.list_view);
         // set up layout for recyclerView
-        recyclerView.layoutBothForTesting(0, 0, 100, 1000);
+        recyclerView.layout(0, 0, 100, 1000);
         mHeaderViewHolder = recyclerView.findViewHolderForLayoutPosition(0);
         mCalllogViewHolder = recyclerView.findViewHolderForLayoutPosition(1);
     }
diff --git a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java
index 65f00a7c..40af9a4e 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java
@@ -116,7 +116,7 @@ public class ContactDetailsFragmentTest {
 
         mListView = mContactDetailsFragment.getView().findViewById(R.id.list_view);
         // Set up layout for recyclerView
-        mListView.layoutBothForTesting(0, 0, 100, 1000);
+        mListView.layout(0, 0, 100, 1000);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java
index 1ae465bd..c5cb8f46 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java
@@ -216,7 +216,7 @@ public class ContactListFragmentTest {
         CarUiRecyclerView recyclerView = mContactListFragment.getView()
                 .findViewById(R.id.list_view);
         //Force RecyclerView to layout to ensure findViewHolderForLayoutPosition works.
-        recyclerView.layoutBothForTesting(0, 0, 100, 1000);
+        recyclerView.layout(0, 0, 100, 1000);
         mViewHolder = (ContactListViewHolder) recyclerView.findViewHolderForLayoutPosition(0);
     }
 
diff --git a/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java
index b28c4dd6..e6c326ee 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java
@@ -83,7 +83,7 @@ public class FavoriteFragmentTest {
 
         CarUiRecyclerView recyclerView = mFavoriteFragment.getView().findViewById(R.id.list_view);
         // set up layout for recyclerView
-        recyclerView.layoutBothForTesting(0, 0, 100, 1000);
+        recyclerView.layout(0, 0, 100, 1000);
         mViewHolder = (FavoriteContactViewHolder) recyclerView.findViewHolderForLayoutPosition(0);
     }
 
diff --git a/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java
index 3963213d..c6f4d1c4 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java
@@ -156,7 +156,7 @@ public class ContactResultsFragmentTest {
 
         mListView = mContactResultsFragment.getView().findViewById(R.id.list_view);
         // Set up layout for recyclerView
-        mListView.layoutBothForTesting(0, 0, 100, 1000);
+        mListView.layout(0, 0, 100, 1000);
     }
 
     private void verifyChildAt(int position) {