diff --git a/vlc-android/src/org/videolan/vlc/gui/DirectoryViewFragment.java b/vlc-android/src/org/videolan/vlc/gui/DirectoryViewFragment.java index 5bf603707c0c89018a7e6fcf92d0ea4e9d0decb0..b46096de096ce3fcb22c0972a56bfa835ce224b7 100644 --- a/vlc-android/src/org/videolan/vlc/gui/DirectoryViewFragment.java +++ b/vlc-android/src/org/videolan/vlc/gui/DirectoryViewFragment.java @@ -104,7 +104,8 @@ public class DirectoryViewFragment extends ListFragment implements IRefreshable, listView.setNextFocusUpId(R.id.ml_menu_search); listView.setNextFocusLeftId(android.R.id.list); listView.setNextFocusRightId(android.R.id.list); - listView.setNextFocusForwardId(android.R.id.list); + if (LibVlcUtil.isHoneycombOrLater()) + listView.setNextFocusForwardId(android.R.id.list); focusHelper(mDirectoryAdapter.getCount() == 0); listView.requestFocus(); listView.setOnItemLongClickListener(new OnItemLongClickListener() { diff --git a/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java b/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java index b32814ce6ff9688ea49a4d828af5df91af0e703c..a9d0fe32e7b68d209d34520c99d5927840f13df3 100644 --- a/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java +++ b/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java @@ -21,6 +21,7 @@ package org.videolan.vlc.gui; import org.videolan.libvlc.LibVLC; +import org.videolan.libvlc.LibVlcUtil; import org.videolan.vlc.R; import org.videolan.vlc.audio.AudioServiceController; import org.videolan.vlc.interfaces.IRefreshable; @@ -75,7 +76,8 @@ public class HistoryFragment extends ListFragment implements IRefreshable { listView.setNextFocusUpId(R.id.ml_menu_search); listView.setNextFocusLeftId(android.R.id.list); listView.setNextFocusRightId(android.R.id.list); - listView.setNextFocusForwardId(android.R.id.list); + if (LibVlcUtil.isHoneycombOrLater()) + listView.setNextFocusForwardId(android.R.id.list); focusHelper(mHistoryAdapter.getCount() == 0); listView.requestFocus(); registerForContextMenu(listView); diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java index 649eb16b80b8d684b70091917a54961b3f87e776..d07db27faeb953ee9b1692d8504104267b635a0a 100644 --- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java +++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java @@ -772,15 +772,15 @@ public class MainActivity extends ActionBarActivity { (v.getNextFocusDownId() == -1) && (v.getNextFocusUpId() == -1) && (v.getNextFocusLeftId() == -1) && - (v.getNextFocusRightId() == -1) && - (v.getNextFocusForwardId() == -1)) { + (v.getNextFocusRightId() == -1)) { mActionBarIconId = Util.generateViewId(); v.setId(mActionBarIconId); v.setNextFocusUpId(mActionBarIconId); v.setNextFocusDownId(mActionBarIconId); v.setNextFocusLeftId(mActionBarIconId); v.setNextFocusRightId(R.id.ml_menu_search); - v.setNextFocusForwardId(mActionBarIconId); + if (LibVlcUtil.isHoneycombOrLater()) + v.setNextFocusForwardId(mActionBarIconId); findViewById(R.id.ml_menu_search).setNextFocusLeftId( mActionBarIconId); }