merge heads

MyTracks/res/values/colors.xml

@@ -17,11 +17,7 @@ limitations under the License.
 <resources>
   <color name="black">#FF000000</color>
   <color name="blue">#FF0000FF</color>
-  <color name="darkgray">#FF444444</color>
-  <color name="gold">#FFffd700</color>
   <color name="gray">#FFAAAAAA</color>
-  <color name="lightblue">#FF00FFFF</color>
-  <color name="opaque_shadow">#70000000</color>
   <color name="red">#FFFF0000</color>
   <color name="stat_label_background">#FFF0F0F0</color>
   <color name="stat_label_text">#FF0F0F0F</color>

MyTracks/res/values/strings.xml

@@ -921,6 +921,10 @@ limitations under the License.
       Screenshot: marker_detail.png">
     Marker details
   </string>
+  <string name="marker_icon_description"
+    translation_description="The accessibility description for the marker icon.">
+    Marker
+  </string>
   <string name="marker_insert_error"
     translation_description="When inserting a marker, message when not able to insert due to no GPS
       location and asking the user to try again.">
@@ -975,10 +979,6 @@ limitations under the License.
       Screenshot: marker_list_context_menu.png">
     Edit
   </string>
-  <string name="marker_list_icon_description"
-    translation_description="In the Markers page, the accessibility description for the marker icon.">
-    Marker
-  </string>
   <string name="marker_list_insert_statistics"
     translation_description="In the Markers page, the button on the bottom to insert a statistics
       marker.
@@ -2351,6 +2351,10 @@ limitations under the License.
       Screenshot: track_detail.png">
     Track name
   </string>
+  <string name="track_icon_description"
+    translation_description="The accessibility description for the track icon.">
+    Track
+  </string>
   <string name="track_list_clear_map"
     translation_description="In the context menu for a track, the menu option to clear the map of
       any track.
@@ -2494,10 +2498,6 @@ limitations under the License.
       Screenshot: track_list_show_on_map.png">
     Show on map
   </string>
-  <string name="track_list_icon_description"
-    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.

MyTracks/res/values/styles.xml

@@ -74,25 +74,11 @@ limitations under the License.
     <item name="android:visibility">gone</item>
   </style>
 
-  <!-- Chart settings axis image -->
-  <style name="ChartSettingsAxisImage">
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Chart settings axis layout -->
-  <style name="ChartSettingsAxisLayout">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">fill_parent</item>
-    <item name="android:orientation">horizontal</item>
-  </style>
-
   <!-- Chart settings axis text -->
   <style name="ChartSettingsAxisText">
     <item name="android:gravity">bottom</item>
     <item name="android:layout_height">fill_parent</item>
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:paddingLeft">10dp</item>
     <item name="android:textSize">20sp</item>
   </style>
 
@@ -152,15 +138,15 @@ limitations under the License.
   <!-- The style for a view which divides the numerator and denominator of the units on the statistics activity. -->
   <style name="StatsDivider" parent="@android:Widget.TextView">
     <item name="android:background">@color/black</item>
-    <item name="android:layout_height">3dip</item>
+    <item name="android:layout_height">3dp</item>
     <item name="android:layout_width">fill_parent</item>
   </style>
 
   <!-- The style for a text view for displaying a value on the statistics activity. -->
   <style name="StatsRegister" parent="@android:Widget.TextView">
     <item name="android:gravity">right</item>
-    <item name="android:layout_marginBottom">-9dip</item>
-    <item name="android:layout_marginTop">-9dip</item>
+    <item name="android:layout_marginBottom">-9dp</item>
+    <item name="android:layout_marginTop">-9dp</item>
     <item name="android:text">@string/value_unknown</item>
     <item name="android:textColor">@color/stat_label_text</item>
     <item name="android:textSize">40sp</item>
@@ -168,16 +154,16 @@ limitations under the License.
 
   <!-- The style for a text view for displaying a large value on the statistics activity. -->
   <style name="StatsRegister.Big">
-    <item name="android:layout_marginBottom">-13dip</item>
-    <item name="android:layout_marginTop">-13dip</item>
+    <item name="android:layout_marginBottom">-13dp</item>
+    <item name="android:layout_marginTop">-13dp</item>
     <item name="android:textSize">50sp</item>
   </style>
 
   <!-- The style for a text view for displaying a small value on the statistics activity. -->
   <style name="StatsRegister.Small">
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginBottom">-5dip</item>
-    <item name="android:layout_marginTop">-5dip</item>
+    <item name="android:layout_marginBottom">-5dp</item>
+    <item name="android:layout_marginTop">-5dp</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:textSize">25sp</item>
   </style>
@@ -185,9 +171,9 @@ limitations under the License.
   <!-- The style for a view which divides two columns in the statistics activity. -->
   <style name="StatsSpacer" parent="@android:Widget.TextView">
     <item name="android:background">@color/black</item>
-    <item name="android:layout_marginBottom">-9dip</item>
-    <item name="android:layout_marginTop">-9dip</item>
-    <item name="android:layout_width">5dip</item>
+    <item name="android:layout_marginBottom">-9dp</item>
+    <item name="android:layout_marginTop">-9dp</item>
+    <item name="android:layout_width">5dp</item>
     <item name="android:textSize">40sp</item>
   </style>
 
@@ -195,8 +181,8 @@ limitations under the License.
   <style name="StatsUnit" parent="@android:Widget.TextView">
     <item name="android:gravity">bottom</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginBottom">-2dip</item>
-    <item name="android:layout_marginTop">-2dip</item>
+    <item name="android:layout_marginBottom">-2dp</item>
+    <item name="android:layout_marginTop">-2dp</item>
     <item name="android:layout_width">wrap_content</item>
     <item name="android:textColor">@color/stat_label_text</item>
   </style>
@@ -204,8 +190,8 @@ limitations under the License.
   <!-- The style for the unit on the statistics activity where there is only one string. -->
   <style name="StatsUnitSolo" parent="@android:Widget.TextView">
     <item name="android:gravity">right</item>
-    <item name="android:layout_marginBottom">-9dip</item>
-    <item name="android:layout_marginTop">-9dip</item>
+    <item name="android:layout_marginBottom">-9dp</item>
+    <item name="android:layout_marginTop">-9dp</item>
     <item name="android:textColor">@color/stat_label_text</item>
   </style>