From a9113402049fc9ae8d3b3a10c6ca99d9ba5ad79c Mon Sep 17 00:00:00 2001
From: dmazzoni <dmazzoni@35bc551c-9c80-11dd-979b-47109e308e52>
Date: Mon, 26 Jul 2010 14:30:30 +0000
Subject: [PATCH] Update to Android 1.6 API. Improve accessibility with better
 keyboard control and content descriptions. Fix problems with assigning
 ringtone to contact on Android 2.0 and later. Update version to 2.4.

git-svn-id: http://ringdroid.googlecode.com/svn/trunk@53 35bc551c-9c80-11dd-979b-47109e308e52
---
 AndroidManifest.xml                          |  7 +-
 README.txt                                   |  2 +-
 res/layout-land/editor.xml                   | 91 +++++++++++++-------
 res/layout-land/media_select.xml             |  7 +-
 res/layout-land/media_select_row.xml         | 12 +--
 res/layout/after_save_action.xml             |  4 +-
 res/layout/choose_contact.xml                |  4 +-
 res/layout/contact_row.xml                   | 28 +++---
 res/layout/editor.xml                        | 79 ++++++++++-------
 res/layout/file_save.xml                     | 20 ++---
 res/layout/media_select.xml                  | 24 ++++--
 res/layout/media_select_row.xml              | 16 ++--
 res/values/strings.xml                       | 14 +++
 res/values/styles.xml                        |  1 +
 src/com/ringdroid/ChooseContactActivity.java | 26 +++++-
 src/com/ringdroid/RingdroidEditActivity.java | 63 ++++++++++----
 src/com/ringdroid/WaveformView.java          |  6 +-
 17 files changed, 266 insertions(+), 138 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ec0d9de..3c5d312 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,15 +21,16 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.ringdroid"
-          android:versionName="2.3"
-          android:versionCode="20300">
+          android:versionName="2.4"
+          android:versionCode="20400">
 
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="4" />
 
     <uses-permission android:name="android.permission.INTERNET" /> 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:label="@string/ringdroid_app_name"
                  android:icon="@drawable/ringdroidlogo">
diff --git a/README.txt b/README.txt
index b85a053..983653e 100644
--- a/README.txt
+++ b/README.txt
@@ -36,7 +36,7 @@ in your path.  Then run:
 
 rm build.xml
 rm -rf bin/ 
-android update project -n ringdroid -t 2 -p .
+android update project -n ringdroid -t android-4 -p .
 
 Then, to build:
   ant debug
diff --git a/res/layout-land/editor.xml b/res/layout-land/editor.xml
index daf0fe8..dd47016 100644
--- a/res/layout-land/editor.xml
+++ b/res/layout-land/editor.xml
@@ -38,18 +38,25 @@
        android:layout_height="fill_parent" />
 
       <com.ringdroid.MarkerView android:id="@+id/startmarker"
+        android:nextFocusDown="@+id/endmarker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/marker_left" />
+        android:src="@drawable/marker_left"
+        android:contentDescription="@string/start_marker" />
 
       <com.ringdroid.MarkerView android:id="@+id/endmarker"
+        android:nextFocusUp="@+id/startmarker"
+        android:nextFocusDown="@+id/info"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/marker_right" />
+        android:src="@drawable/marker_right"
+        android:contentDescription="@string/end_marker" />
 
     </AbsoluteLayout>
 
     <TextView android:id="@+id/info"
+       android:nextFocusUp="@+id/endmarker"
+       android:nextFocusDown="@+id/play"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        style="@style/AudioFileInfoOverlayText"
@@ -58,31 +65,37 @@
     <LinearLayout
      style="@style/ToolbarBackground"
      android:layout_width="fill_parent" 
-     android:layout_height="68px">
+     android:layout_height="68dip">
 
         <LinearLayout
          android:layout_width="wrap_content" 
          android:layout_height="fill_parent"
-         android:layout_marginLeft="5px"
-         android:layout_marginRight="5px"
+         android:layout_marginLeft="5dip"
+         android:layout_marginRight="5dip"
          android:gravity="center">
 
 	  <ImageButton android:id="@+id/rew"
-	   android:layout_width="52px"
-	   android:layout_height="52px"
+           android:nextFocusUp="@+id/info"
+	   android:layout_width="52dip"
+	   android:layout_height="52dip"
            style="@android:style/MediaButton"
+           android:contentDescription="@string/rewind"
 	   android:src="@drawable/ic_media_rew" />
 
 	  <ImageButton android:id="@+id/play"
