Merge heads

2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
@@ -52,6 +52,7 @@ limitations under the License.
          style="@style/ListItemDate" />
      </TableRow>
      <TableRow>
+        <!-- Need to match the style set in ListItemUtils.setListItem -->
        <TextView
          android:id="@+id/list_item_time_distance"
          android:layout_gravity="bottom"
@@ -21,7 +21,7 @@ limitations under the License.
  <TextView
    android:background="@color/warning_background"
    android:drawableLeft="@drawable/warning"
-    android:gravity="center"
+    android:gravity="left|center_vertical"
    android:id="@+id/map_message"
    android:layout_alignParentTop="true"
    android:layout_width="match_parent"
@@ -144,12 +144,7 @@ limitations under the License.
        style="@style/TrackWidgetButton" />
      <TextView
        android:id="@+id/track_widget_record_status"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:layout_width="0dp"
-        android:singleLine="true"
-        style="@style/TextSmall" />
+        style="@style/TrackWidgetRecordStatus" />
      <ImageButton
        android:contentDescription="@string/icon_stop_recording"
        android:id="@+id/track_widget_stop_button"
@@ -144,12 +144,7 @@ limitations under the License.
        style="@style/TrackWidgetButton" />
      <TextView
        android:id="@+id/track_widget_record_status"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:layout_width="0dp"
-        android:singleLine="true"
-        style="@style/TextSmall" />
+        style="@style/TrackWidgetRecordStatus" />
      <ImageButton
        android:contentDescription="@string/icon_stop_recording"
        android:id="@+id/track_widget_stop_button"
@@ -148,12 +148,7 @@ limitations under the License.
        style="@style/TrackWidgetButton" />
      <TextView
        android:id="@+id/track_widget_record_status"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:layout_width="0dp"
-        android:singleLine="true"
-        style="@style/TextSmall" />
+        style="@style/TrackWidgetRecordStatus" />
      <ImageButton
        android:contentDescription="@string/icon_stop_recording"
        android:id="@+id/track_widget_stop_button"
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
-->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <!-- Google Drive result -->
-    <LinearLayout
-      android:id="@+id/upload_result_drive_result"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:orientation="horizontal" >
-      <ImageView
-        android:contentDescription="@string/generic_success_title"
-        android:id="@+id/upload_result_drive_result_icon"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:padding="4dp"
-        android:src="@drawable/success" />
-      <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="8dp" >
-        <TextView
-          android:text="@string/export_google_drive"
-          style="@style/TextMedium" />
-        <TextView
-          android:text="@string/export_google_drive_url"
-          style="@style/TextSmall" />
-      </LinearLayout>
-    </LinearLayout>
-    <!-- Google Maps result -->
-    <LinearLayout
-      android:id="@+id/upload_result_maps_result"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:orientation="horizontal" >
-      <ImageView
-        android:contentDescription="@string/generic_success_title"
-        android:id="@+id/upload_result_maps_result_icon"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:padding="4dp"
-        android:src="@drawable/success" />
-      <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="8dp" >
-        <TextView
-          android:text="@string/export_google_maps"
-          style="@style/TextMedium" />
-        <TextView
-          android:text="@string/export_google_maps_url"
-          style="@style/TextSmall" />
-      </LinearLayout>
-    </LinearLayout>
-    <!-- Google Fusion Tables result -->
-    <LinearLayout
-      android:id="@+id/upload_result_fusion_tables_result"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:orientation="horizontal" >
-      <ImageView
-        android:contentDescription="@string/generic_success_title"
-        android:id="@+id/upload_result_fusion_tables_result_icon"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:padding="4dp"
-        android:src="@drawable/success" />
-      <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="8dp" >
-        <TextView
-          android:text="@string/export_google_fusion_tables"
-          style="@style/TextMedium" />
-        <TextView
-          android:text="@string/export_google_fusion_tables_url"
-          style="@style/TextSmall" />
-      </LinearLayout>
-    </LinearLayout>
-    <!-- Google Spreadsheets result -->
-    <LinearLayout
-      android:id="@+id/upload_result_spreadsheets_result"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:orientation="horizontal" >
-      <ImageView
-        android:contentDescription="@string/generic_success_title"
-        android:id="@+id/upload_result_spreadsheets_result_icon"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:padding="4dp"
-        android:src="@drawable/success" />
-      <LinearLayout
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="8dp" >
-        <TextView
-          android:text="@string/export_google_spreadsheets"
-          style="@style/TextMedium" />
-        <TextView
-          android:text="@string/export_google_spreadsheets_url"
-          style="@style/TextSmall" />
-      </LinearLayout>
-    </LinearLayout>
-    <!-- Footer -->
-    <TextView
-      android:id="@+id/upload_result_success_footer"
-      android:padding="8dp"
-      android:text="@string/send_google_success_footer"
-      style="@style/TextSmall" />
-    <TextView
-      android:id="@+id/upload_result_error_footer"
-      android:padding="8dp"
-      android:text="@string/send_google_error"
-      style="@style/TextMedium" />
-  </LinearLayout>
-</ScrollView>
@@ -27,16 +27,4 @@ limitations under the License.
    <item name="android:actionBarStyle">@style/ActionBarStyle.MyTracks</item>
    <item name="android:actionModeBackground">@drawable/action_mode_background_mytracks</item>
  </style>
-  <style name="MyTracks.DialogWhenLarge" parent="android:Theme.Holo.DialogWhenLarge">
-    <!-- Auto generated -->
-    <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
-    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewMyTracks</item>
-    <item name="android:listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
-    <item name="android:listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item>
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
-    <!-- Manually added -->
-    <item name="android:actionBarStyle">@style/ActionBarStyle.MyTracks</item>
-    <item name="android:actionModeBackground">@drawable/action_mode_background_mytracks</item>
-  </style>
 </resources>
