diff options
Diffstat (limited to 'tools/android')
7 files changed, 15 insertions, 15 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 7a18544ac3..388c677690 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -8,7 +8,7 @@ OBJS = libplist.so libshairplay.so \ libbluray.so libsmbclient.so PLATFORM_OBJS = -EXCLUDED_ADDONS = +EXCLUDED_ADDONS = CMAKE_SOURCE_DIR = $(shell cd $(CURDIR)/../../..; pwd) APP_PACKAGE_DIR = $(subst .,/,@APP_PACKAGE@) @@ -28,7 +28,7 @@ endif X86OVERRIDES=XBMC_OVERRIDE_HOST=i686-android-linux XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_X86_TOOLCHAIN) ARMOVERRIDES=XBMC_OVERRIDE_HOST=arm-linux-androideabi XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_ARM_TOOLCHAIN) -#this fixes a android ndk fuckup where the paths to +#this fixes a android ndk fuckup where the paths to #prebuilt stuff follow different name schemes for #arm and x86 ifeq ($(findstring i686,$(CPU)),i686) diff --git a/tools/android/packaging/apksign b/tools/android/packaging/apksign index 0a2289b6c7..7ac9f57bb9 100755 --- a/tools/android/packaging/apksign +++ b/tools/android/packaging/apksign @@ -6,5 +6,5 @@ usage(){ [[ $# -lt 3 ]] && usage -make apk-sign SIGN_STORE=$1 SIGN_STOREPASS=$2 SIGN_KEY=$3 SIGN_KEYPASS=$4 +make apk-sign SIGN_STORE=$1 SIGN_STOREPASS=$2 SIGN_KEY=$3 SIGN_KEYPASS=$4 diff --git a/tools/android/packaging/xbmc/build.gradle.in b/tools/android/packaging/xbmc/build.gradle.in index 4850c47f5f..7ef91d66ef 100644 --- a/tools/android/packaging/xbmc/build.gradle.in +++ b/tools/android/packaging/xbmc/build.gradle.in @@ -20,7 +20,7 @@ android { debugUnsigned { signingConfig null } - + } aaptOptions { ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' diff --git a/tools/android/packaging/xbmc/res/layout/activity_splash.xml b/tools/android/packaging/xbmc/res/layout/activity_splash.xml index 5fdab946fa..eedd3a4668 100644 --- a/tools/android/packaging/xbmc/res/layout/activity_splash.xml +++ b/tools/android/packaging/xbmc/res/layout/activity_splash.xml @@ -9,7 +9,7 @@ android:layout_height="match_parent" android:layout_centerHorizontal="true" android:adjustViewBounds="true" - android:layout_alignParentTop="true" + android:layout_alignParentTop="true" android:scaleType="centerCrop" android:src="@drawable/splash" /> @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" + android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" diff --git a/tools/android/packaging/xbmc/res/xml/searchable.xml b/tools/android/packaging/xbmc/res/xml/searchable.xml index a914552794..af66a877fe 100644 --- a/tools/android/packaging/xbmc/res/xml/searchable.xml +++ b/tools/android/packaging/xbmc/res/xml/searchable.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <searchable xmlns:android="http://schemas.android.com/apk/res/android" android:label="@string/app_name" - android:hint="@string/search_hint" + android:hint="@string/search_hint" android:searchSuggestAuthority="org.xbmc.kodi.media" android:searchSuggestPath="suggestions" - + android:searchSuggestIntentAction="android.intent.action.GET_CONTENT" android:searchSuggestIntentData="content://org.xbmc.kodi.media/intent" - + android:includeInGlobalSearch="true" android:searchSettingsDescription="Media" android:searchSuggestThreshold="3" diff --git a/tools/android/packaging/xbmc/searchable.xml.in b/tools/android/packaging/xbmc/searchable.xml.in index 6b0e38d405..682dacd345 100644 --- a/tools/android/packaging/xbmc/searchable.xml.in +++ b/tools/android/packaging/xbmc/searchable.xml.in @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <searchable xmlns:android="http://schemas.android.com/apk/res/android" android:label="@string/app_name" - android:hint="@string/search_hint" + android:hint="@string/search_hint" android:searchSuggestAuthority="@APP_PACKAGE@.media" android:searchSuggestPath="suggestions" - + android:searchSuggestIntentAction="android.intent.action.VIEW" android:searchSuggestIntentData="content://@APP_PACKAGE@.media/intent" - + android:includeInGlobalSearch="true" android:searchSettingsDescription="Media" android:searchSuggestThreshold="3" diff --git a/tools/android/packaging/xbmc/src/content/XBMCMediaContentProvider.java.in b/tools/android/packaging/xbmc/src/content/XBMCMediaContentProvider.java.in index 98179571e2..47e5327702 100644 --- a/tools/android/packaging/xbmc/src/content/XBMCMediaContentProvider.java.in +++ b/tools/android/packaging/xbmc/src/content/XBMCMediaContentProvider.java.in @@ -12,7 +12,7 @@ import @APP_PACKAGE@.XBMCJsonRPC; public class XBMCMediaContentProvider extends XBMCContentProvider { private static String TAG = "@APP_NAME@_Media_Provider"; - + public static final String AUTHORITY = AUTHORITY_ROOT + ".media"; public static final String SUGGEST_PATH = "suggestions"; @@ -65,7 +65,7 @@ public class XBMCMediaContentProvider extends XBMCContentProvider String[] selectionArgs, String sortOrder) { Log.d(TAG, "query: " + uri.toString()); - + switch (URI_MATCHER.match(uri)) { case SEARCH_SUGGEST: @@ -75,7 +75,7 @@ public class XBMCMediaContentProvider extends XBMCContentProvider limit = Integer.parseInt(uri.getQueryParameter("limit")); } catch (Exception e) {} return mJsonRPC.getSuggestions(query, limit); - + default: throw new IllegalArgumentException("Unknown Uri: " + uri); } |