Merge "Fix VerticalGridFragment focus navigation and title transition." into lmp-preview-dev
diff --git a/v17/leanback/res/layout/lb_browse_title.xml b/v17/leanback/res/layout/lb_browse_title.xml
index 26bce3f..bc6a808 100644
--- a/v17/leanback/res/layout/lb_browse_title.xml
+++ b/v17/leanback/res/layout/lb_browse_title.xml
@@ -45,6 +45,7 @@
android:id="@+id/browse_orb"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_gravity="center_vertical|left" />
+ android:layout_gravity="center_vertical|left"
+ android:visibility="invisible" />
</FrameLayout>
diff --git a/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java b/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java
index 7b8c62d..86ad1c6 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/SearchOrbView.java
@@ -65,8 +65,6 @@
View root = inflater.inflate(R.layout.lb_search_orb, this, true);
mSearchOrbView = root.findViewById(R.id.search_orb);
- // By default we are not visible
- setVisibility(INVISIBLE);
setFocusable(true);
setClipChildren(false);
diff --git a/v7/recyclerview/src/android/support/v7/widget/LinearSmoothScroller.java b/v7/recyclerview/src/android/support/v7/widget/LinearSmoothScroller.java
index 8036a0c..ed4c950 100644
--- a/v7/recyclerview/src/android/support/v7/widget/LinearSmoothScroller.java
+++ b/v7/recyclerview/src/android/support/v7/widget/LinearSmoothScroller.java
@@ -108,7 +108,9 @@
final int dy = calculateDyToMakeVisible(targetView, getVerticalSnapPreference());
final int distance = (int) Math.sqrt(dx * dx + dy * dy);
final int time = calculateTimeForDeceleration(distance);
- action.update(-dx, -dy, time, mDecelerateInterpolator);
+ if (time > 0) {
+ action.update(-dx, -dy, time, mDecelerateInterpolator);
+ }
}
/**