diff options
| author | David Turner | 2013-10-08 18:26:49 -0700 |
|---|---|---|
| committer | David Turner | 2013-10-08 18:26:49 -0700 |
| commit | d4d90b3f07bb379470a2090a8771e4c73be55ff8 (patch) | |
| tree | d5ad543ba1ab17eea5397ce2046487bc9f1bc174 /dists | |
| parent | 38c259b14837d8302f0b7b6df572ddbfa9cb319f (diff) | |
| parent | 7a1ffe8c59964a502c0168264f9b2872afb94122 (diff) | |
| download | scummvm-rg350-d4d90b3f07bb379470a2090a8771e4c73be55ff8.tar.gz scummvm-rg350-d4d90b3f07bb379470a2090a8771e4c73be55ff8.tar.bz2 scummvm-rg350-d4d90b3f07bb379470a2090a8771e4c73be55ff8.zip | |
Merge pull request #372 from zeldin/ouya
Basic OUYA support
Diffstat (limited to 'dists')
| -rw-r--r-- | dists/android/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml.in | 1 | ||||
| -rw-r--r-- | dists/android/res/drawable-xhdpi/ouya_icon.png | bin | 0 -> 110822 bytes | |||
| -rw-r--r-- | dists/android/res/layout/main.xml | 4 | ||||
| -rw-r--r-- | dists/android/res/values-television/margins.xml | 5 | ||||
| -rw-r--r-- | dists/android/res/values/margins.xml | 5 |
6 files changed, 16 insertions, 0 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 320ed16a6e..16d1ee578b 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -36,6 +36,7 @@ <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> + <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> </application> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 8f7887eaf5..bf45ffcc0e 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -36,6 +36,7 @@ <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> + <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> </application> diff --git a/dists/android/res/drawable-xhdpi/ouya_icon.png b/dists/android/res/drawable-xhdpi/ouya_icon.png Binary files differnew file mode 100644 index 0000000000..42f9a2a8ce --- /dev/null +++ b/dists/android/res/drawable-xhdpi/ouya_icon.png diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml index 8b0d515d62..31aa345cc7 100644 --- a/dists/android/res/layout/main.xml +++ b/dists/android/res/layout/main.xml @@ -9,4 +9,8 @@ android:keepScreenOn="true" android:focusable="true" android:focusableInTouchMode="true" + android:layout_marginTop="@dimen/verticalMargin" + android:layout_marginLeft="@dimen/horizontalMargin" + android:layout_marginBottom="@dimen/verticalMargin" + android:layout_marginRight="@dimen/horizontalMargin" /> diff --git a/dists/android/res/values-television/margins.xml b/dists/android/res/values-television/margins.xml new file mode 100644 index 0000000000..df586eea34 --- /dev/null +++ b/dists/android/res/values-television/margins.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="verticalMargin">45px</dimen> + <dimen name="horizontalMargin">80px</dimen> +</resources> diff --git a/dists/android/res/values/margins.xml b/dists/android/res/values/margins.xml new file mode 100644 index 0000000000..a865687b3a --- /dev/null +++ b/dists/android/res/values/margins.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="verticalMargin">0px</dimen> + <dimen name="horizontalMargin">0px</dimen> +</resources> |
