Merge "Match CarUiRecyclerViewLayout.GRID and styleable attribute" into rvc-qpr-dev
diff --git a/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java b/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
index 19e77f4..e1ec9e9 100644
--- a/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
+++ b/car-ui-lib/car-ui-lib/src/androidTest/java/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
@@ -159,6 +159,9 @@
when(typedArray.getInt(eq(R.styleable.CarUiRecyclerView_numOfColumns), anyInt()))
.thenReturn(3);
+ // Ensure the CarUiRecyclerViewLayout constant matches the styleable attribute enum value
+ assertEquals(CarUiRecyclerView.CarUiRecyclerViewLayout.GRID, 1);
+
CarUiRecyclerView carUiRecyclerView = new CarUiRecyclerView(mTestableContext);
ViewGroup container = mActivity.findViewById(R.id.test_container);
TestAdapter adapter = new TestAdapter(4);
@@ -203,6 +206,9 @@
when(typedArray.getInt(eq(R.styleable.CarUiRecyclerView_layoutStyle), anyInt()))
.thenReturn(CarUiRecyclerView.CarUiRecyclerViewLayout.LINEAR);
+ // Ensure the CarUiRecyclerViewLayout constant matches the styleable attribute enum value
+ assertEquals(CarUiRecyclerView.CarUiRecyclerViewLayout.LINEAR, 0);
+
CarUiRecyclerView carUiRecyclerView = new CarUiRecyclerView(mTestableContext);
ViewGroup container = mActivity.findViewById(R.id.test_container);
TestAdapter adapter = new TestAdapter(4);
diff --git a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/recyclerview/CarUiRecyclerView.java b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/recyclerview/CarUiRecyclerView.java
index 57e908f..88cf31d 100644
--- a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/recyclerview/CarUiRecyclerView.java
+++ b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/recyclerview/CarUiRecyclerView.java
@@ -143,7 +143,7 @@
/**
* Arranges items in a Grid.
*/
- int GRID = 2;
+ int GRID = 1;
}
/**