@@ -37,24 +37,6 @@ limitations under the License.
    <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
    <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
  </style>
-  <!-- The style for large size text -->
-  <style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
-    <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <!-- The style for medium size text -->
-  <style name="TextMedium" parent="@android:style/TextAppearance.DeviceDefault.Medium">
-    <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-  <!-- The style for small size text -->
-  <style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
-    <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
  <style name="TrackWidgetLabel">
    <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
    <item name="android:layout_gravity">center_horizontal</item>
@@ -33,6 +33,6 @@ limitations under the License.
  <color name="track_color_fast">#F7DF0101</color> <!-- red color -->
  <color name="track_color_normal">#F75858FA</color> <!-- blue color -->
  <color name="track_color_slow">#F774DF00</color> <!-- green color -->
-  <color name="track_controller_background">#FF272727</color> <!-- dark gray -->
+  <color name="track_controller_background">#FF0E0E0E</color> <!-- dark gray -->
  <color name="warning_background">#FFFF8800</color> <!-- orange dark -->
 </resources>
@@ -659,6 +659,13 @@ limitations under the License.
    translation_description="When exporting a track, the option to export to Google Drive.">
    Google Drive
  </string>
+  <string name="export_google_error"
+    translation_description="When exporting a track, the error message.
+
+      %1$s: service name. E.g, Google Maps.
+      %2$s: service url. E.g, maps.google.com.">
+    An error has occurred. Unable to export to %1$s (%2$s). Please try again.
+  </string>
  <string name="export_google_fusion_tables"
    translation_description="When exporting a track, the option to export to Google Fusion Tables.">
    Google Fusion Tables
@@ -691,6 +698,14 @@ limitations under the License.
    translation_description="When exporting a track, the option to export to Google Spreadsheets.">
    Google Spreadsheets
  </string>
+  <string name="export_google_success"
+    translation_description="When sending a track to Google, the additional comment on the bottom of
+      the result page.
+
+      %1$s: service name. E.g, Google Maps.
+      %2$s: service url. E.g, maps.google.com.">
+    Track exported to %1$s (%2$s). It may take a few minutes for it to appear.
+  </string>
  <string name="export_title"
    translation_description="The dialog title when exporting a track.">
    Export to&#8230;
@@ -1334,11 +1349,6 @@ limitations under the License.
    translation_description="When sending to Google, the dialog title to choose a Google account.">
    Choose account
  </string>
-  <string name="send_google_error"
-    translation_description="When sending a track to Google, a message indicating that an error has
-      occurred and ask the user to try again.">
-    An error has occurred. Please try again.
-  </string>
  <string name="send_google_no_account_message"
    translation_description="When sending to Google, the dialog message when no Google account is
      found.">
@@ -1360,11 +1370,6 @@ limitations under the License.
      %1$s: service name. 'Google Maps', 'Google Fusion Tables', or 'Google Spreadsheets'.">
    Sending to %1$s&#8230;
  </string>
-  <string name="send_google_success_footer"
-    translation_description="When sending a track to Google, the additional comment on the bottom of
-      the result page.">
-    It may take a few minutes before new tracks appear.
-  </string>
  <string name="send_google_track_part_label"
    translation_description="When sending a track to Google, the label to name segments of a large
      track. E.g., 'track_name (Part 1)'.
@@ -206,14 +206,17 @@ limitations under the License.
    <item name="android:layout_weight">1</item>
    <item name="android:layout_width">0dp</item>
  </style>
+ <style name="Text">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:textColor">@android:color/white</item>
+ </style>   
  <!-- text choose activity -->
  <style name="TextChooseActivity">
    <item name="android:textSize">18sp</item>
  </style>
  <!-- text large -->
-  <style name="TextLarge">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
+  <style name="TextLarge" parent="@style/Text">
    <item name="android:textSize">22sp</item>
  </style>
  <!-- text large with top margin -->
@@ -221,9 +224,7 @@ limitations under the License.
    <item name="android:layout_marginTop">8dp</item>
  </style>
  <!-- text medium -->
-  <style name="TextMedium">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
+  <style name="TextMedium" parent="@style/Text">
    <item name="android:textSize">18sp</item>
  </style>
  <!-- text medium with icon -->
@@ -232,15 +233,11 @@ limitations under the License.
    <item name="android:gravity">center_vertical</item>
  </style>
  <!-- text micro -->
-  <style name="TextMicro">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
+  <style name="TextMicro" parent="@style/Text">
    <item name="android:textSize">12sp</item>
  </style>
  <!-- text small -->
-  <style name="TextSmall">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
+  <style name="TextSmall" parent="@style/Text">
    <item name="android:textSize">14sp</item>
  </style>
  <!-- track widget bounding box -->
@@ -353,6 +350,15 @@ limitations under the License.
    <item name="android:layout_height">30dp</item>
    <item name="android:layout_width">30dp</item>
  </style>
+  <!-- track widget record status -->
+  <style name="TrackWidgetRecordStatus" parent="@style/TextSmall">
+    <item name="android:layout_gravity">center_vertical</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginLeft">8dp</item>
+    <item name="android:layout_weight">2</item>
+    <item name="android:layout_width">0dp</item>
+    <item name="android:singleLine">true</item>
+  </style>  
  <!-- track widget stats container -->
  <style name="TrackWidgetStatsContainer">
    <item name="android:clickable">true</item>
@@ -25,5 +25,4 @@ limitations under the License.
    <item name="android:listViewWhiteStyle">@style/ListViewMyTracks.White</item>
    <item name="android:spinnerItemStyle">@style/SpinnerItemMyTracks</item>
  </style>
-  <style name="MyTracks.DialogWhenLarge" />
 </resources>