-	   android:layout_width="52px"
-	   android:layout_height="52px"
+           android:nextFocusUp="@+id/info"
+	   android:layout_width="52dip"
+	   android:layout_height="52dip"
            style="@android:style/MediaButton"
+           android:contentDescription="@string/play"
 	   android:src="@drawable/ic_media_play" />
 
 	  <ImageButton android:id="@+id/ffwd"
-	   android:layout_width="52px"
-	   android:layout_height="52px"
+           android:nextFocusUp="@+id/info"
+	   android:layout_width="52dip"
+	   android:layout_height="52dip"
            style="@android:style/MediaButton"
+           android:contentDescription="@string/ffwd"
 	   android:src="@drawable/ic_media_ff" />
 
         </LinearLayout>
@@ -93,18 +106,23 @@
         <LinearLayout
          android:layout_width="wrap_content"
          android:layout_height="fill_parent"
-         android:layout_marginLeft="5px"
-         android:layout_marginRight="5px"
+         android:layout_marginLeft="5dip"
+         android:layout_marginRight="5dip"
          android:gravity="center">
     
 	  <ImageButton android:id="@+id/zoom_in"
-	   android:layout_width="52px"
-	   android:layout_height="52px"
+           android:nextFocusUp="@+id/info"
+	   android:layout_width="52dip"
+	   android:layout_height="52dip"
+           android:contentDescription="@string/zoom_in"
 	   android:src="@drawable/button_zoom_in" />
 
 	  <ImageButton android:id="@+id/zoom_out"
-	   android:layout_width="52px"
-	   android:layout_height="52px"
+           android:nextFocusUp="@+id/info"
+           android:nextFocusRight="@+id/starttext"
+	   android:layout_width="52dip"
+	   android:layout_height="52dip"
+           android:contentDescription="@string/zoom_out"
 	   android:src="@drawable/button_zoom_out" />
 
 	</LinearLayout>
@@ -115,31 +133,33 @@
       <LinearLayout
          android:layout_width="wrap_content" 
          android:layout_height="fill_parent"
-         android:layout_marginTop="6px"
-         android:layout_marginLeft="5px"
-         android:layout_marginRight="5px"
+         android:layout_marginTop="6dip"
+         android:layout_marginLeft="5dip"
+         android:layout_marginRight="5dip"
          android:gravity="center"
          android:orientation="vertical">
 
         <TextView
            android:id="@+id/mark_start"
+           android:nextFocusUp="@+id/info"
            android:text="@string/start_label"
            android:textColor="#ffffffff"
            android:textSize="12sp"
            android:textStyle="bold"
            android:clickable="true"
            android:layout_width="wrap_content" 
-           android:layout_height="31px" />
+           android:layout_height="31dip" />
 
         <TextView
            android:id="@+id/mark_end"
+           android:nextFocusUp="@+id/info"
            android:text="@string/end_label"
            android:textColor="#ffffffff"
            android:textSize="12sp"
            android:textStyle="bold"
            android:clickable="true"
            android:layout_width="wrap_content" 
-           android:layout_height="31px" />
+           android:layout_height="31dip" />
 
       </LinearLayout>
 
@@ -147,17 +167,24 @@
          android:layout_width="wrap_content" 
          android:layout_height="fill_parent"
          android:gravity="center"
+         android:layout_marginRight="5dip"
          android:orientation="vertical">
 
         <EditText android:id="@+id/starttext"
+           android:nextFocusLeft="@+id/zoom_out"
+           android:nextFocusRight="@+id/endtext"
            android:textSize="11sp"
-           android:layout_width="70px"
-           android:layout_height="31px" />
+           android:layout_width="70dip"
+           android:layout_height="31dip"
+           android:contentDescription="@string/start_label" />
 
         <EditText android:id="@+id/endtext"
+           android:nextFocusLeft="@+id/starttext"
+           android:nextFocusRight="@+id/save"
            android:textSize="11sp"
-           android:layout_width="70px"
-           android:layout_height="31px" />
+           android:layout_width="70dip"
+           android:layout_height="31dip"
+           android:contentDescription="@string/end_label" />
 
       </LinearLayout>
 
@@ -167,14 +194,16 @@
       <LinearLayout
          android:layout_width="wrap_content"
          android:layout_height="fill_parent"
-         android:layout_marginLeft="5px"
-         android:layout_marginRight="5px"
+         android:layout_marginLeft="5dip"
+         android:layout_marginRight="5dip"
          android:gravity="center">
 
         <ImageButton android:id="@+id/save"
-         android:layout_width="52px"
-         android:layout_height="52px"
-         android:src="@drawable/menu_save" />
+         android:nextFocusLeft="@+id/endtext"
+         android:layout_width="52dip"
+         android:layout_height="52dip"
+         android:src="@drawable/menu_save"
+         android:contentDescription="@string/save_button" />
 
       </LinearLayout>
 
