Merge heads

MyTracks/res/drawable/pause_button.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/btn_pause_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/btn_pause"/>
+</selector>

MyTracks/res/drawable/record_button.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/btn_record_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/btn_record"/>
+</selector>

MyTracks/res/drawable/stop_1_button.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/btn_stop_1_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/btn_stop_1"/>
+</selector>

MyTracks/res/layout-land/track_controller.xml

@@ -61,7 +61,7 @@ limitations under the License.
       android:layout_height="0dp"
       android:layout_weight="10"
       android:layout_width="match_parent"
-      android:src="@drawable/btn_stop_1" />
+      android:src="@drawable/btn_stop_0" />
     <View
       android:layout_height="0dp"
       android:layout_weight="1"

MyTracks/res/layout/track_controller.xml

@@ -62,7 +62,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_weight="10"
       android:layout_width="0dp"
-      android:src="@drawable/btn_stop_1" />
+      android:src="@drawable/btn_stop_0" />
     <View
       android:layout_height="match_parent"
       android:layout_weight="1"

MyTracks/res/layout/track_widget_4x1.xml

@@ -27,7 +27,8 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_record_track"
       android:id="@+id/track_widget_record_button"
-      style="@style/TrackWidgetButtonRecord" />
+      android:src="@drawable/record_button"      
+      style="@style/TrackWidgetButton" />
     <LinearLayout
       android:id="@+id/track_widget_stats_container"
       android:layout_height="match_parent"
@@ -91,7 +92,8 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_stop_recording"
       android:id="@+id/track_widget_stop_button"
-      style="@style/TrackWidgetButtonStop" />
+      android:src="@drawable/btn_stop_0"
+      style="@style/TrackWidgetButton" />
     <LinearLayout
       android:layout_weight="1"
       style="@style/TrackWidgetVerticalSpacer" />

MyTracks/res/layout/track_widget_4x2.xml

@@ -140,7 +140,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        style="@style/TrackWidgetButtonRecord" />
+        android:src="@drawable/record_button"      
+        style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
         android:layout_gravity="center_vertical"
@@ -152,7 +153,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        style="@style/TrackWidgetButtonStop" />
+        android:src="@drawable/btn_stop_0"
+        style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />

MyTracks/res/layout/track_widget_4x3.xml

@@ -140,7 +140,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        style="@style/TrackWidgetButtonRecord" />
+        android:src="@drawable/record_button"      
+        style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
         android:layout_gravity="center_vertical"
@@ -152,7 +153,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        style="@style/TrackWidgetButtonStop" />
+        android:src="@drawable/btn_stop_0"
+        style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />

MyTracks/res/layout/track_widget_4x4.xml

@@ -144,7 +144,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        style="@style/TrackWidgetButtonRecord" />
+        android:src="@drawable/record_button"      
+        style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
         android:layout_gravity="center_vertical"
@@ -156,7 +157,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        style="@style/TrackWidgetButtonStop" />
+        android:src="@drawable/btn_stop_0"
+        style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />

MyTracks/res/menu/map.xml

@@ -18,6 +18,7 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_map_layer"
     android:orderInCategory="5"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_map_layer">
     <menu>
       <group android:checkableBehavior="single" >

MyTracks/res/values/styles.xml

@@ -254,6 +254,8 @@ limitations under the License.
   <style name="TrackWidgetButton">
     <item name="android:background">@android:color/transparent</item>
     <item name="android:layout_gravity">center_vertical</item>
+    <item name="android:layout_height">63dp</item>
+    <item name="android:layout_width">63dp</item>
     <item name="android:scaleType">fitXY</item>
   </style>
   <!-- track widget button container -->
@@ -266,18 +268,6 @@ limitations under the License.
     <item name="android:paddingBottom">4dp</item>
     <item name="android:paddingTop">4dp</item>
   </style>
-  <!-- track widget button record -->
-  <style name="TrackWidgetButtonRecord" parent="@style/TrackWidgetButton">
-    <item name="android:layout_height">63dp</item>
-    <item name="android:layout_width">75dp</item>
-    <item name="android:src">@drawable/btn_record</item>
-  </style>
-  <!-- track widget button stop -->
-  <style name="TrackWidgetButtonStop" parent="@style/TrackWidgetButton">
-    <item name="android:layout_height">63dp</item>
-    <item name="android:layout_width">63dp</item>
-    <item name="android:src">@drawable/btn_stop_0</item>
-  </style>
   <!-- track widget config spiner -->
   <style name="TrackWidgetConfigSpinner">
     <item name="android:layout_gravity">center_horizontal</item>