diff --git a/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/BookmarksActivity.java index 428bc734d..282fbf370 100644 --- a/src/org/geometerplus/android/fbreader/BookmarksActivity.java +++ b/src/org/geometerplus/android/fbreader/BookmarksActivity.java @@ -36,8 +36,7 @@ import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.fbreader.book.*; import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow; -import org.geometerplus.android.util.UIUtil; -import org.geometerplus.android.util.ViewUtil; +import org.geometerplus.android.util.*; public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener { private static final int OPEN_ITEM_ID = 0; @@ -189,7 +188,10 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte @Override public boolean onSearchRequested() { - startSearch(myBookmarkSearchPatternOption.getValue(), true, null, false); + if (DeviceType.Instance().hasStandardSearchDialog()) { + startSearch(myBookmarkSearchPatternOption.getValue(), true, null, false); + } else { + } return true; } diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java index bc5140176..90d7439fe 100644 --- a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java @@ -36,7 +36,7 @@ import org.geometerplus.fbreader.book.*; import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.tree.FBTree; -import org.geometerplus.android.util.UIUtil; +import org.geometerplus.android.util.*; import org.geometerplus.android.fbreader.*; import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow; import org.geometerplus.android.fbreader.tree.TreeActivity; @@ -145,7 +145,10 @@ public class LibraryActivity extends TreeActivity implements MenuIt @Override public boolean onSearchRequested() { - startSearch(BookSearchPatternOption.getValue(), true, null, false); + if (DeviceType.Instance().hasStandardSearchDialog()) { + startSearch(BookSearchPatternOption.getValue(), true, null, false); + } else { + } return true; } diff --git a/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java b/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java index d9e5d6a70..5bcbd527e 100644 --- a/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java +++ b/src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java @@ -31,6 +31,8 @@ import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.android.fbreader.network.NetworkLibraryActivity; +import org.geometerplus.android.util.DeviceType; + public class RunSearchAction extends Action { public static SearchCatalogTree getSearchTree(FBTree tree) { for (; tree != null; tree = tree.Parent) { @@ -72,6 +74,9 @@ public class RunSearchAction extends Action { getSearchTree(tree).getUniqueKey() ); final NetworkLibrary library = NetworkLibrary.Instance(); - myActivity.startSearch(library.NetworkSearchPatternOption.getValue(), true, bundle, false); + if (DeviceType.Instance().hasStandardSearchDialog()) { + myActivity.startSearch(library.NetworkSearchPatternOption.getValue(), true, bundle, false); + } else { + } } }