diff --git a/res/layout-land/media_select.xml b/res/layout-land/media_select.xml
index d729c37..ede5ad7 100644
--- a/res/layout-land/media_select.xml
+++ b/res/layout-land/media_select.xml
@@ -30,16 +30,17 @@
 
     <ImageView
      android:src="@drawable/search"
-     android:layout_marginLeft="8px"
+     android:layout_marginLeft="8dip"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content" />
 
     <EditText android:id="@+id/search_filter"
      android:textSize="18sp"
-     android:layout_margin="8px"
+     android:layout_margin="8dip"
      android:layout_width="0px"
      android:layout_height="wrap_content"
-     android:layout_weight="1">
+     android:layout_weight="1"
+     android:contentDescription="@string/search_edit_box">
 
     </EditText>
 
diff --git a/res/layout-land/media_select_row.xml b/res/layout-land/media_select_row.xml
index cddb098..4a44482 100644
--- a/res/layout-land/media_select_row.xml
+++ b/res/layout-land/media_select_row.xml
@@ -6,14 +6,14 @@
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="fill_parent"
-    android:layout_height="48px">
+    android:layout_height="48dip">
 
     <ImageView android:id="@+id/row_icon"
        android:gravity="center_vertical"
        android:scaleType="center"
-       android:layout_marginLeft="8px"
-       android:layout_width="40px"
-       android:layout_height="48px" />
+       android:layout_marginLeft="8dip"
+       android:layout_width="40dip"
+       android:layout_height="48dip" />
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
       android:gravity="center_vertical"
@@ -41,7 +41,7 @@
          android:gravity="center_vertical"
          android:textColor="#ff99ff"
          android:textSize="12sp"
-         android:layout_marginLeft="8px"
+         android:layout_marginLeft="8dip"
          android:layout_width="wrap_content"
          android:layout_height="fill_parent"
          android:layout_weight="1"/>
@@ -50,7 +50,7 @@
          android:gravity="center_vertical"
          android:textColor="#ffff99"
          android:textSize="12sp"
-         android:layout_marginLeft="12px"
+         android:layout_marginLeft="12dip"
          android:layout_width="wrap_content"
          android:layout_height="fill_parent"
          android:layout_weight="1"/>
diff --git a/res/layout/after_save_action.xml b/res/layout/after_save_action.xml
index 22d2251..1570142 100644
--- a/res/layout/after_save_action.xml
+++ b/res/layout/after_save_action.xml
@@ -20,8 +20,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="300sp"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="10px"
-    android:layout_marginRight="10px"
+    android:layout_marginBottom="10dip"
+    android:layout_marginRight="10dip"
     android:orientation="vertical">
 
     <TextView
diff --git a/res/layout/choose_contact.xml b/res/layout/choose_contact.xml
index b799662..3921dc1 100644
--- a/res/layout/choose_contact.xml
+++ b/res/layout/choose_contact.xml
@@ -30,13 +30,13 @@
 
     <ImageView
      android:src="@drawable/search"
-     android:layout_marginLeft="8px"
+     android:layout_marginLeft="8dip"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content" />
 
     <EditText android:id="@+id/search_filter"
      android:textSize="18sp"
-     android:layout_margin="8px"
+     android:layout_margin="8dip"
      android:layout_width="0px"
      android:layout_height="wrap_content"
      android:layout_weight="1">
diff --git a/res/layout/contact_row.xml b/res/layout/contact_row.xml
index 6c75190..5734014 100644
--- a/res/layout/contact_row.xml
+++ b/res/layout/contact_row.xml
@@ -19,28 +19,28 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="64px"
-    android:layout_marginTop="8px"
-    android:layout_marginBottom="8px"
-    android:layout_marginLeft="12px"
-    android:layout_marginRight="12px">
+    android:layout_height="64dip"
+    android:layout_marginTop="8dip"
+    android:layout_marginBottom="8dip"
+    android:layout_marginLeft="12dip"
+    android:layout_marginRight="12dip">
 
     <ImageView android:id="@+id/row_ringtone"
        android:gravity="center_vertical"
        android:src="@drawable/type_ringtone"
-       android:layout_marginLeft="4px"
-       android:layout_marginTop="4px"
-       android:layout_marginBottom="4px"
+       android:layout_marginLeft="4dip"
+       android:layout_marginTop="4dip"
+       android:layout_marginBottom="4dip"
        android:layout_width="wrap_content"
        android:layout_height="fill_parent" />
 
     <ImageView android:id="@+id/row_starred"
        android:gravity="center_vertical"
        android:src="@drawable/star"
