Merge to head

MyTracks/res/values/do_not_translate.xml

@@ -22,6 +22,9 @@ limitations under the License.
   <string name="about_leif">Leif Wilden</string>
   <string name="about_rodrigo">Rodrigo Damazio</string>
   <string name="about_sandor">Sandor Dornbush</string>
+  <string name="color_mode_dynamic_percentage_default">25</string>
+  <string name="color_mode_fixed_medium_default">15</string>
+  <string name="color_mode_fixed_slow_default">9</string>
   <string name="display_track_color_value_dynamic">DYNAMIC</string>
   <string name="display_track_color_value_fixed">FIXED</string>
   <string name="display_track_color_value_none">NONE</string>
@@ -49,6 +52,5 @@ limitations under the License.
   <string name="track_action_end">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
   <string name="track_action_save">android.intent.action.SAVE</string>
   <string name="track_action_start">com.google.android.apps.mytracks.START_NEW_TRACK</string>
-  <string name="unit_percent">%</string>
   <string name="value_unknown">-</string>
  </resources>

MyTracks/res/values/styles.xml

@@ -15,42 +15,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
-  <!--  About dialog TableRow -->
-  <style name="AboutTableRow">
-    <item name="android:paddingBottom">2dp</item>
-  </style>
-  
-  <!--  About dialog TextView -->
-  <style name="AboutTextView">
+  <!--  About page label -->
+  <style name="AboutLabel">
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textSize">20sp</item>  
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:paddingBottom">2dp</item>
+    <item name="android:textSize">20sp</item>
   </style>
 
-  <!--  About dialog TextView column 0 -->
-  <style name="AboutTextView.Column0">
-    <item name="android:gravity">right</item>
-    <item name="android:layout_column">0</item>
-    <item name="android:paddingLeft">10dp</item>
-    <item name="android:paddingRight">10dp</item>
+  <!-- About page item -->
+  <style name="AboutItem">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:paddingBottom">2dp</item>
+    <item name="android:paddingLeft">20dp</item>
+    <item name="android:textSize">18sp</item>
   </style>
-    
-  <!--  About dialog TextView Url -->
-  <style name="AboutTextView.Url">
+
+  <!--  About page url -->
+  <style name="AboutUrl">
     <item name="android:autoLink">web</item>
-    <item name="android:textSize">18sp</item>  
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:paddingBottom">2dp</item>
+    <item name="android:paddingLeft">20dp</item>
+    <item name="android:textSize">18sp</item>
   </style>
-  
+
   <!-- Button -->
   <style name="Button">
-    <item name="android:layout_height">48dip</item>
+    <item name="android:layout_height">fill_parent</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">0dip</item>
     <item name="android:maxLines">2</item>
     <item name="android:textSize">14dip</item>
   </style>
-  
+
   <!-- Button layout -->
   <style name="ButtonLayout">
     <item name="android:background">@drawable/list_bar</item>
@@ -61,7 +61,7 @@ limitations under the License.
     <item name="android:paddingRight">2dip</item>
     <item name="android:paddingTop">4dip</item>
   </style>
-  
+
   <!-- Button spacer -->
   <style name="ButtonSpacer">
     <item name="android:layout_height">wrap_content</item>
@@ -70,14 +70,67 @@ limitations under the License.
     <item name="android:orientation">horizontal</item>
     <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>
+
+  <!-- Chart settings checkbox -->
+  <style name="ChartSettingsCheckbox">
+    <item name="android:checked">true</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+
+  <!-- Chart settings radio button -->
+  <style name="ChartSettingsRadioButton">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+
+  <style name="SensorStateLabel">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:paddingLeft">4dp</item>
+    <item name="android:paddingRight">4dp</item>
+  </style>
+
+  <style name="SensorStateValue">
+    <item name="android:background">@color/stat_label_background</item>
+    <item name="android:gravity">right</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:paddingLeft">4dp</item>
+    <item name="android:paddingRight">4dp</item>
+    <item name="android:textColor">@color/stat_label_text</item>
+    <item name="android:textSize">40sp</item>
+  </style>
+
   <!-- 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_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>
@@ -112,7 +165,7 @@ limitations under the License.
     <item name="android:layout_width">5dip</item>
     <item name="android:textSize">40sp</item>
   </style>
-  
+
   <!-- The style for the unit on the statistics activity. -->
   <style name="StatsUnit" parent="@android:Widget.TextView">
     <item name="android:gravity">bottom</item>
@@ -129,8 +182,8 @@ limitations under the License.
     <item name="android:layout_marginBottom">-9dip</item>
     <item name="android:layout_marginTop">-9dip</item>
     <item name="android:textColor">@color/stat_label_text</item>
-  </style>  
-  
+  </style>
+
   <!-- Welcome page TextView -->
   <style name="WelcomeTextView">
     <item name="android:layout_height">wrap_content</item>
@@ -139,13 +192,13 @@ limitations under the License.
     <item name="android:paddingRight">10sp</item>
     <item name="android:textColor">@color/black</item>
     <item name="android:textSize">16sp</item>
-  </style>  
-  
+  </style>
+
   <!-- Welcome page TextView question -->
   <style name="WelcomeTextView.Question">
     <item name="android:paddingTop">10sp</item>
     <item name="android:textStyle">bold</item>
-  </style>    
+  </style>
 
   <!-- Widget TextView -->
   <style name="WidgetTextView">
@@ -154,9 +207,9 @@ limitations under the License.
     <item name="android:textColor">@color/appwidget_text</item>
     <item name="android:textSize">14sp</item>
   </style>
-  
+
   <!-- Widget TextView value  -->
   <style name="WidgetTextView.Value">
     <item name="android:width">160px</item>
   </style>
-</resources>
+</resources>