From 3c3890938c8e013edb817eaaa9ab0b3ad65ef72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Tue, 4 Nov 2014 17:48:22 +0100 Subject: [PATCH] Prevent crash on Android 2.x --- .../src/org/videolan/vlc/gui/DirectoryViewFragment.java | 3 ++- vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java | 4 +++- vlc-android/src/org/videolan/vlc/gui/MainActivity.java | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vlc-android/src/org/videolan/vlc/gui/DirectoryViewFragment.java b/vlc-android/src/org/videolan/vlc/gui/DirectoryViewFragment.java index 5bf603707..b46096de0 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 b32814ce6..a9d0fe32e 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 649eb16b8..d07db27fa 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); } -- GitLab