-       android:layout_marginLeft="1px"
-       android:layout_marginTop="4px"
-       android:layout_marginBottom="4px"
-       android:layout_marginRight="3px"
+       android:layout_marginLeft="1dip"
+       android:layout_marginTop="4dip"
+       android:layout_marginBottom="4dip"
+       android:layout_marginRight="3dip"
        android:layout_width="wrap_content"
        android:layout_height="fill_parent" />
 
@@ -48,8 +48,8 @@
         android:gravity="center_vertical"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:layout_marginTop="4px"
-        android:layout_marginBottom="4px">
+        android:layout_marginTop="4dip"
+        android:layout_marginBottom="4dip">
 
         <TextView android:id="@+id/row_display_name"
            android:gravity="center_vertical"
diff --git a/res/layout/editor.xml b/res/layout/editor.xml
index a8a9c15..42165f5 100644
--- a/res/layout/editor.xml
+++ b/res/layout/editor.xml
@@ -38,18 +38,25 @@
        android:layout_height="fill_parent" />
 
       <com.ringdroid.MarkerView android:id="@+id/startmarker"
+        android:nextFocusDown="@+id/endmarker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/marker_left" />
+        android:src="@drawable/marker_left"
+        android:contentDescription="@string/start_marker" />
 
       <com.ringdroid.MarkerView android:id="@+id/endmarker"
+        android:nextFocusUp="@+id/startmarker"
+        android:nextFocusDown="@+id/info"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/marker_right" />
+        android:src="@drawable/marker_right"
+        android:contentDescription="@string/end_marker" />
 
     </AbsoluteLayout>
 
     <TextView android:id="@+id/info"
+       android:nextFocusUp="@+id/endmarker"
+       android:nextFocusDown="@+id/play"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        style="@style/AudioFileInfoOverlayText"
@@ -58,40 +65,45 @@
     <LinearLayout
      style="@style/ToolbarBackground"
      android:layout_width="fill_parent" 
-     android:layout_height="62px"
+     android:layout_height="62dip"
      android:gravity="center" >
 
       <ImageButton android:id="@+id/rew"
-       android:layout_width="64px"
-       android:layout_height="52px"
+       android:layout_width="64dip"
+       android:layout_height="52dip"
        style="@android:style/MediaButton"
+       android:contentDescription="@string/rewind"
        android:src="@drawable/ic_media_rew" />
 
       <ImageButton android:id="@+id/play"
-       android:layout_width="71px"
-       android:layout_height="52px"
+       android:layout_width="71dip"
+       android:layout_height="52dip"
        style="@android:style/MediaButton"
+       android:contentDescription="@string/play"
        android:src="@drawable/ic_media_play" />
 
       <ImageButton android:id="@+id/ffwd"
-       android:layout_width="64px"
-       android:layout_height="52px"
-       android:layout_marginRight="5px"
+       android:layout_width="64dip"
+       android:layout_height="52dip"
+       android:layout_marginRight="5dip"
        style="@android:style/MediaButton"
+       android:contentDescription="@string/ffwd"
        android:src="@drawable/ic_media_ff" />
 
       <LinearLayout style="@style/VerticalDividerLeft" />
       <LinearLayout style="@style/VerticalDividerRight" />
 
       <ImageButton android:id="@+id/zoom_in"
-       android:layout_width="52px"
-       android:layout_height="52px"
-       android:layout_marginLeft="5px"
+       android:layout_width="52dip"
+       android:layout_height="52dip"
+       android:layout_marginLeft="5dip"
+       android:contentDescription="@string/zoom_in"
        android:src="@drawable/button_zoom_in" />
 
       <ImageButton android:id="@+id/zoom_out"
-       android:layout_width="52px"
-       android:layout_height="52px"
+       android:layout_width="52dip"
+       android:layout_height="52dip"
+       android:contentDescription="@string/zoom_out"
        android:src="@drawable/button_zoom_out" />
 
     </LinearLayout>
@@ -102,15 +114,15 @@
     <LinearLayout
      style="@style/ToolbarBackground"
      android:layout_width="fill_parent" 
-     android:layout_height="62px"
+     android:layout_height="62dip"
      android:gravity="center_vertical" >
 
       <LinearLayout
          android:layout_width="wrap_content" 
          android:layout_height="fill_parent"
-         android:layout_marginTop="6px"
-         android:layout_marginLeft="5px"
-         android:layout_marginRight="5px"
+         android:layout_marginTop="6dip"
+         android:layout_marginLeft="5dip"
+         android:layout_marginRight="5dip"
          android:gravity="center"
          android:orientation="vertical">
 
