merge heads

MyTracks/res/layout/upload_service_chooser.xml

@@ -14,93 +14,78 @@ 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.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <TextView
-    android:background="@drawable/list_bar"
+  android:layout_width="fill_parent" >
+  <TableLayout
     android:layout_height="wrap_content"
+    android:layout_margin="8dp"
     android:layout_width="fill_parent"
-    android:paddingLeft="10dp"
-    android:text="@string/send_google_title"
-    android:textColor="@color/white"
-    android:textSize="20sp"/>
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_margin="5dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:stretchColumns="1">
-
-      <!-- Google Maps -->
-      <TableRow android:id="@+id/send_google_maps_row">
-        <ImageView
-          android:contentDescription="@string/send_google_maps"
-          android:src="@drawable/maps_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_maps"
-          android:text="@string/send_google_maps"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-      <TableRow android:id="@+id/send_google_maps_option_row">
-        <RadioGroup
-          android:layout_column="1"
+    android:stretchColumns="1" >
+    <TableRow android:id="@+id/send_google_maps_row" >
+      <ImageView
+        android:contentDescription="@string/send_google_maps"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/maps_icon" />
+      <CheckBox
+        android:id="@+id/send_google_maps"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        android:text="@string/send_google_maps"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_maps_option_row" >
+      <RadioGroup
+        android:layout_column="1"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp" >
+        <RadioButton
+          android:id="@+id/send_google_new_map"
           android:layout_height="wrap_content"
-          android:layout_marginLeft="10dp"
-          android:layout_width="0dp">
-          <RadioButton
-            android:id="@+id/send_google_new_map"
-            android:text="@string/send_google_new_map"
-            style="@style/SendGoogleRadioButton"/>
-          <RadioButton
-            android:id="@+id/send_google_existing_map"
-            android:text="@string/send_google_existing_map"
-            style="@style/SendGoogleRadioButton"/>
-        </RadioGroup>
-      </TableRow>
-
-      <!-- Google Fusion Tables -->
-      <TableRow android:id="@+id/send_google_fusion_tables_row">
-        <ImageView
-          android:contentDescription="@string/send_google_fusion_tables"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_fusion_tables"
-          android:text="@string/send_google_fusion_tables"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-
-      <!-- Google Docs -->
-      <TableRow android:id="@+id/send_google_docs_row">
-        <ImageView
-          android:contentDescription="@string/send_google_docs"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_docs"
-          android:text="@string/send_google_docs"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-    </TableLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/send_google_send_now"
-      android:layout_gravity="left"
-      android:text="@string/send_google_send_now"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/send_google_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
-</LinearLayout>
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_new_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+        <RadioButton
+          android:id="@+id/send_google_existing_map"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_existing_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+      </RadioGroup>
+    </TableRow>
+    <TableRow android:id="@+id/send_google_fusion_tables_row" >
+      <ImageView
+        android:contentDescription="@string/send_google_fusion_tables"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+      <CheckBox
+        android:id="@+id/send_google_fusion_tables"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        android:text="@string/send_google_fusion_tables"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_docs_row" >
+      <ImageView
+        android:contentDescription="@string/send_google_docs"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+      <CheckBox
+        android:id="@+id/send_google_docs"
+        android:layout_gravity="center_vertical"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        android:text="@string/send_google_docs"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
+    </TableRow>
+  </TableLayout>
+</ScrollView>

MyTracks/res/menu/main.xml

@@ -41,7 +41,7 @@ limitations under the License.
     android:title="@string/menu_markers"/>
 
   <item
-    android:icon="@drawable/chart_settings"
+    android:icon="@drawable/ic_menu_chartsettings"
     android:id="@+id/menu_chart_settings"
     android:showAsAction="ifRoom"
     android:title="@string/menu_chart_view_chart_settings"

MyTracks/res/menu/search_only.xml

@@ -15,12 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
   <item
     android:icon="@android:drawable/ic_menu_search"
     android:id="@+id/menu_search"
-    android:onClick="onSearch"
     android:showAsAction="always"
     android:title="@string/menu_search"/>
-
 </menu>

MyTracks/res/values/strings.xml

@@ -1343,6 +1343,11 @@ limitations under the License.
       found.">
     No account found
   </string>
+  <string name="send_google_no_service_selected"
+    translation_description="When sending a track to Google, a message indicating that the user has
+      not selected any Google service and no data is sent.">
+    You did not select any service. The track was not sent.
+  </string>
   <string name="send_google_progress_title"
     translation_description="When sending a track to a Google service, the title on the progress
       dialog.

MyTracks/res/values/styles.xml

@@ -74,28 +74,6 @@ limitations under the License.
     <item name="android:visibility">gone</item>
   </style>
 
-  <!-- Send Google CheckBox -->
-  <style name="SendGoogleCheckBox">
-    <item name="android:checked">true</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_marginLeft">10dp</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
-  <!-- Send Google ImageView -->
-  <style name="SendGoogleImageView">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Send Google RadioButton -->
-  <style name="SendGoogleRadioButton">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
   <style name="SensorStateLabel">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>