From 3f106b9ce09ca7bab84902b5860f1036b2be6b81 Mon Sep 17 00:00:00 2001
From: James Sanford <jsanford@froop.com>
Date: Tue, 2 Oct 2012 19:48:17 -0700
Subject: [PATCH] Use pure black background.  Bitmap scale must be at least 1.

---
 AndroidManifest.xml                    | 2 +-
 res/values-v11/styles.xml              | 9 +++++++++
 res/values/colors.xml                  | 4 ++++
 res/values/styles.xml                  | 7 +++++++
 src/com/froop/app/kegs/BitmapSize.java | 1 +
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 res/values-v11/styles.xml
 create mode 100644 res/values/colors.xml
 create mode 100644 res/values/styles.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6f7125a..f744a3b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-feature android:name="android.hardware.touchscreen.multitouch.distinct" android:required="false"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:description="@string/app_description" android:hardwareAccelerated="true">
-        <activity android:name="KegsMain" android:launchMode="singleInstance" android:configChanges="orientation|keyboard|keyboardHidden|screenSize" android:windowSoftInputMode="stateAlwaysVisible|adjustPan">
+        <activity android:name="KegsMain" android:launchMode="singleInstance" android:configChanges="orientation|keyboard|keyboardHidden|screenSize" android:theme="@style/Theme.BlackBackground">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 0000000..056cf13
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- For API level 11 and later, use a parent of Theme.Holo. -->
+
+<resources>
+  <style name="Theme.BlackBackground" parent="android:Theme.Holo">
+    <item name="android:windowBackground">@drawable/screen_background_black</item>
+  </style>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..3b7c940
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <drawable name="screen_background_black">#ff000000</drawable>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..b76a54f
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+  <style name="Theme.BlackBackground" parent="android:Theme">
+    <item name="android:windowBackground">@drawable/screen_background_black</item>
+  </style>
+</resources>
diff --git a/src/com/froop/app/kegs/BitmapSize.java b/src/com/froop/app/kegs/BitmapSize.java
index 91f96e8..079f943 100644
--- a/src/com/froop/app/kegs/BitmapSize.java
+++ b/src/com/froop/app/kegs/BitmapSize.java
@@ -85,6 +85,7 @@ class BitmapSize {
 
     // Force integer scaling on X axis.
     scaleX = (float)Math.round((width * 0.9) / 640);
+    scaleX = Math.max(1, scaleX);
     // TODO: Fix '48' hack being used for system buttons or soft buttons.
     scaleY = Math.min(scaleX, (height - 48) / 400.0f);