Fix code for Google3
Test: Running "./update manual" script
Change-Id: Icc37f3fa6fb4c6ef8573dbcfdf325659fa3d5064
diff --git a/OWNERS b/OWNERS
index 610f429..c1e7ec6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -5,6 +5,7 @@
rlagos@google.com
stenning@google.com
yizheng@google.com
+robertoalexis@google.com
# TLMs
johnchoi@google.com
diff --git a/car-ui-lib/OWNERS b/car-ui-lib/OWNERS
new file mode 100644
index 0000000..aef5c65
--- /dev/null
+++ b/car-ui-lib/OWNERS
@@ -0,0 +1,9 @@
+# People who can approve changes for submission.
+
+# Engs
+colefaust@google.com
+priyanksingh@google.com
+rampara@google.com
+ckoessler@google.com
+
+
diff --git a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
index b3c0bbc..061ac9c 100644
--- a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
+++ b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
@@ -120,7 +120,8 @@
return RecyclerView.NO_POSITION;
}
- int vDeltaJump, hDeltaJump;
+ int vDeltaJump;
+ int hDeltaJump;
if (layoutManager.canScrollHorizontally()) {
hDeltaJump = estimateNextPositionDiffForFling(layoutManager,
getHorizontalHelper(layoutManager), scrollDistance);
diff --git a/car-ui-lib/src/com/android/car/ui/toolbar/Toolbar.java b/car-ui-lib/src/com/android/car/ui/toolbar/Toolbar.java
index 5cfda97..ef3f4a8 100644
--- a/car-ui-lib/src/com/android/car/ui/toolbar/Toolbar.java
+++ b/car-ui-lib/src/com/android/car/ui/toolbar/Toolbar.java
@@ -228,7 +228,9 @@
mTabLayout.addListener(new TabLayout.Listener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
- mOnTabSelectedListeners.forEach(listener -> listener.onTabSelected(tab));
+ for (OnTabSelectedListener listener : mOnTabSelectedListeners) {
+ listener.onTabSelected(tab);
+ }
}
});
@@ -241,6 +243,8 @@
mOverflowDialog.show();
}
});
+
+ handleToolbarHeightChangeListeners(getHeight());
}
/**
diff --git a/car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java b/car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
index dae4257..c124fd7 100644
--- a/car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
+++ b/car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
@@ -62,19 +62,19 @@
}
}
- private RecyclerView.Adapter mAdapter = new RecyclerView.Adapter() {
+ private RecyclerView.Adapter<ViewHolder> mAdapter = new RecyclerView.Adapter<ViewHolder>() {
@NonNull
@Override
- public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View item = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item, parent,
false);
return new ViewHolder(item);
}
@Override
- public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
Pair<String, Class<? extends Activity>> item = mActivities.get(position);
- ((ViewHolder) holder).update(item.first, item.second);
+ holder.update(item.first, item.second);
}
@Override
