commit c4037564222e361cb92bbc05a062f8da91be5f5f
author Aurimas Liutikas <aurimas@google.com> Wed Oct 26 00:14:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 26 00:14:27 2016 +0000
tree 2e5ff3d76be834454f5dad13e9da974962b4e61a
parent 2e2060d9e02a4b78ef885d9c68ba7b8c2304b800
parent 578015fc3e5ddc0fdb95db7ad0d00822c54be6df

Merge changes Id091acf5,Ie27b07ae,I701a2582,I32122d77 into nyc-mr1-dev

* changes:
  Start using return value of OnNavigationItemSelectedListener.
  Clean up BottomBar docs
  Force BottomNavigationView item labels to be singleLine.
  Clean-up BottomNavigationMenuView#onMeasure and other style fixes.

v7/recyclerview/src/android/support/v7/widget/RecyclerView.java

diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 4eb81a1..46da1b8 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -2389,9 +2389,12 @@
             // We only query the display/refresh rate once, since it's an expensive binder call
             float refreshRate = 60.0f;
             Display display = ViewCompat.getDisplay(this);
-            if (display != null && display.getRefreshRate() >= 30.0f) {
-                // break 60 fps assumption if data appears good
-                refreshRate  = display.getRefreshRate();
+            if (!isInEditMode() && display != null) {
+                float displayRefreshRate = display.getRefreshRate();
+                if (displayRefreshRate >= 30.0f) {
+                    // break 60 fps assumption if data appears good
+                    refreshRate = displayRefreshRate;
+                }
             }
             sFrameIntervalNanos = (long) (1000000000 / refreshRate);
         }