@@ -122,7 +134,7 @@
            android:textStyle="bold"
            android:clickable="true"
            android:layout_width="wrap_content" 
-           android:layout_height="31px" />
+           android:layout_height="31dip" />
 
         <TextView
            android:id="@+id/mark_end"
@@ -132,26 +144,29 @@
            android:textStyle="bold"
            android:clickable="true"
            android:layout_width="wrap_content" 
-           android:layout_height="31px" />
+           android:layout_height="31dip" />
 
       </LinearLayout>
 
       <LinearLayout
          android:layout_width="wrap_content" 
          android:layout_height="fill_parent"
-	 android:layout_marginRight="5px"
+	 android:layout_marginRight="5dip"
          android:gravity="center"
          android:orientation="vertical">
 
         <EditText android:id="@+id/starttext"
            android:textSize="11sp"
-           android:layout_width="70px"
-           android:layout_height="31px" />
+	   android:layout_marginTop="5dip"
+           android:layout_width="70dip"
+           android:layout_height="31dip"
+           android:contentDescription="@string/start_label" />
 
         <EditText android:id="@+id/endtext"
            android:textSize="11sp"
-           android:layout_width="70px"
-           android:layout_height="31px" />
+           android:layout_width="70dip"
+           android:layout_height="31dip"
+           android:contentDescription="@string/end_label" />
 
       </LinearLayout>
 
@@ -161,14 +176,16 @@
       <LinearLayout
          android:layout_width="wrap_content"
          android:layout_height="fill_parent"
-         android:layout_marginLeft="5px"
-         android:layout_marginRight="5px"
+         android:layout_marginLeft="5dip"
+         android:layout_marginRight="5dip"
          android:gravity="center">
 
         <ImageButton android:id="@+id/save"
-         android:layout_width="52px"
-         android:layout_height="52px"
-         android:src="@drawable/menu_save" />
+         android:layout_width="52dip"
+         android:layout_height="52dip"
+         android:layout_marginTop="5dip"
+         android:src="@drawable/menu_save"
+         android:contentDescription="@string/save_button" />
 
       </LinearLayout>
 
diff --git a/res/layout/file_save.xml b/res/layout/file_save.xml
index 52d323d..1de4753 100644
--- a/res/layout/file_save.xml
+++ b/res/layout/file_save.xml
@@ -20,20 +20,20 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="300sp"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="10px"
-    android:layout_marginRight="10px"
+    android:layout_marginBottom="10dip"
+    android:layout_marginRight="10dip"
     android:orientation="vertical">
 
     <TextView
        android:text="@string/ringtone_type_label"
        android:textColor="#ffffffff"
        android:textSize="12sp"
-       android:layout_marginLeft="15px"
+       android:layout_marginLeft="15dip"
        android:layout_width="wrap_content" 
        android:layout_height="wrap_content" />
 
     <Spinner android:id="@+id/ringtone_type"
-       android:layout_marginLeft="10px"
+       android:layout_marginLeft="10dip"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content" />
 
@@ -41,18 +41,18 @@
        android:text="@string/ringtone_name_label"
        android:textColor="#ffffffff"
        android:textSize="12sp"
-       android:layout_marginLeft="15px"
+       android:layout_marginLeft="15dip"
        android:layout_width="wrap_content" 
        android:layout_height="wrap_content" />
 
     <EditText android:id="@+id/filename"
-       android:layout_marginLeft="10px"
+       android:layout_marginLeft="10dip"
        android:layout_width="280sp" 
        android:layout_height="wrap_content" />
 
     <LinearLayout
-       android:layout_marginTop="5px"
-       android:layout_marginLeft="10px"
+       android:layout_marginTop="5dip"
+       android:layout_marginLeft="10dip"
        android:layout_width="fill_parent" 
        android:layout_height="wrap_content"
        android:gravity="center_horizontal">
@@ -61,13 +61,13 @@
          android:text="@string/file_save_button_save"
          android:layout_width="100sp" 
          android:layout_height="wrap_content"
-         android:layout_marginBottom="10px" />
+         android:layout_marginBottom="10dip" />
 
       <Button android:id="@+id/cancel"
          android:text="@string/file_save_button_cancel"
          android:layout_width="100sp" 
          android:layout_height="wrap_content"
-         android:layout_marginBottom="10px" />
+         android:layout_marginBottom="10dip" />
 
     </LinearLayout>
 
