Addressing review comments for the search functionality.

MyTracks/res/layout/mytracks_list_item.xml

@@ -15,44 +15,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:paddingTop="2dip"
-  android:paddingBottom="2dip"
-  android:layout_width="fill_parent"
   android:layout_height="wrap_content"
+  android:layout_width="fill_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:paddingBottom="2dip"
+  android:paddingTop="2dip">
 
   <LinearLayout
-    android:orientation="horizontal"
+    android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    android:orientation="horizontal">
     <ImageView android:id="@+id/track_list_item_icon"
-      android:layout_width="wrap_content"
+      android:contentDescription="@string/track_list_icon_description"
       android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
       android:paddingLeft="4dip"
       android:paddingRight="2dip"
       android:paddingTop="5dip"
-      android:src="@drawable/track"
-      android:contentDescription="@string/track_list_icon_description"/>
-    <LinearLayout
-      android:orientation="horizontal"
+      android:src="@drawable/track" />
+    <TextView android:id="@+id/track_list_item_name"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dip"
+      android:layout_marginTop="6dip"
+      android:layout_width="wrap_content"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceLarge"/>
+    <TextView android:id="@+id/track_list_item_category"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dip"
+      android:layout_marginTop="6dip"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
-      <TextView android:id="@+id/track_list_item_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginTop="6dip"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-      <TextView android:id="@+id/track_list_item_category"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginTop="6dip"
-        android:singleLine = "true"
-        android:textAppearance="?android:attr/textAppearanceSmall"/>
-    </LinearLayout>
+      android:singleLine = "true"
+      android:textAppearance="?android:attr/textAppearanceSmall"/>
   </LinearLayout>
 
   <TextView android:id="@+id/track_list_item_time"

MyTracks/res/layout/search_list.xml

@@ -20,15 +20,15 @@ limitations under the License.
   android:layout_width="fill_parent"
   android:layout_height="fill_parent">
   <ListView android:id="@android:id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" />
-  <TextView android:id="@android:id/empty"
-    android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:layout_width="fill_parent" />
+  <TextView android:id="@android:id/empty"
+    android:gravity="center"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
     android:text="@string/search_no_results"
     android:textColor="@android:color/white"
     android:textSize="20dip"
     android:textStyle="bold"
-    android:gravity="center"
     android:visibility="gone" />
 </LinearLayout>

MyTracks/res/values/strings.xml

@@ -816,9 +816,7 @@ limitations under the License.
     Edit
   </string>
   <string name="marker_list_icon_description"
-    translation_description="In the Markers page, the accessibility description for the marker icon.
-
-      Screenshot: marker_list.png">
+    translation_description="In the Markers page, the accessibility description for the marker icon.">
     Marker
   </string>
   <string name="marker_list_insert_statistics"
@@ -842,12 +840,6 @@ limitations under the License.
       Screenshot: marker_list.png">
     Pick a marker. Press &amp; hold for more options.
   </string>
-  <string name="marker_list_name"
-    translation_description="In the Markers page, the label for the marker's name.
-
-      Screenshot: marker_list.png">
-    Name
-  </string>
   <string name="marker_list_show_on_map"
     translation_description="In the context menu for a marker, the menu option to show the marker
       on the map.
@@ -2344,16 +2336,14 @@ limitations under the License.
     Show on map
   </string>
   <string name="track_list_icon_description"
-    translation_description="In the 'Tracks' page, the accessibility description for the track icon.
-
-      Screenshot: track_list.png">
+    translation_description="In the 'Tracks' page, the accessibility description for the track icon.">
     Track
   </string>
   <string name="track_list_track_name"
     translation_description="In the 'Search Result' page, the text field indicating the track that a
       waypoint belongs to.
 
-      %1$d: track name. E.g., 'Grand Canyon trail'">
+      %1$s: track name. E.g., 'Grand Canyon trail'">
     In track \'%1$s\'.
   </string>
   <string name="track_name_format"