[Android] Merge TV flavor with vanilla

Geoffrey Métais git at videolan.org
Thu Jan 21 15:10:18 CET 2016


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Jan 20 15:01:33 2016 +0100| [7626d89bca63a3f9d97e1727b79c66ba46c66f1f] | committer: Geoffrey Métais

Merge TV flavor with vanilla

> https://code.videolan.org/videolan/vlc-android/commit/7626d89bca63a3f9d97e1727b79c66ba46c66f1f
---

 vlc-android/AndroidManifest.xml                    |  72 ++-
 vlc-android/build.gradle                           |   2 +-
 vlc-android/flavors/tv/AndroidManifest.xml         |   2 +-
 vlc-android/res/drawable-hdpi/ic_album_big.png     | Bin 0 -> 1686 bytes
 vlc-android/res/drawable-hdpi/ic_artist_big.png    | Bin 0 -> 1852 bytes
 .../ic_browser_archive_big_normal.png              | Bin 0 -> 617 bytes
 .../drawable-hdpi/ic_browser_audio_big_normal.png  | Bin 0 -> 1339 bytes
 .../ic_browser_subtitle_big_normal.png             | Bin 0 -> 1132 bytes
 .../ic_browser_unknown_big_normal.png              | Bin 0 -> 1578 bytes
 .../drawable-hdpi/ic_browser_video_big_normal.png  | Bin 0 -> 1539 bytes
 vlc-android/res/drawable-hdpi/ic_genre_big.png     | Bin 0 -> 2018 bytes
 vlc-android/res/drawable-hdpi/ic_menu_goto_big.png | Bin 0 -> 2287 bytes
 .../res/drawable-hdpi/ic_menu_network_big.png      | Bin 0 -> 1617 bytes
 .../res/drawable-hdpi/ic_menu_preferences_big.png  | Bin 0 -> 2044 bytes
 .../res/drawable-hdpi/ic_nowplaying_big.png        | Bin 0 -> 1851 bytes
 .../res/drawable-hdpi/ic_repeat_white_36dp.png     | Bin 0 -> 409 bytes
 vlc-android/res/drawable-hdpi/ic_song_big.png      | Bin 0 -> 1861 bytes
 vlc-android/res/drawable-hdpi/ic_tv_icon_big.png   | Bin 0 -> 71422 bytes
 vlc-android/res/drawable-hdpi/ic_tv_icon_small.png | Bin 0 -> 2795 bytes
 .../res/drawable-hdpi/ic_video_collection_big.png  | Bin 0 -> 1821 bytes
 vlc-android/res/drawable-ldpi/ic_album_big.png     | Bin 0 -> 773 bytes
 vlc-android/res/drawable-ldpi/ic_artist_big.png    | Bin 0 -> 1096 bytes
 .../ic_browser_archive_big_normal.png              | Bin 0 -> 394 bytes
 .../drawable-ldpi/ic_browser_audio_big_normal.png  | Bin 0 -> 772 bytes
 .../ic_browser_subtitle_big_normal.png             | Bin 0 -> 648 bytes
 .../ic_browser_unknown_big_normal.png              | Bin 0 -> 949 bytes
 .../drawable-ldpi/ic_browser_video_big_normal.png  | Bin 0 -> 1018 bytes
 vlc-android/res/drawable-ldpi/ic_genre_big.png     | Bin 0 -> 1180 bytes
 vlc-android/res/drawable-ldpi/ic_menu_goto_big.png | Bin 0 -> 1143 bytes
 .../res/drawable-ldpi/ic_menu_network_big.png      | Bin 0 -> 936 bytes
 .../res/drawable-ldpi/ic_menu_preferences_big.png  | Bin 0 -> 989 bytes
 .../res/drawable-ldpi/ic_nowplaying_big.png        | Bin 0 -> 810 bytes
 vlc-android/res/drawable-ldpi/ic_song_big.png      | Bin 0 -> 1080 bytes
 vlc-android/res/drawable-ldpi/ic_tv_icon_big.png   | Bin 0 -> 25692 bytes
 vlc-android/res/drawable-ldpi/ic_tv_icon_small.png | Bin 0 -> 1374 bytes
 .../res/drawable-ldpi/ic_video_collection_big.png  | Bin 0 -> 1118 bytes
 vlc-android/res/drawable-mdpi/ic_album_big.png     | Bin 0 -> 948 bytes
 vlc-android/res/drawable-mdpi/ic_artist_big.png    | Bin 0 -> 1231 bytes
 .../ic_browser_archive_big_normal.png              | Bin 0 -> 414 bytes
 .../drawable-mdpi/ic_browser_audio_big_normal.png  | Bin 0 -> 1020 bytes
 .../ic_browser_subtitle_big_normal.png             | Bin 0 -> 836 bytes
 .../ic_browser_unknown_big_normal.png              | Bin 0 -> 1216 bytes
 .../drawable-mdpi/ic_browser_video_big_normal.png  | Bin 0 -> 1248 bytes
 vlc-android/res/drawable-mdpi/ic_genre_big.png     | Bin 0 -> 1334 bytes
 vlc-android/res/drawable-mdpi/ic_menu_goto_big.png | Bin 0 -> 1482 bytes
 .../res/drawable-mdpi/ic_menu_network_big.png      | Bin 0 -> 1226 bytes
 .../res/drawable-mdpi/ic_menu_preferences_big.png  | Bin 0 -> 1193 bytes
 .../res/drawable-mdpi/ic_nowplaying_big.png        | Bin 0 -> 1224 bytes
 .../res/drawable-mdpi/ic_repeat_white_36dp.png     | Bin 0 -> 296 bytes
 vlc-android/res/drawable-mdpi/ic_song_big.png      | Bin 0 -> 1258 bytes
 vlc-android/res/drawable-mdpi/ic_tv_icon_big.png   | Bin 0 -> 42153 bytes
 vlc-android/res/drawable-mdpi/ic_tv_icon_small.png | Bin 0 -> 1934 bytes
 .../res/drawable-mdpi/ic_video_collection_big.png  | Bin 0 -> 1241 bytes
 vlc-android/res/drawable-xhdpi/banner.png          | Bin 0 -> 4962 bytes
 vlc-android/res/drawable-xhdpi/ic_album_big.png    | Bin 0 -> 2822 bytes
 vlc-android/res/drawable-xhdpi/ic_artist_big.png   | Bin 0 -> 2760 bytes
 .../ic_browser_archive_big_normal.png              | Bin 0 -> 823 bytes
 .../drawable-xhdpi/ic_browser_audio_big_normal.png | Bin 0 -> 1898 bytes
 .../ic_browser_subtitle_big_normal.png             | Bin 0 -> 1536 bytes
 .../ic_browser_unknown_big_normal.png              | Bin 0 -> 2336 bytes
 .../drawable-xhdpi/ic_browser_video_big_normal.png | Bin 0 -> 2158 bytes
 vlc-android/res/drawable-xhdpi/ic_genre_big.png    | Bin 0 -> 3062 bytes
 .../res/drawable-xhdpi/ic_menu_goto_big.png        | Bin 0 -> 3202 bytes
 .../res/drawable-xhdpi/ic_menu_network_big.png     | Bin 0 -> 2266 bytes
 .../res/drawable-xhdpi/ic_menu_preferences_big.png | Bin 0 -> 2802 bytes
 .../res/drawable-xhdpi/ic_nowplaying_big.png       | Bin 0 -> 2520 bytes
 .../res/drawable-xhdpi/ic_repeat_white_36dp.png    | Bin 0 -> 397 bytes
 vlc-android/res/drawable-xhdpi/ic_song_big.png     | Bin 0 -> 2819 bytes
 vlc-android/res/drawable-xhdpi/ic_tv_icon_big.png  | Bin 0 -> 117308 bytes
 .../res/drawable-xhdpi/ic_tv_icon_small.png        | Bin 0 -> 3772 bytes
 .../res/drawable-xhdpi/ic_video_collection_big.png | Bin 0 -> 2758 bytes
 .../res/drawable-xxhdpi/ic_repeat_white_36dp.png   | Bin 0 -> 572 bytes
 .../res/drawable-xxxhdpi/ic_repeat_white_36dp.png  | Bin 0 -> 657 bytes
 vlc-android/res/drawable/audio_item_selector.xml   |   7 +
 vlc-android/res/drawable/tv_audioprogressbar.xml   |  28 ++
 vlc-android/res/layout/tv_audio_player.xml         | 162 +++++++
 vlc-android/res/layout/tv_details.xml              |   6 +
 vlc-android/res/layout/tv_main.xml                 |  17 +
 vlc-android/res/layout/tv_search.xml               |   8 +
 vlc-android/res/layout/tv_simple_list_item.xml     |  25 +
 vlc-android/res/layout/tv_vertical_grid.xml        |  22 +
 vlc-android/res/values/strings.xml                 |   6 +
 vlc-android/res/values/styles.xml                  |   4 +
 .../src/org/videolan/vlc/StartActivity.java        |  48 ++
 .../org/videolan/vlc/gui/tv/BootupReceiver.java    |  60 +++
 .../src/org/videolan/vlc/gui/tv/CardPresenter.java | 243 ++++++++++
 .../org/videolan/vlc/gui/tv/DetailsActivity.java   |  40 ++
 .../vlc/gui/tv/DetailsDescriptionPresenter.java    |  44 ++
 .../org/videolan/vlc/gui/tv/MainTvActivity.java    | 523 +++++++++++++++++++++
 .../org/videolan/vlc/gui/tv/MediaItemDetails.java  |  84 ++++
 .../vlc/gui/tv/MediaItemDetailsFragment.java       | 179 +++++++
 .../vlc/gui/tv/RecommendationsService.java         | 156 ++++++
 .../org/videolan/vlc/gui/tv/SearchActivity.java    |  57 +++
 .../org/videolan/vlc/gui/tv/SearchFragment.java    | 133 ++++++
 .../org/videolan/vlc/gui/tv/StringPresenter.java   |  57 +++
 .../src/org/videolan/vlc/gui/tv/TvMedia.java       | 156 ++++++
 .../src/org/videolan/vlc/gui/tv/TvUtil.java        |  70 +++
 .../gui/tv/audioplayer/AudioPlayerActivity.java    | 423 +++++++++++++++++
 .../vlc/gui/tv/audioplayer/PlaylistAdapter.java    | 111 +++++
 .../vlc/gui/tv/browser/BaseTvActivity.java         | 141 ++++++
 .../vlc/gui/tv/browser/BrowserGridFragment.java    | 152 ++++++
 .../gui/tv/browser/DirectoryBrowserFragment.java   |  67 +++
 .../videolan/vlc/gui/tv/browser/GridFragment.java  |  69 +++
 .../gui/tv/browser/MediaLibBrowserFragment.java    |  62 +++
 .../videolan/vlc/gui/tv/browser/MusicFragment.java | 283 +++++++++++
 .../vlc/gui/tv/browser/NetworkBrowserFragment.java |  51 ++
 .../vlc/gui/tv/browser/SortedBrowserFragment.java  | 309 ++++++++++++
 .../vlc/gui/tv/browser/VerticalGridActivity.java   | 102 ++++
 .../vlc/gui/tv/browser/VideoBrowserFragment.java   |  87 ++++
 .../interfaces/BrowserActivityInterface.java       |  29 ++
 .../interfaces/BrowserFragmentInterface.java       |  29 ++
 111 files changed, 4118 insertions(+), 8 deletions(-)

Diff:   https://code.videolan.org/videolan/vlc-android/commit/7626d89bca63a3f9d97e1727b79c66ba46c66f1f


More information about the Android mailing list