diff --git a/res/layout/media_select.xml b/res/layout/media_select.xml
index a3fd732..c68dbde 100644
--- a/res/layout/media_select.xml
+++ b/res/layout/media_select.xml
@@ -30,26 +30,36 @@
 
     <ImageView
      android:src="@drawable/search"
-     android:layout_marginLeft="8px"
+     android:layout_marginLeft="8dip"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content" />
 
     <EditText android:id="@+id/search_filter"
      android:textSize="18sp"
-     android:layout_margin="8px"
+     android:layout_margin="8dip"
      android:layout_width="0px"
      android:layout_height="wrap_content"
-     android:layout_weight="1">
+     android:layout_weight="1"
+     android:contentDescription="@string/search_edit_box">
 
     </EditText>
 
     <LinearLayout style="@style/VerticalDividerLeft" />
     <LinearLayout style="@style/VerticalDividerRight" />
 
-    <Button android:id="@+id/record"
-      android:text="@string/button_start_record_activity"
-      android:layout_height="wrap_content"
-      android:layout_width="120sp" />
+    <LinearLayout
+       android:layout_width="wrap_content"
+       android:layout_height="fill_parent"
+       android:layout_marginLeft="5dip"
+       android:layout_marginRight="5dip"
+       android:gravity="center">
+
+      <Button android:id="@+id/record"
+        android:text="@string/button_start_record_activity"
+        android:layout_height="wrap_content"
+        android:layout_width="120sp" />
+
+    </LinearLayout>
 
   </LinearLayout>
 
diff --git a/res/layout/media_select_row.xml b/res/layout/media_select_row.xml
index dca9d98..740de1b 100644
--- a/res/layout/media_select_row.xml
+++ b/res/layout/media_select_row.xml
@@ -24,18 +24,18 @@
   <ImageView android:id="@+id/row_icon"
      android:gravity="center_vertical"
      android:scaleType="center"
-     android:layout_marginLeft="8px"
-     android:layout_width="40px"
+     android:layout_marginLeft="8dip"
+     android:layout_width="40dip"
      android:layout_height="fill_parent" />
 
 <LinearLayout
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8px"
-    android:layout_marginBottom="8px"
-    android:layout_marginLeft="12px"
-    android:layout_marginRight="12px">
+    android:layout_marginTop="8dip"
+    android:layout_marginBottom="8dip"
+    android:layout_marginLeft="12dip"
+    android:layout_marginRight="12dip">
 
      <LinearLayout
       android:layout_width="wrap_content"
@@ -44,7 +44,7 @@
       <TextView android:id="@+id/row_artist"
          android:textColor="#ff99ff"
          android:textSize="12sp"
-         android:layout_marginLeft="1px"
+         android:layout_marginLeft="1dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_weight="1"/>
@@ -52,7 +52,7 @@
       <TextView android:id="@+id/row_album"
          android:textColor="#ffff99"
          android:textSize="12sp"
-         android:layout_marginLeft="12px"
+         android:layout_marginLeft="12dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_weight="1"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index af2fb32..dcfb70b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,6 +27,8 @@
 
     <string name="main_activity_label">Ringdroid</string>
 
+    <string name="search_edit_box">Search</string>
+
     <string name="button_start_record_activity">Record New</string>
 
     <string name="sdcard_readonly">Sorry, the SD Card is mounted as read-only and Ringdroid requires it to be writable.</string>
@@ -58,6 +60,18 @@
     <string name="progress_dialog_loading">Loading...</string>
     <string name="progress_dialog_saving">Saving...</string>
 
+    <!-- Image button descriptions for accessibility -->
+
+    <string name="start_marker">Start marker</string>
+    <string name="end_marker">End marker</string>
+    <string name="rewind">Rewind</string>
+    <string name="play">Play</string>
+    <string name="stop">Stop</string>
+    <string name="ffwd">Fast forward</string>
+    <string name="zoom_in">Zoom In</string>
+    <string name="zoom_out">Zoom Out</string>
+    <string name="save_button">Save</string>
+
     <!--
      Menu items
      -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 94987d7..f309692 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -28,6 +28,7 @@
     <item name="android:shadowDx">1</item>
     <item name="android:shadowDy">1</item>
     <item name="android:shadowRadius">1</item>
+    <item name="android:focusable">true</item>
   </style>
 
   <style name="ToolbarBackground">
diff --git a/src/com/ringdroid/ChooseContactActivity.java b/src/com/ringdroid/ChooseContactActivity.java
index 1eb95b1..7b14683 100644
--- a/src/com/ringdroid/ChooseContactActivity.java
+++ b/src/com/ringdroid/ChooseContactActivity.java
@@ -19,11 +19,13 @@
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.content.ContentValues;
+import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.MergeCursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.Contacts;
@@ -46,6 +48,7 @@
 import android.widget.Toast;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -147,6 +150,19 @@ public void onItemClick(AdapterView parent,
         }
     }
 
