Update export menu.

Improve export dialog layout.
Rearrange tralist list menu.
Remove unused method in MenuItemTest.

MyTracks/res/menu/track_list.xml

@@ -27,32 +27,32 @@ limitations under the License.
     android:showAsAction="ifRoom"
     android:title="@string/menu_start_gps"/>
   <item
-    android:icon="@drawable/menu_import"
+    android:icon="@drawable/menu_sync_now"
-    android:id="@+id/track_list_import_all"
+    android:id="@+id/track_list_sync_now"
-    android:title="@string/menu_import_all">
+    android:title="@string/menu_sync_now"/>
-  </item>
+  <item
+    android:icon="@drawable/menu_aggregated_statistics"
+    android:id="@+id/track_list_aggregated_statistics"
+    android:title="@string/menu_aggregated_statistics"/>
   <item
     android:icon="@drawable/menu_export"
     android:id="@+id/track_list_export_all"
     android:title="@string/menu_export_all">
   </item>
+  <item
+    android:icon="@drawable/menu_import"
+    android:id="@+id/track_list_import_all"
+    android:title="@string/menu_import_all">
+  </item>
   <item
     android:icon="@drawable/menu_delete"
     android:id="@+id/track_list_delete_all"
     android:title="@string/menu_delete_all"/>
-  <item
-    android:icon="@drawable/menu_aggregated_statistics"
-    android:id="@+id/track_list_aggregated_statistics"
-    android:title="@string/menu_aggregated_statistics"/>
-  <item
-    android:icon="@drawable/menu_sync_now"
-    android:id="@+id/track_list_sync_now"
-    android:title="@string/menu_sync_now"/>  
   <item
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_list_settings"
     android:title="@string/menu_settings"/>
-  <item 
+  <item
     android:icon="@drawable/menu_feedback"
     android:id="@+id/track_list_feedback"
     android:title="@string/menu_feedback"/>

MyTracks/res/values/styles.xml

@@ -75,7 +75,8 @@ limitations under the License.
   <!-- export radio group -->
   <style name="ExportRadioGroup">
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginLeft">16dp</item>
+    <item name="android:layout_marginBottom">8dp</item>
+    <item name="android:layout_marginLeft">20dp</item>
     <item name="android:layout_width">match_parent</item>
   </style> 
   <!-- help answer -->

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java

@@ -22,9 +22,6 @@ import com.google.android.maps.mytracks.R;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
-import android.view.View;
-
-import java.util.ArrayList;
 
 /**
  * Tests some menu items of MyTracks.
@@ -35,7 +32,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
 
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
-  private final static String SHARE_ITEM_PARENT_VIEW_NAME = "RecycleListView";
 
   public MenuItemsTest() {
     super(TrackListActivity.class);
@@ -110,30 +106,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     return activityMyTracks.findViewById(R.id.track_controler_container).isShown();
   }
 
-  /**
-   * Gets the view to click the share item by item index.
-   * 
-   * @param index of a share item
-   * @return null when no such item
-   */
-  private View findShareItem(int index) {
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_yes));
-    ArrayList<View> views = EndToEndTestUtils.SOLO.getViews();
-    int i = 0;
-    for (View view : views) {
-      String name = view.getParent().getClass().getName();
-      // Each share item is a child of a "RecycleListView"
-      if (name.indexOf(SHARE_ITEM_PARENT_VIEW_NAME) > 0) {
-        if (index == i) {
-          return view;
-        }
-        i++;
-      }
-    }
-    return null;
-  }
-
   /**
    * Checks the voice frequency and split frequency menus during recording. When
    * recording, they should be in both the menu and the recording settings. When