More migration fixes
Bug: 139825697
Test: Manual
Change-Id: I9a98f2bcee94465a32f6e5335b99d08260871e04
diff --git a/car-chassis-lib/src/com/android/car/chassis/SearchView.java b/car-chassis-lib/src/com/android/car/chassis/SearchView.java
index c033f7e..d63d33e 100644
--- a/car-chassis-lib/src/com/android/car/chassis/SearchView.java
+++ b/car-chassis-lib/src/com/android/car/chassis/SearchView.java
@@ -108,7 +108,6 @@
/**
* Removes a listener.
* See also {@link #addToolbarListener(Toolbar.Listener)}
- * @param listener
*/
public void removeToolbarListener(Toolbar.Listener listener) {
mListeners.remove(listener);
diff --git a/car-chassis-lib/src/com/android/car/chassis/TabLayout.java b/car-chassis-lib/src/com/android/car/chassis/TabLayout.java
index d9803e4..490baa5 100644
--- a/car-chassis-lib/src/com/android/car/chassis/TabLayout.java
+++ b/car-chassis-lib/src/com/android/car/chassis/TabLayout.java
@@ -181,7 +181,7 @@
}
private ViewGroup createTabItemView() {
- LinearLayout tabItemView = new LinearLayout(mContext);
+ LinearLayout tabItemView = new LinearLayout(getContext());
tabItemView.setOrientation(LinearLayout.VERTICAL);
tabItemView.setGravity(Gravity.CENTER);
tabItemView.setPadding(mTabPaddingX, 0, mTabPaddingX, 0);
diff --git a/car-chassis-lib/src/com/android/car/chassis/Toolbar.java b/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
index 47ab0c2..eb5ef7f 100644
--- a/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
+++ b/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
@@ -15,7 +15,6 @@
*/
package com.android.car.chassis;
-import android.annotation.StringRes;
import android.content.Context;
import android.content.res.TypedArray;
import android.util.AttributeSet;
@@ -29,13 +28,13 @@
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.function.Consumer;
/**
* A toolbar for Android Automotive OS apps.
@@ -72,6 +71,13 @@
SEARCH,
}
+ /**
+ * {@link java.util.function.Consumer} is not available for non-java8 enabled Android targets.
+ */
+ private interface Consumer<T> {
+ void accept(T value);
+ }
+
private ImageView mNavIcon;
private ImageView mLogo;
private ViewGroup mNavIconContainer;
@@ -121,6 +127,7 @@
mTitle.setText(a.getString(R.styleable.ChassisToolbar_title));
setLogo(a.getResourceId(R.styleable.ChassisToolbar_logo, 0));
setButtons(a.getResourceId(R.styleable.ChassisToolbar_buttons, 0));
+ setBackground(context.getDrawable(R.color.toolbar_background_color));
mShowButtonsWhileSearching = a.getBoolean(
R.styleable.ChassisToolbar_showButtonsWhileSearching, false);
String searchHint = a.getString(R.styleable.ChassisToolbar_searchHint);
@@ -130,13 +137,6 @@
a.recycle();
- // If an android:background attribute wasn't given, set the default one
- TypedArray viewAttributes = context.obtainStyledAttributes(
- attrs, com.android.internal.R.styleable.View, defStyleAttr, defStyleRes);
- if (viewAttributes.getDrawable(com.android.internal.R.styleable.View_background) == null) {
- setBackground(context.getDrawable(R.color.toolbar_background_color));
- }
-
mTabLayout.addListener(new TabLayout.Listener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {