am b6585d19: Merge "Double input focus and focus movement in list not working." into jb-dev

* commit 'b6585d19311f13ec28fa38a3c849589dba8c293a':
  Double input focus and focus movement in list not working.

core/java/android/view/ViewGroup.java

@@ -765,8 +765,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         if (mFocused == null) {
             super.clearFocus();
         } else {
-            mFocused.clearFocus();
+            View focused = mFocused;
             mFocused = null;
+            focused.clearFocus();
         }
     }
 

core/java/android/widget/AbsListView.java

@@ -1344,8 +1344,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                     }
                 } return;
             }
-            super.addFocusables(views, direction, focusableMode);
         }
+        super.addFocusables(views, direction, focusableMode);
     }
 
     @Override