[Android] Merge Search and Filter options

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Nov  7 18:57:46 2016 +0100| [25be8036b1206962c0c1522d4aa90177641b08f3] | committer: Geoffrey Métais

Merge Search and Filter options

> https://code.videolan.org/videolan/vlc-android/commit/25be8036b1206962c0c1522d4aa90177641b08f3
---

 vlc-android/res/layout/audio_browser.xml           | 12 ++++++++++-
 vlc-android/res/layout/button_search.xml           | 17 +++++++++++++++
 vlc-android/res/layout/video_grid.xml              |  9 +++++---
 vlc-android/res/menu/media_library.xml             |  8 +-------
 vlc-android/res/values/strings.xml                 |  2 ++
 .../src/org/videolan/vlc/gui/MainActivity.java     | 14 ++++++++++++-
 .../vlc/gui/audio/AudioBrowserFragment.java        | 24 ++++++++++++++++++++--
 .../videolan/vlc/gui/video/VideoGridFragment.java  | 24 +++++++++++++++++++++-
 .../org/videolan/vlc/interfaces/Filterable.java    |  1 +
 9 files changed, 96 insertions(+), 15 deletions(-)

Diff:   https://code.videolan.org/videolan/vlc-android/commit/25be8036b1206962c0c1522d4aa90177641b08f3