Proper selection highlighting

code/ContextHome/res/drawable/grid_selector.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/pressed_application_background" />
+    <item android:state_focused="false" android:drawable="@android:color/transparent" />
+    <item android:state_window_focused="true" android:drawable="@drawable/focused_application_background" />
+    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+</selector>

code/ContextHome/res/layout/titledimage.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent" android:layout_height="wrap_content">
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:background="@drawable/grid_selector"
+        android:paddingLeft="5px"
+        android:paddingRight="5px">
     <ImageView
         android:id="@+id/image"
         android:layout_width="14pt"
@@ -13,12 +18,14 @@
         android:layout_toRightOf="@id/image"
         android:layout_width="wrap_content"
         android:singleLine="true"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:textColor="#fff"/>
     <TextView
         android:id="@+id/body"
         android:layout_below="@id/title"
         android:layout_toRightOf="@id/image"
         android:layout_width="wrap_content"
         android:singleLine="true"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:textColor="#fff"/>
 </RelativeLayout>

code/ContextHome/src/uk/co/md87/android/contexthome/R.java

@@ -12,7 +12,10 @@ public final class R {
     }
     public static final class drawable {
         public static final int blank=0x7f020000;
-        public static final int icon=0x7f020001;
+        public static final int focused_application_background=0x7f020001;
+        public static final int grid_selector=0x7f020002;
+        public static final int icon=0x7f020003;
+        public static final int pressed_application_background=0x7f020004;
     }
     public static final class id {
         public static final int body=0x7f050003;

code/ContextHome/src/uk/co/md87/android/contexthome/modules/AppsModule.java

@@ -70,7 +70,9 @@ public class AppsModule implements Module {
             image.setClickable(true);
             image.setTag(res.activityInfo);
             image.setOnClickListener(listener);
-            layout.addView(image, 48, 48);
+            image.setPadding(2, 2, 2, 2);
+            image.setBackgroundResource(R.drawable.grid_selector);
+            layout.addView(image, 52, 52);
         }
 
         return view;

code/ContextHome/src/uk/co/md87/android/contexthome/modules/ContactsModule.java

@@ -22,24 +22,17 @@
 
 package uk.co.md87.android.contexthome.modules;
 
-import android.content.ComponentName;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.net.Uri;
-import android.provider.Contacts;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Photos;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import java.util.Arrays;
+
 import uk.co.md87.android.contexthome.Module;
 import uk.co.md87.android.contexthome.R;
 
@@ -73,7 +66,7 @@ public class ContactsModule implements Module {
         final int column = cursor.getColumnIndex("person");
         if (cursor.moveToFirst()) {
             do {
-                layout.addView(getView(context, listener, cursor.getLong(column)));
+                layout.addView(getView(context, listener, cursor.getLong(column)), 52, 52);
             } while (cursor.moveToNext());
         }
 
@@ -90,6 +83,8 @@ public class ContactsModule implements Module {
         image.setImageBitmap(People.loadContactPhoto(context,
                     uri, R.drawable.blank, null));
         image.setOnClickListener(listener);
+        image.setBackgroundResource(R.drawable.grid_selector);
+        image.setPadding(2, 2, 2, 2);
 
         return image;
     }