merge heads

This commit is contained in:
Jimmy Shih
2012-04-02 14:50:06 -07:00
parent 2d05ff98ca
commit 9575401127
15 changed files with 671 additions and 549 deletions
-58
View File
@@ -1,58 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
android:id="@+id/tracklist_root"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dp">
<TextView android:id="@+id/message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/track_list_pick_one"
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/tracklist_btn_import_all"
android:layout_gravity="left"
android:text="@string/track_list_import_all"
style="@style/Button"/>
<Button android:id="@+id/tracklist_btn_export_all"
android:layout_gravity="center_horizontal"
android:text="@string/track_list_export_all"
style="@style/Button"/>
<Button android:id="@+id/tracklist_btn_delete_all"
android:layout_gravity="right"
android:text="@string/track_list_delete_all"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<ListView
android:id="@+id/track_list"
android:layout_height="fill_parent"
android:layout_width="fill_parent" />
</LinearLayout>
+77
View File
@@ -0,0 +1,77 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:padding="8dp" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:drawablePadding="8dp"
android:id="@+id/track_list_item_name"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:singleLine="true"
style="@android:style/TextAppearance.DeviceDefault.Large" />
<TextView
android:id="@+id/track_list_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:singleLine="true"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/track_list_item_time"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:singleLine="true"
android:textColor="@color/green"
style="@android:style/TextAppearance.DeviceDefault.Small" />
<TextView
android:id="@+id/track_list_item_distance"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:singleLine="true"
android:textColor="@color/green"
style="@android:style/TextAppearance.DeviceDefault.Small" />
<TextView
android:id="@+id/track_list_item_start"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:singleLine="true"
android:textColor="@color/green"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</LinearLayout>
<TextView
android:id="@+id/track_list_item_description"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:singleLine="false"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</LinearLayout>
+54
View File
@@ -0,0 +1,54 @@
<?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.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:icon="@drawable/menu_record_track"
android:id="@+id/menu_record_track"
android:showAsAction="always"
android:title="@string/menu_record_track"/>
<item
android:icon="@drawable/menu_stop_recording"
android:id="@+id/menu_stop_recording"
android:showAsAction="always"
android:title="@string/menu_stop_recording"/>
<item
android:actionViewClass="android.widget.SearchView"
android:icon="@drawable/menu_search"
android:id="@+id/menu_search"
android:showAsAction="always|collapseActionView"
android:title="@string/menu_search"/>
<item
android:id="@+id/menu_import_all"
android:title="@string/menu_import_all"/>
<item
android:id="@+id/menu_export_all"
android:title="@string/menu_export_all"/>
<item
android:id="@+id/menu_delete_all"
android:title="@string/menu_delete_all"/>
<item
android:id="@+id/menu_aggregated_statistics"
android:title="@string/menu_aggregated_statistics"/>
<item
android:icon="@drawable/menu_settings"
android:id="@+id/menu_settings"
android:title="@string/menu_settings"/>
<item
android:icon="@drawable/menu_help"
android:id="@+id/menu_help"
android:title="@string/menu_help"/>
</menu>
+1
View File
@@ -17,6 +17,7 @@ limitations under the License.
<resources>
<color name="black">#FF000000</color>
<color name="blue">#FF0000FF</color>
<color name="green">#FF00FF00</color>
<color name="gray">#FFAAAAAA</color>
<color name="red">#FFFF0000</color>
<color name="stat_label_background">#FFF0F0F0</color>
+12 -25
View File
@@ -973,10 +973,22 @@ limitations under the License.
translation_description="In the menu, to change the chart settings.">
Chart settings
</string>
<string name="menu_delete_all"
translation_description="In the menu, to delete all the tracks.">
Delete all
</string>
<string name="menu_export_all"
translation_description="In the menu, to export all the tracks to the SD card.">
Export all
</string>
<string name="menu_help"
translation_description="In the menu, to go to the help page.">
Help
</string>
<string name="menu_import_all"
translation_description="In the menu, to import all the tracks from the SD card.">
Import all
</string>
<string name="menu_map_mode"
translation_description="In the menu, to switch the display to the map mode.">
Map mode
@@ -2277,12 +2289,6 @@ limitations under the License.
Screenshot: track_list_context_menu.png">
This track
</string>
<string name="track_list_delete_all"
translation_description="In the 'Tracks' page, the button on the bottom to delete all tracks.
Screenshot: track_list.png">
Delete all
</string>
<string name="track_list_delete_all_confirm_message"
translation_description="In the 'Tracks' page, when pressing the 'Delete all' button, the
confirmation dialog message informing the user that all tracks and markers will be permanently
@@ -2313,12 +2319,6 @@ limitations under the License.
Screenshot: track_list_context_menu.png">
Edit
</string>
<string name="track_list_export_all"
translation_description="In the 'Tracks' page, the button on the bottom to export all tracks.
Screenshot: track_list.png">
Export all
</string>
<string name="track_list_export_file"
translation_description="In the 'Tracks' page, after pressing the 'Export all' button, the menu
option to export all the tracks as a certain file format
@@ -2327,19 +2327,6 @@ limitations under the License.
Screenshot: track_list_export_file.png">
Export as %1$s
</string>
<string name="track_list_import_all"
translation_description="In the 'Tracks' page, the button on the bottom to import all tracks.
Screenshot: track_list.png">
Import all
</string>
<string name="track_list_pick_one"
translation_description="In the 'Tracks' page, the instruction at the top of the page informing
the user he can press and hold a track for more options.
Screenshot: track_list.png">
Pick a track. Press &amp; hold for more options.
</string>
<string name="track_list_play"
translation_description="In the context menu for a track, the menu option to play the track.">
Play