Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make left- and right- arrow jump rows in grid mode.

Browse Source 
Like ChromeOS.  Pressing left at the beginning of a row of files in grid
mode, will move focus up to the end of the preceding row.  Analogous
behaviour for right-arrow at the end of a row.

BUG=27127282

Change-Id: I3b36c1da6559aaf01558807913502f8ab87a9e6e
(cherry picked from commit f55e5b714d)
This commit is contained in:
Ben Kwa
2016-02-10 11:54:55 -08:00
parent 4a993b240d
commit d7211c85d6
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -193,6 +193,11 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi
mRecView.setItemAnimator(new DirectoryItemAnimator(getActivity()));
// Make the RecyclerView unfocusable. This is needed in order for the focus search code in
// FocusManager to work correctly. Setting android:focusable=false in the layout xml doesn't
// work, for some reason.
mRecView.setFocusable(false);
// TODO: Add a divider between views (which might use RecyclerView.ItemDecoration).
if (DEBUG_ENABLE_DND) {
setupDragAndDropOnDirectoryView(mRecView);

40
packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java
View File

@@ -16,7 +16,7 @@
package com.android.documentsui.dirlist;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.KeyEvent;
@@ -32,14 +32,14 @@ class FocusManager implements View.OnFocusChangeListener {
private RecyclerView mView;
private RecyclerView.Adapter<?> mAdapter;
private LinearLayoutManager mLayout;
private GridLayoutManager mLayout;
private int mLastFocusPosition = RecyclerView.NO_POSITION;
public FocusManager(RecyclerView view) {
mView = view;
mAdapter = view.getAdapter();
mLayout = (LinearLayoutManager) view.getLayoutManager();
mLayout = (GridLayoutManager) view.getLayoutManager();
}
/**
@@ -134,12 +134,27 @@ class FocusManager implements View.OnFocusChangeListener {
case KeyEvent.KEYCODE_DPAD_DOWN:
searchDir = View.FOCUS_DOWN;
break;
case KeyEvent.KEYCODE_DPAD_LEFT:
searchDir = View.FOCUS_LEFT;
break;
case KeyEvent.KEYCODE_DPAD_RIGHT:
searchDir = View.FOCUS_RIGHT;
break;
}
if (inGridMode()) {
int currentPosition = mView.getChildAdapterPosition(view);
// Left and right arrow keys only work in grid mode.
switch (keyCode) {
case KeyEvent.KEYCODE_DPAD_LEFT:
if (currentPosition > 0) {
// Stop backward focus search at the first item, otherwise focus will wrap
// around to the last visible item.
searchDir = View.FOCUS_BACKWARD;
}
break;
case KeyEvent.KEYCODE_DPAD_RIGHT:
if (currentPosition < mAdapter.getItemCount() - 1) {
// Stop forward focus search at the last item, otherwise focus will wrap
// around to the first visible item.
searchDir = View.FOCUS_FORWARD;
}
break;
}
}
if (searchDir != -1) {
@@ -238,4 +253,11 @@ class FocusManager implements View.OnFocusChangeListener {
});
}
}
/**
* @return Whether the layout manager is currently in a grid-configuration.
*/
private boolean inGridMode() {
return mLayout.getSpanCount() > 1;
}
}