Fix compile issues after Google3 migration
Bug: 140077022
Test: Manual
Change-Id: I58039277f8f4f7d8655eed4722b09393924e9882
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar.xml b/car-chassis-lib/res/layout/car_ui_toolbar.xml
index 5e34143..cf38940 100644
--- a/car-chassis-lib/res/layout/car_ui_toolbar.xml
+++ b/car-chassis-lib/res/layout/car_ui_toolbar.xml
@@ -82,7 +82,7 @@
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
- app:layout_constraintEnd_toStartOf="@id/car_ui_toolbar_overflow_button"/>
+ app:layout_constraintEnd_toStartOf="@+id/car_ui_toolbar_overflow_button"/>
<FrameLayout
android:id="@+id/car_ui_toolbar_overflow_button"
diff --git a/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java b/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
index 3ea4792..b73ccd4 100644
--- a/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
+++ b/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
@@ -329,9 +329,10 @@
// TODO(b/140564530) Use a chassis alert with a (paged)recyclerview here
// TODO(b/140563930) Support enabled/disabled overflow items
- CharSequence[] itemTitles = mOverflowItems.stream()
- .map(MenuItem::getTitle)
- .toArray(CharSequence[]::new);
+ CharSequence[] itemTitles = new CharSequence[mOverflowItems.size()];
+ for (int i = 0; i < mOverflowItems.size(); i++) {
+ itemTitles[i] = mOverflowItems.get(i).getTitle();
+ }
mOverflowDialog = new AlertDialog.Builder(getContext())
.setItems(itemTitles, (dialog, which) -> {
