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

Author: sganov

core/java/android/view/ViewGroup.java

@@ -765,8 +765,9 @@ public void clearFocus() {
         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 void addFocusables(ArrayList<View> views, int direction, int focusableMod
                     }
                 } return;
             }
-            super.addFocusables(views, direction, focusableMode);
         }
+        super.addFocusables(views, direction, focusableMode);
     }
 
     @Override