Fix lock icon display bug and update version

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.billthefarmer.tuner"
-    android:versionCode="107"
-    android:versionName="1.07" >
+    android:versionCode="108"
+    android:versionName="1.08" >
 
   <uses-sdk
       android:minSdkVersion="11"

src/org/billthefarmer/tuner/Display.java

@@ -63,8 +63,10 @@ public Display(Context context, AttributeSet attrs)
     {
 	super(context, attrs);
 
+	// Get lock icon
+
 	bitmap = BitmapFactory.decodeResource(resources,
-					      android.R.drawable.ic_lock_lock);
+					      R.drawable.ic_locked);
     }
 
     // On size changed
@@ -115,16 +117,18 @@ protected void onDraw(Canvas canvas)
 	if (audio == null)
 	    return;
 
+	// Draw lock icon
+
+	if (audio.lock && bitmap != null)
+	    canvas.drawBitmap(bitmap, 2, height - bitmap.getHeight() - 2, null);
+
 	// Set up paint
 
 	paint.setStrokeWidth(1);
 	paint.setColor(resources.getColor(android.R.color.primary_text_light));
 	paint.setTextAlign(Align.LEFT);
 	paint.setStyle(Style.FILL);
 
-	if (audio.lock)
-	    canvas.drawBitmap(bitmap, 2, height - bitmap.getHeight() - 2, null);
-
 	// Multiple values
 
 	if (audio.multiple)

src/org/billthefarmer/tuner/Meter.java

@@ -66,6 +66,9 @@ public Meter(Context context, AttributeSet attrs)
 	// Create a matrix for scaling
 
 	matrix = new Matrix();
+
+	// Get display icon
+
 	bitmap = BitmapFactory.decodeResource(resources,
 					      R.drawable.ic_pref_screen);
     }
@@ -159,7 +162,9 @@ protected void onDraw(Canvas canvas)
     {
 	super.onDraw(canvas);
 
-	if (audio != null && audio.screen)
+	// Draw display icon
+
+	if (audio != null && audio.screen && bitmap != null)
 	    canvas.drawBitmap(bitmap, 2, height - bitmap.getHeight() - 2, null);
 
 	// Reset the paint to black