diff options
Diffstat (limited to 'tools/android/packaging')
13 files changed, 29 insertions, 23 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 121b515a05..cffb9edb28 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -105,6 +105,8 @@ res: cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png cp -fp media/drawable-xhdpi/ic_launcher.png xbmc/res/drawable-xhdpi/ic_launcher.png cp -fp media/drawable-xxhdpi/ic_launcher.png xbmc/res/drawable-xxhdpi/ic_launcher.png + cp -fp media/drawable-xhdpi/banner.png xbmc/res/drawable-xhdpi/banner.png + cp -fp media/drawable-xhdpi/ouya_icon.png xbmc/res/drawable-xhdpi/ouya_icon.png cp xbmc/strings.xml xbmc/res/values/ 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 diff --git a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png b/tools/android/packaging/media/drawable-hdpi/ic_launcher.png Binary files differindex 62f2673cdb..5577fcb74f 100644 --- a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png +++ b/tools/android/packaging/media/drawable-hdpi/ic_launcher.png diff --git a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png b/tools/android/packaging/media/drawable-ldpi/ic_launcher.png Binary files differindex 9fc808858b..55f85e0476 100644 --- a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png +++ b/tools/android/packaging/media/drawable-ldpi/ic_launcher.png diff --git a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png b/tools/android/packaging/media/drawable-mdpi/ic_launcher.png Binary files differindex 9fc1d9bd21..670e2aa8cb 100644 --- a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png +++ b/tools/android/packaging/media/drawable-mdpi/ic_launcher.png diff --git a/tools/android/packaging/media/drawable-xhdpi/banner.png b/tools/android/packaging/media/drawable-xhdpi/banner.png Binary files differnew file mode 100644 index 0000000000..7bf98b2945 --- /dev/null +++ b/tools/android/packaging/media/drawable-xhdpi/banner.png diff --git a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png Binary files differindex a6631ce55b..9ec4a9a1bd 100644 --- a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png +++ b/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png diff --git a/tools/android/packaging/media/drawable-xhdpi/ouya_icon.png b/tools/android/packaging/media/drawable-xhdpi/ouya_icon.png Binary files differnew file mode 100644 index 0000000000..48caf085f3 --- /dev/null +++ b/tools/android/packaging/media/drawable-xhdpi/ouya_icon.png diff --git a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png Binary files differindex 30035fff77..f0fcb169a6 100644 --- a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png +++ b/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png diff --git a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png Binary files differindex 09d9993005..429420c2a7 100644 --- a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png +++ b/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png diff --git a/tools/android/packaging/media/playstore.png b/tools/android/packaging/media/playstore.png Binary files differindex 8ffb8b8527..c51b2a7fe3 100644 --- a/tools/android/packaging/media/playstore.png +++ b/tools/android/packaging/media/playstore.png diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index e185665507..ba7ade529c 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -20,7 +20,10 @@ <uses-feature android:name="android.hardware.usb.host" android:required="false" /> <uses-feature android:name="android.hardware.wifi" android:required="false" /> - <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:hasCode="true"> + <application android:icon="@drawable/ic_launcher" + android:logo="@drawable/banner" + android:label="@string/app_name" + android:hasCode="true"> <activity android:name=".Splash" android:configChanges="orientation|keyboard|keyboardHidden|navigation|touchscreen" @@ -32,6 +35,7 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LEANBACK_LAUNCHER" /> + <category android:name="tv.ouya.intent.category.APP"/> </intent-filter> <intent-filter> <action android:name="android.intent.action.VIEW" /> diff --git a/tools/android/packaging/xbmc/res/drawable/progresscolor.xml b/tools/android/packaging/xbmc/res/drawable/progresscolor.xml index 0293d4818c..4bca6f2cd7 100644 --- a/tools/android/packaging/xbmc/res/drawable/progresscolor.xml +++ b/tools/android/packaging/xbmc/res/drawable/progresscolor.xml @@ -7,8 +7,8 @@ <gradient android:angle="270" - android:endColor="#0e0e0e" - android:startColor="#7d7e7d" + android:endColor="#0E5A91" + android:startColor="#31afe1" /> </shape> </item> @@ -19,8 +19,8 @@ <gradient android:angle="270" - android:endColor="#7d7e7d" - android:startColor="#ffffff" /> + android:endColor="#31afe1" + android:startColor="#E5F7FF" /> </shape> </clip> </item> diff --git a/tools/android/packaging/xbmc/res/layout/activity_splash.xml b/tools/android/packaging/xbmc/res/layout/activity_splash.xml index f5d3a7a5ab..04d417e2dd 100644 --- a/tools/android/packaging/xbmc/res/layout/activity_splash.xml +++ b/tools/android/packaging/xbmc/res/layout/activity_splash.xml @@ -1,22 +1,22 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" > + <ImageView + android:id="@+id/imageView1" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:adjustViewBounds="true" + android:layout_alignParentTop="true" + android:scaleType="center" + android:src="@drawable/splash" /> + <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" > - - <ImageView - android:id="@+id/imageView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:adjustViewBounds="true" - android:scaleType="fitXY" - android:src="@drawable/splash" /> + android:layout_gravity="center_horizontal|bottom" > <ProgressBar android:id="@+id/progressBar1" @@ -25,11 +25,11 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_below="@+id/imageView1" + android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="20dp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginTop="10dp" android:progress="50" android:progressDrawable="@drawable/progresscolor" /> @@ -37,11 +37,11 @@ android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/imageView1" + android:layout_above="@+id/progressBar1" android:layout_centerHorizontal="true" android:text="" android:textColor="@android:color/white" android:textSize="16dp" /> </RelativeLayout> -</RelativeLayout> +</FrameLayout> |
