commit a9f4b5f8a846943a0dd0605298a651833535ced7
author Tony Mantler <nicoya@google.com> Thu Oct 15 15:44:49 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 15 15:44:49 2015 +0000
tree 98f316e9465794a22c482a25adb2f221100e56be
parent 4fa653fe05eaa9b78c31a8410b63754b23023b15
parent 8dc93c5779b6c5a68b5266582bab04d11c15ad68

Merge "Use selectable to set focusable on root pref view" into mnc-ub-dev

v7/preference/src/android/support/v7/preference/Preference.java

diff --git a/v7/preference/src/android/support/v7/preference/Preference.java b/v7/preference/src/android/support/v7/preference/Preference.java
index 84ab3b3..aa37ac8 100644
--- a/v7/preference/src/android/support/v7/preference/Preference.java
+++ b/v7/preference/src/android/support/v7/preference/Preference.java
@@ -517,8 +517,11 @@
             setEnabledStateOnViews(holder.itemView, true);
         }
 
-        holder.setDividerAllowedAbove(isSelectable());
-        holder.setDividerAllowedBelow(isSelectable());
+        final boolean selectable = isSelectable();
+        holder.itemView.setFocusable(selectable);
+
+        holder.setDividerAllowedAbove(selectable);
+        holder.setDividerAllowedBelow(selectable);
     }
 
     /**