+    private boolean isEclairOrLater() {
+	return Build.VERSION.SDK_INT >= 5;
+    }
+
+    private Uri getContactContentUri() {
+	if (isEclairOrLater()) {
+	    // ContactsContract.Contacts.CONTENT_URI
+	    return Uri.parse("content://com.android.contacts/contacts");
+	} else {
+	    return Contacts.People.CONTENT_URI;
+	}
+    }
+
     private void assignRingtoneToContact() {
         Cursor c = mAdapter.getCursor();
         int dataIndex = c.getColumnIndexOrThrow(People._ID);
@@ -155,7 +171,7 @@ private void assignRingtoneToContact() {
         dataIndex = c.getColumnIndexOrThrow(People.DISPLAY_NAME);
         String displayName = c.getString(dataIndex);
 
-        Uri uri = Uri.withAppendedPath(People.CONTENT_URI, contactId);
+        Uri uri = Uri.withAppendedPath(getContactContentUri(), contactId);
 
         ContentValues values = new ContentValues();
         values.put(People.CUSTOM_RINGTONE, mRingtoneUri.toString());
@@ -180,18 +196,20 @@ private Cursor createCursor(String filter) {
             selection = null;
         }
         Cursor cursor = managedQuery(
-            People.CONTENT_URI,
+            getContactContentUri(),
             new String[] {
                 People._ID,
                 People.CUSTOM_RINGTONE,
                 People.DISPLAY_NAME,
                 People.LAST_TIME_CONTACTED,
-                People.NAME,
                 People.STARRED,
                 People.TIMES_CONTACTED },
             selection,
             null,
-            "STARRED DESC, TIMES_CONTACTED DESC, LAST_TIME_CONTACTED DESC");
+            "STARRED DESC, " +
+	    "TIMES_CONTACTED DESC, " +
+	    "LAST_TIME_CONTACTED DESC, " +
+	    "DISPLAY_NAME ASC");
 
         Log.i("Ringdroid", cursor.getCount() + " contacts");
 
diff --git a/src/com/ringdroid/RingdroidEditActivity.java b/src/com/ringdroid/RingdroidEditActivity.java
index f7759a0..db4efca 100644
--- a/src/com/ringdroid/RingdroidEditActivity.java
+++ b/src/com/ringdroid/RingdroidEditActivity.java
@@ -45,6 +45,7 @@
 import android.text.TextWatcher;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -142,11 +143,10 @@ public class RingdroidEditActivity extends Activity
     private int mTouchInitialEndPos;
     private long mWaveformTouchStartMsec;
     private float mDensity;
-
-    private static final int kMarkerLeftInset = 46;
-    private static final int kMarkerRightInset = 48;
-    private static final int kMarkerTopOffset = 10;
-    private static final int kMarkerBottomOffset = 10;
+    private int mMarkerLeftInset;
+    private int mMarkerRightInset;
+    private int mMarkerTopOffset;
+    private int mMarkerBottomOffset;
 
     // Menu commands
     private static final int CMD_SAVE = 1;
@@ -377,6 +377,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_SPACE) {
+            onPlay(mStartPos);
+            return true;
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
     //
     // WaveformListener
     //
@@ -571,6 +581,11 @@ private void loadGui() {
         getWindowManager().getDefaultDisplay().getMetrics(metrics);
         mDensity = metrics.density;
 
+        mMarkerLeftInset = (int)(46 * mDensity);
+        mMarkerRightInset = (int)(48 * mDensity);
+        mMarkerTopOffset = (int)(10 * mDensity);
+        mMarkerBottomOffset = (int)(10 * mDensity);
+
         mStartText = (TextView)findViewById(R.id.starttext);
         mStartText.addTextChangedListener(mTextWatcher);
         mEndText = (TextView)findViewById(R.id.endtext);
@@ -823,10 +838,17 @@ else if (offsetDelta < 0)
         mWaveformView.setParameters(mStartPos, mEndPos, mOffset);
         mWaveformView.invalidate();
 
+        mStartMarker.setContentDescription(
+            getResources().getText(R.string.start_marker) + " " +
+            formatTime(mStartPos));
+        mEndMarker.setContentDescription(
+            getResources().getText(R.string.end_marker) + " " +
+            formatTime(mEndPos));
+
         boolean startVisible = true;
         boolean endVisible = true;
 
-        int startX = mStartPos - mOffset - kMarkerLeftInset;
+        int startX = mStartPos - mOffset - mMarkerLeftInset;
         if (startX + mStartMarker.getWidth() >= 0) {
             mStartMarker.setAlpha(255);
         } else {
@@ -836,7 +858,7 @@ else if (offsetDelta < 0)
         }
 
         int endX = mEndPos - mOffset - mEndMarker.getWidth() +
-            kMarkerRightInset;
+            mMarkerRightInset;
         if (endX + mEndMarker.getWidth() >= 0) {
             mEndMarker.setAlpha(255);
         } else {
@@ -850,7 +872,7 @@ else if (offsetDelta < 0)
                 AbsoluteLayout.LayoutParams.WRAP_CONTENT,
                 AbsoluteLayout.LayoutParams.WRAP_CONTENT,
                 startX,
-                kMarkerTopOffset));
+                mMarkerTopOffset));
 
         mEndMarker.setLayoutParams(
             new AbsoluteLayout.LayoutParams(
@@ -858,7 +880,7 @@ else if (offsetDelta < 0)
                 AbsoluteLayout.LayoutParams.WRAP_CONTENT,
                 endX,
                 mWaveformView.getMeasuredHeight() -
-                mEndMarker.getHeight() - kMarkerBottomOffset));
+                mEndMarker.getHeight() - mMarkerBottomOffset));
     }
 
     private Runnable mTimerRunnable = new Runnable() {
@@ -884,8 +906,10 @@ public void run() {
     private void enableDisableButtons() {
         if (mIsPlaying) {
             mPlayButton.setImageResource(android.R.drawable.ic_media_pause);
+            mPlayButton.setContentDescription(getResources().getText(R.string.stop));
         } else {
             mPlayButton.setImageResource(android.R.drawable.ic_media_play);
+            mPlayButton.setContentDescription(getResources().getText(R.string.play));
         }
     }
 
@@ -1782,6 +1806,9 @@ long getUniqueId() {
     void sendToServer(String serverUrl,
                       CharSequence errType,
                       Exception exception) {
+        if (mTitle == null)
+            return;
+
         Log.i("Ringdroid", "sendStatsToServer");
 
         boolean isSuccess = (exception == null);
@@ -1809,12 +1836,18 @@ void sendToServer(String serverUrl,
         if (isSuccess) {
             postMessage.append("&title=");
             postMessage.append(URLEncoder.encode(mTitle));
-            postMessage.append("&artist=");
-            postMessage.append(URLEncoder.encode(mArtist));
-            postMessage.append("&album=");
-            postMessage.append(URLEncoder.encode(mAlbum));
-            postMessage.append("&genre=");
-            postMessage.append(URLEncoder.encode(mGenre));
+            if (mArtist != null) {
+                postMessage.append("&artist=");
+                postMessage.append(URLEncoder.encode(mArtist));
+            }
+            if (mAlbum != null) {
+                postMessage.append("&album=");
+                postMessage.append(URLEncoder.encode(mAlbum));
+            }
+            if (mGenre != null) {
+                postMessage.append("&genre=");
+                postMessage.append(URLEncoder.encode(mGenre));
+            }
             postMessage.append("&year=");
             postMessage.append(mYear);
 
diff --git a/src/com/ringdroid/WaveformView.java b/src/com/ringdroid/WaveformView.java
index d8754be..6acff6a 100644
--- a/src/com/ringdroid/WaveformView.java
+++ b/src/com/ringdroid/WaveformView.java
@@ -111,6 +111,7 @@ public WaveformView(Context context, AttributeSet attrs) {
         mPlaybackLinePaint.setColor(
             getResources().getColor(R.drawable.playback_indicator));
         mTimecodePaint = new Paint();
+        mTimecodePaint.setTextSize(12);
         mTimecodePaint.setAntiAlias(true);
         mTimecodePaint.setColor(
             getResources().getColor(R.drawable.timecode));
@@ -268,6 +269,7 @@ public void setListener(WaveformListener listener) {
     public void recomputeHeights(float density) {
         mHeightsAtThisZoomLevel = null;
         mDensity = density;
+        mTimecodePaint.setTextSize((int)(12 * density));
 
         invalidate();
     }
@@ -404,7 +406,9 @@ protected void onDraw(Canvas canvas) {
                 String timecodeStr = timecodeMinutes + ":" + timecodeSeconds;
                 float offset = (float) (
                     0.5 * mTimecodePaint.measureText(timecodeStr));
-                canvas.drawText(timecodeStr, i - offset, 15,
+                canvas.drawText(timecodeStr,
+                                i - offset,
+                                (int)(12 * mDensity),
                                 mTimecodePaint);
             }
         }