Merge remote-tracking branch 'mainline/master'

CMakeLists.txt

@@ -134,7 +134,7 @@ set(required_deps Cdio
                   FFMPEG
                   Fmt
                   FreeType
-                  Fribidi
+                  FriBidi
                   LibDvd
                   Lzo2
                   PCRE

README.md

@@ -38,20 +38,20 @@ computer will become a fully functional multimedia jukebox.
 
 ## Installation
 
-See [docs/README.xxx] (https://github.com/xbmc/xbmc/tree/master/docs) for specific platform build information.
+See [docs/README.xxx](https://github.com/xbmc/xbmc/tree/master/docs) for specific platform build information.
 
 ## Quick Kodi development links
 
-* [Contributing] (https://github.com/xbmc/xbmc/blob/master/CONTRIBUTING.md)
-* [Submitting a patch] (http://kodi.wiki/view/HOW-TO_submit_a_patch)
-* [Code guidelines] (https://codedocs.xyz/xbmc/xbmc/code_guidelines.html)
-* [Kodi development] (http://kodi.wiki/view/Development)
+* [Contributing](https://github.com/xbmc/xbmc/blob/master/CONTRIBUTING.md)
+* [Submitting a patch](http://kodi.wiki/view/HOW-TO_submit_a_patch)
+* [Code guidelines](https://codedocs.xyz/xbmc/xbmc/code_guidelines.html)
+* [Kodi development](http://kodi.wiki/view/Development)
 
 ## Useful links
 
-* [Kodi wiki] (http://kodi.wiki/)
-* [Kodi bug tracker] (http://trac.kodi.tv)
-* [Kodi community forums] (http://forum.kodi.tv/)
-* [Kodi website] (http://kodi.tv)
+* [Kodi wiki](http://kodi.wiki/)
+* [Kodi bug tracker](http://trac.kodi.tv)
+* [Kodi community forums](http://forum.kodi.tv/)
+* [Kodi website](http://kodi.tv)
 
 **Enjoy Kodi and help us improve it today. :)**

addons/skin.estuary/xml/Home.xml

@@ -522,7 +522,6 @@
 						<onright>9000</onright>
 						<onup>14100</onup>
 						<ondown>14100</ondown>
-						<onclick>$INFO[ListItem.FileNameAndPath]</onclick>
 						<preloaditems>2</preloaditems>
 						<scrolltime tween="cubic" easing="out">500</scrolltime>
 						<orientation>vertical</orientation>

addons/skin.estuary/xml/View_55_WideList.xml

@@ -92,14 +92,12 @@
 						<texture colordiffuse="button_focus">lists/focus.png</texture>
 						<visible>Control.HasFocus(55)</visible>
 					</control>
-					<control type="label">
-						<left>18</left>
-						<top>0</top>
-						<bottom>0</bottom>
-						<width>80</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Year]</label>
-						<shadowcolor>text_shadow</shadowcolor>
+					<control type="image">
+						<left>35</left>
+						<centertop>50%</centertop>
+						<width>32</width>
+						<height>32</height>
+						<texture>$VAR[ListWatchedIconVar]</texture>
 					</control>
 					<control type="label">
 						<left>105</left>
@@ -123,15 +121,12 @@
 					</control>
 				</focusedlayout>
 				<itemlayout height="list_item_height" condition="!Container.Content(songs) + !Container.Content(addons) + !Container.Content(playlists) + !Container.Content() + !Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(movies) + !Container.Content(musicvideos) + !Container.Content(videos)">
-					<control type="label">
-						<left>18</left>
-						<top>0</top>
-						<bottom>0</bottom>
-						<width>80</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Year]</label>
-						<textcolor>button_focus</textcolor>
-						<shadowcolor>text_shadow</shadowcolor>
+					<control type="image">
+						<left>35</left>
+						<centertop>50%</centertop>
+						<width>32</width>
+						<height>32</height>
+						<texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture>
 					</control>
 					<control type="label">
 						<left>105</left>

cmake/KodiConfig.cmake.in

@@ -1,6 +1,7 @@
 set(APP_NAME @APP_NAME@)
 set(APP_NAME_LC @APP_NAME_LC@)
 set(APP_NAME_UC @APP_NAME_UC@)
+set(APP_PACKAGE @APP_PACKAGE@)
 set(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
 set(APP_VERSION_MINOR @APP_VERSION_MINOR@)
 if(NOT @APP_NAME_UC@_PREFIX)

cmake/modules/FindAlsa.cmake

@@ -26,7 +26,7 @@ find_library(ALSA_LIBRARY NAMES asound
 set(ALSA_VERSION ${PC_ALSA_VERSION})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ALSA
+find_package_handle_standard_args(Alsa
                                   REQUIRED_VARS ALSA_LIBRARY ALSA_INCLUDE_DIR
                                   VERSION_VAR ALSA_VERSION)
 

cmake/modules/FindCCache.cmake

@@ -9,7 +9,7 @@
 find_program(CCACHE_PROGRAM ccache)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CCACHE REQUIRED_VARS CCACHE_PROGRAM)
+find_package_handle_standard_args(CCache REQUIRED_VARS CCACHE_PROGRAM)
 
 if(CCACHE_FOUND)
   # Supports Unix Makefiles and Ninja

cmake/modules/FindCdio.cmake

@@ -20,13 +20,13 @@ endif()
 find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h
                            PATHS ${PC_CDIO_libcdio_INCLUDEDIR}
                                  ${PC_CDIO_libiso9660_INCLUDEDIR})
-find_library(CDIO_LIBRARY NAMES cdio
+find_library(CDIO_LIBRARY NAMES cdio libcdio
                           PATHS ${CDIO_libcdio_LIBDIR} ${CDIO_libiso9660_LIBDIR})
 
 set(CDIO_VERSION ${PC_CDIO_libcdio_VERSION})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CDIO
+find_package_handle_standard_args(Cdio
                                   REQUIRED_VARS CDIO_LIBRARY CDIO_INCLUDE_DIR
                                   VERSION_VAR CDIO_VERSION)
 

cmake/modules/FindCrossGUID.cmake

@@ -42,7 +42,7 @@ if(ENABLE_INTERNAL_CROSSGUID)
   set_target_properties(crossguid PROPERTIES FOLDER "External Projects")
 
   include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(CrossGuid
+  find_package_handle_standard_args(CrossGUID
                                     REQUIRED_VARS CROSSGUID_LIBRARY CROSSGUID_INCLUDE_DIR
                                     VERSION_VAR CGUID_VER)
 
@@ -58,7 +58,7 @@ else()
   select_library_configurations(CROSSGUID)
 
   include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(CrossGuid
+  find_package_handle_standard_args(CrossGUID
                                     REQUIRED_VARS CROSSGUID_LIBRARY CROSSGUID_INCLUDE_DIR)
 
   if(CROSSGUID_FOUND)

cmake/modules/FindLibDvd.cmake

@@ -19,7 +19,7 @@ if(NOT WIN32)
     endif()
 
     include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(LIBDVD REQUIRED_VARS ${_handlevars})
+    find_package_handle_standard_args(LibDvd REQUIRED_VARS ${_handlevars})
     if(LIBDVD_FOUND)
       add_library(dvdnav UNKNOWN IMPORTED)
       set_target_properties(dvdnav PROPERTIES
@@ -206,7 +206,7 @@ else()
   find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h PATHS ${CMAKE_SOURCE_DIR}/lib/libdvd/include)
 
   include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(LIBDVD REQUIRED_VARS LIBDVD_INCLUDE_DIR)
+  find_package_handle_standard_args(LibDvd REQUIRED_VARS LIBDVD_INCLUDE_DIR)
 
   if(LIBDVD_FOUND)
     set(LIBDVD_INCLUDE_DIRS ${LIBDVD_INCLUDE_DIR})

cmake/modules/FindMDNS.cmake

@@ -20,7 +20,7 @@ find_library(MDNS_LIBRARY NAMES mDNSEmbedded dnssd)
 find_path(MDNS_EMBEDDED_INCLUDE_DIR NAMES mDnsEmbedded.h)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(mDNS
+find_package_handle_standard_args(MDNS
                                   REQUIRED_VARS MDNS_LIBRARY MDNS_INCLUDE_DIR)
 
 if(MDNS_FOUND)

cmake/modules/FindPlist.cmake

@@ -28,12 +28,12 @@ if(NOT WIN32)
   find_library(PLIST_LIBRARY NAMES plist
                                    PATHS ${PC_PLIST_LIBDIR})
 
-  find_package_handle_standard_args(PLIST
+  find_package_handle_standard_args(Plist
                                     REQUIRED_VARS PLIST_LIBRARY PLIST_INCLUDE_DIR
                                     VERSION_VAR PLIST_VERSION)
 else()
   # Dynamically loaded DLL
-  find_package_handle_standard_args(PLIST
+  find_package_handle_standard_args(Plist
                                     REQUIRED_VARS PLIST_INCLUDE_DIR
                                     VERSION_VAR PLIST_VERSION)
 endif()

cmake/modules/FindPython.cmake

@@ -30,7 +30,7 @@ else()
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PYTHON REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES)
+find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES)
 if(PYTHON_FOUND)
   set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
   list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1)

cmake/modules/FindZip.cmake

@@ -25,7 +25,7 @@ find_library(ZIP_LIBRARY NAMES zip
 set(ZIP_VERSION ${PC_ZIP_VERSION})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ZIP
+find_package_handle_standard_args(Zip
                                   REQUIRED_VARS ZIP_LIBRARY ZIP_INCLUDE_DIR
                                   VERSION_VAR ZIP_VERSION)
 

cmake/scripts/android/Install.cmake

@@ -31,15 +31,24 @@ file(WRITE ${CMAKE_BINARY_DIR}/tools/depends/Makefile.include
 
 set(package_files strings.xml
                   activity_main.xml
+                  colors.xml
+                  searchable.xml
                   AndroidManifest.xml
-                  src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java
-                  src/org/xbmc/kodi/XBMCInputDeviceListener.java
                   src/org/xbmc/kodi/Main.java
-                  src/org/xbmc/kodi/XBMCSettingsContentObserver.java
+                  src/org/xbmc/kodi/Splash.java
+                  src/org/xbmc/kodi/XBMCBroadcastReceiver.java
+                  src/org/xbmc/kodi/XBMCImageContentProvider.java
+                  src/org/xbmc/kodi/XBMCInputDeviceListener.java
+                  src/org/xbmc/kodi/XBMCJsonRPC.java
+                  src/org/xbmc/kodi/XBMCMediaContentProvider.java
+                  src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java
                   src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java
+                  src/org/xbmc/kodi/XBMCRecommendationBuilder.java
+                  src/org/xbmc/kodi/XBMCSearchableActivity.java
+                  src/org/xbmc/kodi/XBMCSettingsContentObserver.java
+                  src/org/xbmc/kodi/XBMCProperties.java
                   src/org/xbmc/kodi/XBMCVideoView.java
-                  src/org/xbmc/kodi/Splash.java
-                  src/org/xbmc/kodi/XBMCBroadcastReceiver.java)
+                  )
 foreach(file IN LISTS package_files)
   configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/${file}.in
                  ${CMAKE_BINARY_DIR}/tools/android/packaging/xbmc/${file} @ONLY)

cmake/scripts/common/Macros.cmake

@@ -590,6 +590,7 @@ endfunction()
 #   APP_NAME - app name
 #   APP_NAME_LC - lowercased app name
 #   APP_NAME_UC - uppercased app name
+#   APP_PACKAGE - Android full package name
 #   COMPANY_NAME - company name
 #   APP_VERSION_MAJOR - the app version major
 #   APP_VERSION_MINOR - the app version minor
@@ -613,13 +614,14 @@ macro(core_find_versions)
   include(CMakeParseArguments)
   core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt)
   string(REPLACE " " ";" version_list "${version_list}")
-  cmake_parse_arguments(APP "" "APP_NAME;COMPANY_NAME;WEBSITE;VERSION_MAJOR;VERSION_MINOR;VERSION_TAG;VERSION_CODE;ADDON_API" "" ${version_list})
+  cmake_parse_arguments(APP "" "APP_NAME;COMPANY_NAME;WEBSITE;VERSION_MAJOR;VERSION_MINOR;VERSION_TAG;VERSION_CODE;ADDON_API;APP_PACKAGE" "" ${version_list})
 
   set(APP_NAME ${APP_APP_NAME}) # inconsistency but APP_APP_NAME looks weird
   string(TOLOWER ${APP_APP_NAME} APP_NAME_LC)
   string(TOUPPER ${APP_APP_NAME} APP_NAME_UC)
   set(COMPANY_NAME ${APP_COMPANY_NAME})
   set(APP_VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR})
+  set(APP_PACKAGE ${APP_APP_PACKAGE})
   if(APP_VERSION_TAG)
     set(APP_VERSION ${APP_VERSION}-${APP_VERSION_TAG})
     string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC)

cmake/scripts/rbpi/ArchSetup.cmake

@@ -23,6 +23,11 @@ else()
   endif()
 endif()
 
+# Make sure we strip binaries in Release build
+if(CMAKE_BUILD_TYPE STREQUAL Release AND CMAKE_COMPILER_IS_GNUCXX)
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+endif()
+
 find_package(CXX11 REQUIRED)
 
 set(MMAL_FOUND 1 CACHE INTERNAL "MMAL")

tools/android/packaging/Makefile.in

@@ -121,7 +121,9 @@ res:
 	cp -fp media/drawable-xxxhdpi/ic_launcher.png xbmc/res/drawable-xxxhdpi/ic_launcher.png
 	cp -fp media/drawable-xhdpi/banner.png xbmc/res/drawable-xhdpi/banner.png
 	cp xbmc/strings.xml xbmc/res/values/
+	cp xbmc/colors.xml xbmc/res/values/
 	cp xbmc/activity_main.xml xbmc/res/layout/
+	cp xbmc/searchable.xml xbmc/res/xml/
 	mkdir -p tmp/res; $(AAPT) c -S xbmc/res -C tmp/res; cp -r -n xbmc/res tmp/ || true
 	$(AAPT) p -f -I $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/@APP_NAME_LC@app-debug-skeleton.apk -J xbmc/src
 	@rm -rf tmp/
@@ -138,6 +140,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so
 	cd xbmc/obj/local/$(CPU)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@
 	cp -fp xbmc/obj/local/$(CPU)/*.so xbmc/lib/$(CPU)/
 	$(STRIP) --strip-unneeded xbmc/lib/$(CPU)/*.so
+	cp -fp $(SDKROOT)/extras/android/support/v4/android-support-v4.jar xbmc/libs
 	install -p $(GDBPATH) ./xbmc/libs/$(CPU)/gdbserver
 	echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/libs/$(CPU)/gdb.setup
 	echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \
@@ -146,9 +149,9 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so
 
 xbmc/classes.dex: res
 	mkdir -p xbmc/obj
-	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/src/*.java $(JAVAC_EXTRA_ARGS)
-	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/src/org/xbmc/kodi/*.java $(JAVAC_EXTRA_ARGS)
-	@$(DX) --dex --output=xbmc/classes.dex xbmc/obj
+	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:$(SDKROOT)/extras/android/support/v4/android-support-v4.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/src/*.java $(JAVAC_EXTRA_ARGS)
+	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:$(SDKROOT)/extras/android/support/v4/android-support-v4.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/src/org/xbmc/kodi/*.java $(JAVAC_EXTRA_ARGS)
+	@$(DX) --dex --output=xbmc/classes.dex xbmc/obj xbmc/libs
 
 package: libs python xbmc/classes.dex
 	@echo "Creating package..."

tools/android/packaging/xbmc/AndroidManifest.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.xbmc.@APP_NAME_LC@"
+    package="@APP_PACKAGE@"
     android:versionCode="@APP_VERSION_CODE@"
     android:versionName="@APP_VERSION@" >
 
@@ -93,6 +93,31 @@
             </intent-filter>
         </receiver>
 
+        <provider
+            android:name=".XBMCImageContentProvider"
+            android:authorities="@APP_PACKAGE@.image"
+            android:exported="true" />
+
+        <provider
+            android:name=".XBMCMediaContentProvider"
+            android:authorities="@APP_PACKAGE@.media"
+            android:exported="true" />
+
+        <activity android:name=".XBMCSearchableActivity" >
+             <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.google.android.gms.actions.SEARCH_ACTION"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+                <meta-data android:name="android.app.searchable"
+                   android:resource="@xml/searchable"/>
+        </activity>
+
     </application>
 
 </manifest><!-- END_INCLUDE(manifest) -->

tools/android/packaging/xbmc/activity_main.xml.in

@@ -4,7 +4,7 @@
   android:layout_height="match_parent"
   android:background="@android:color/transparent" >
 
-  <org.xbmc.@APP_NAME_LC@.XBMCVideoView
+  <@APP_PACKAGE@.XBMCVideoView
     android:id="@+id/VideoView1"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"

tools/android/packaging/xbmc/colors.xml.in

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <color name="principal_color">#31AFE1</color>
+   <color name="recommendation_color">#31AFE1</color>
+</resources>

tools/android/packaging/xbmc/res/drawable/progresscolor.xml

@@ -8,7 +8,7 @@
             <gradient
                 android:angle="270"
                 android:endColor="#0E5A91"
-                android:startColor="#31afe1"
+                android:startColor="@color/principal_color"
                 />
         </shape>
     </item>
@@ -19,7 +19,7 @@
 
                 <gradient
                     android:angle="270"
-                    android:endColor="#31afe1"
+                    android:endColor="@color/principal_color"
                     android:startColor="#E5F7FF" />
             </shape>
         </clip>

tools/android/packaging/xbmc/res/layout/result.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="5dp">
+    <TextView
+            android:id="@+id/title"
+            style="@android:style/TextAppearance.Large"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    <TextView
+            android:id="@+id/tagline"
+            style="@android:style/TextAppearance.Small"
+            android:singleLine="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+</LinearLayout>