karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Autoformatted all resources.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-23 22:25:01 +02:00
parent 363cb14bff
commit cd52dc29c9
77 changed files with 3909 additions and 4116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/activity_type_preference.xml
+24 -22
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,27 @@ 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:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="16dp" >
<AutoCompleteTextView
android:hint="@string/track_edit_activity_type_hint"
android:id="@+id/activity_type_preference_text_view"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="0dp"
style="@style/EditCategory" />
<Spinner
android:id="@+id/activity_type_preference_spinner"
android:layout_gravity="bottom"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
</LinearLayout>
style="@style/ScrollView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingTop="16dp"
android:paddingRight="8dp">
<AutoCompleteTextView
android:id="@+id/activity_type_preference_text_view"
style="@style/EditCategory"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:hint="@string/track_edit_activity_type_hint" />
<Spinner
android:id="@+id/activity_type_preference_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom" />
</LinearLayout>
</ScrollView>
src/main/res/layout/chart.xml
+18 -18
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,21 +14,22 @@ 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="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/chart_view_layout"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="match_parent"
android:orientation="vertical" >
</LinearLayout>
<ZoomControls
android:background="@android:color/white"
android:gravity="right"
android:id="@+id/chart_zoom_controls"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingRight="8dp" />
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/chart_view_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"></LinearLayout>
<ZoomControls
android:id="@+id/chart_zoom_controls"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:gravity="right"
android:paddingRight="8dp" />
</LinearLayout>
src/main/res/layout/choose_activity_list_item.xml
+36 -33
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,36 +14,40 @@ 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:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="16dp"
android:paddingRight="16dp" >
<ImageView
android:contentDescription="@string/image_application"
android:id="@+id/choose_activity_list_item_icon"
android:layout_height="@android:dimen/app_icon_size"
android:layout_width="@android:dimen/app_icon_size"
android:scaleType="fitCenter" />
<LinearLayout
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/choose_activity_list_item_text1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="2"
android:paddingLeft="16dp"
style="@style/TextChooseActivity" />
<TextView
android:id="@+id/choose_activity_list_item_text2"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="2"
android:paddingLeft="16dp"
style="@style/TextChooseActivity" />
</LinearLayout>
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<ImageView
android:id="@+id/choose_activity_list_item_icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
android:contentDescription="@string/image_application"
android:scaleType="fitCenter" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/choose_activity_list_item_text1"
style="@style/TextChooseActivity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="2"
android:paddingLeft="16dp" />
<TextView
android:id="@+id/choose_activity_list_item_text2"
style="@style/TextChooseActivity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="2"
android:paddingLeft="16dp" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/choose_activity_type.xml
+13 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,16 +14,17 @@ 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="match_parent"
android:orientation="vertical" >
<GridView
android:id="@+id/choose_activity_type_grid_view"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="match_parent"
android:numColumns="4"
android:padding="4dp"
android:stretchMode="spacingWidth"
android:verticalSpacing="4dp" />
android:layout_height="wrap_content"
android:orientation="vertical">
<GridView
android:id="@+id/choose_activity_type_grid_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:numColumns="4"
android:padding="4dp"
android:stretchMode="spacingWidth"
android:verticalSpacing="4dp" />
</LinearLayout>
src/main/res/layout/list_item.xml
+120 -113
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,120 +14,128 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<!-- Photo -->
<ImageView
android:contentDescription="@string/image_photo_marker"
android:id="@+id/list_item_photo"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginBottom="4dp"
android:scaleType="centerCrop" />
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<!-- A gradient on top of the text -->
android:layout_height="wrap_content">
<!-- Photo -->
<ImageView
android:alpha=".6"
android:contentDescription="@string/image_photo_marker"
android:id="@+id/list_item_text_gradient"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:src="@drawable/text_gradient" />
<!-- Table 1 -->
<TableLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingBottom="12dp"
android:paddingRight="12dp"
android:paddingTop="8dp"
android:shrinkColumns="1"
android:stretchColumns="1" >
<!-- Table 1: Row 1 -->
<TableRow>
<!-- Table 1: Row 1: Column 1: (icon) -->
android:id="@+id/list_item_photo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="4dp"
android:contentDescription="@string/image_photo_marker"
android:scaleType="centerCrop" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- A gradient on top of the text -->
<ImageView
android:contentDescription="@string/image_track"
android:id="@+id/list_item_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_width="wrap_content" />
<!-- Table 1: Row 1: Column 2: (Table 2) -->
android:id="@+id/list_item_text_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha=".6"
android:contentDescription="@string/image_photo_marker"
android:src="@drawable/text_gradient" />
<!-- Table 1 -->
<TableLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:shrinkColumns="0"
android:stretchColumns="0" >
<TableRow>
<!-- Table 2: Row 1: Column 1: (name) -->
<TextView
android:ellipsize="end"
android:id="@+id/list_item_name"
android:layout_gravity="bottom"
android:layout_width="match_parent"
android:singleLine="true"
style="@style/TextMedium" />
<!-- Table 2: Row 1: Column 2: (date) -->
<TextView
android:id="@+id/list_item_date"
style="@style/ListItemDate" />
</TableRow>
<TableRow>
<!-- Need to match the style set in ListItemUtils.setListItem -->
<!-- Table 2: Row 2: Column 1: (shared owner, total time, total distance, and marker count) -->
<LinearLayout
android:layout_gravity="bottom"
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<TextView
android:ellipsize="end"
android:id="@+id/list_item_time_distance"
android:layout_gravity="bottom"
android:singleLine="true"
style="@style/TextSmall" />
<ImageView
android:contentDescription="@string/image_marker_count"
android:id="@+id/list_item_marker_count_icon"
android:layout_gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_width="wrap_content"
android:scaleType="centerInside"
android:src="@drawable/ic_menu_insert_marker" />
<TextView
android:ellipsize="end"
android:id="@+id/list_item_marker_count"
android:layout_gravity="bottom"
android:singleLine="true"
style="@style/TextSmall" />
</LinearLayout>
<!-- Table 2: Row 2: Column 2: (time) -->
<TextView
android:id="@+id/list_item_time"
style="@style/ListItemDate" />
</TableRow>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingTop="8dp"
android:paddingRight="12dp"
android:paddingBottom="12dp"
android:shrinkColumns="1"
android:stretchColumns="1">
<!-- Table 1: Row 1 -->
<TableRow>
<!-- Table 1: Row 1: Column 1: (icon) -->
<ImageView
android:id="@+id/list_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:contentDescription="@string/image_track" />
<!-- Table 1: Row 1: Column 2: (Table 2) -->
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:shrinkColumns="0"
android:stretchColumns="0">
<TableRow>
<!-- Table 2: Row 1: Column 1: (name) -->
<TextView
android:id="@+id/list_item_name"
style="@style/TextMedium"
android:layout_width="match_parent"
android:layout_gravity="bottom"
android:ellipsize="end"
android:singleLine="true" />
<!-- Table 2: Row 1: Column 2: (date) -->
<TextView
android:id="@+id/list_item_date"
style="@style/ListItemDate" />
</TableRow>
<TableRow>
<!-- Need to match the style set in ListItemUtils.setListItem -->
<!-- Table 2: Row 2: Column 1: (shared owner, total time, total distance, and marker count) -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<TextView
android:id="@+id/list_item_time_distance"
style="@style/TextSmall"
android:layout_gravity="bottom"
android:ellipsize="end"
android:singleLine="true" />
<ImageView
android:id="@+id/list_item_marker_count_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="1dp"
android:contentDescription="@string/image_marker_count"
android:scaleType="centerInside"
android:src="@drawable/ic_menu_insert_marker" />
<TextView
android:id="@+id/list_item_marker_count"
style="@style/TextSmall"
android:layout_gravity="bottom"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
<!-- Table 2: Row 2: Column 2: (time) -->
<TextView
android:id="@+id/list_item_time"
style="@style/ListItemDate" />
</TableRow>
</TableLayout>
</TableRow>
<TableRow>
<!-- Table 1: Row 2: (category and description) -->
<TextView
android:id="@+id/list_item_category_description"
style="@style/TextSmall"
android:layout_column="1"
android:ellipsize="end"
android:maxLines="2"
android:singleLine="false" />
</TableRow>
</TableLayout>
</TableRow>
<TableRow>
<!-- Table 1: Row 2: (category and description) -->
<TextView
android:ellipsize="end"
android:id="@+id/list_item_category_description"
android:layout_column="1"
android:maxLines="2"
android:singleLine="false"
style="@style/TextSmall" />
</TableRow>
</TableLayout>
</FrameLayout>
<View
android:layout_height="match_parent"
android:layout_width="match_parent"
style="@style/ListItem" />
</FrameLayout>
<View
style="@style/ListItem"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
src/main/res/layout/marker_detail_activity.xml
+8 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,11 @@ 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="match_parent"
android:layout_width="match_parent" >
<androidx.viewpager.widget.ViewPager
android:id="@+id/maker_detail_activity_view_pager"
android:layout_height="match_parent"
android:layout_width="match_parent" />
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.viewpager.widget.ViewPager
android:id="@+id/maker_detail_activity_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
src/main/res/layout/marker_detail_fragment.xml
+82 -69
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,74 +14,88 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<FrameLayout
android:id="@+id/marker_detail_waypoint"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<ImageView
android:background="@android:color/black"
android:contentDescription="@string/image_photo_marker"
android:id="@+id/marker_detail_waypoint_photo"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:scaleType="fitCenter" />
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<!-- A gradient on top of the text -->
<ImageView
android:alpha=".6"
android:contentDescription="@string/image_photo_marker"
android:id="@+id/marker_detail_waypoint_text_gradient"
android:layout_height="match_parent"
android:id="@+id/marker_detail_waypoint"
android:layout_width="match_parent"
android:src="@drawable/text_gradient" />
<LinearLayout
android:id="@+id/marker_detail_waypoint_info"
android:layout_height="wrap_content"
android:layout_marginBottom="80dp"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:id="@+id/marker_detail_waypoint_name"
android:paddingTop="8dp"
style="@style/TextMedium" />
<TextView
android:id="@+id/marker_detail_waypoint_category"
style="@style/TextSmall" />
<TextView
android:id="@+id/marker_detail_waypoint_description"
style="@style/TextSmall" />
<TextView
android:id="@+id/marker_detail_waypoint_location"
style="@style/TextSmall" />
</LinearLayout>
android:layout_height="match_parent">
<ImageView
android:id="@+id/marker_detail_waypoint_photo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:contentDescription="@string/image_photo_marker"
android:scaleType="fitCenter" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- A gradient on top of the text -->
<ImageView
android:id="@+id/marker_detail_waypoint_text_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha=".6"
android:contentDescription="@string/image_photo_marker"
android:src="@drawable/text_gradient" />
<LinearLayout
android:id="@+id/marker_detail_waypoint_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="80dp"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/marker_detail_waypoint_name"
style="@style/TextMedium"
android:paddingTop="8dp" />
<TextView
android:id="@+id/marker_detail_waypoint_category"
style="@style/TextSmall" />
<TextView
android:id="@+id/marker_detail_waypoint_description"
style="@style/TextSmall" />
<TextView
android:id="@+id/marker_detail_waypoint_location"
style="@style/TextSmall" />
</LinearLayout>
</FrameLayout>
</FrameLayout>
</FrameLayout>
<ScrollView
android:id="@+id/marker_detail_statistics"
style="@style/StatsScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:id="@+id/marker_detail_statistics_name"
android:paddingTop="8dp"
style="@style/TextMedium" />
<TextView
android:id="@+id/marker_detail_statistics_location"
style="@style/TextSmall" />
<TextView
android:paddingBottom="6dp"
android:paddingTop="4dp"
android:text="@string/marker_detail_statistics_title"
style="@style/TextSmall" />
<include layout="@layout/stats_content" />
</LinearLayout>
</ScrollView>
<ScrollView
android:id="@+id/marker_detail_statistics"
style="@style/StatsScrollView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/marker_detail_statistics_name"
style="@style/TextMedium"
android:paddingTop="8dp" />
<TextView
android:id="@+id/marker_detail_statistics_location"
style="@style/TextSmall" />
<TextView
style="@style/TextSmall"
android:paddingTop="4dp"
android:paddingBottom="6dp"
android:text="@string/marker_detail_statistics_title" />
<include layout="@layout/stats_content" />
</LinearLayout>
</ScrollView>
</FrameLayout>
src/main/res/layout/marker_edit.xml
+73 -60
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,63 +14,77 @@ 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="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:text="@string/generic_name"
style="@style/EditLabel" />
<LinearLayout
android:id="@+id/marker_edit_statistics_section"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical" >
<EditText
android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
android:hint="@string/generic_name"
android:id="@+id/marker_edit_statistics_name"
android:imeOptions="actionDone"
style="@style/EditNameMarker" />
</LinearLayout>
<LinearLayout
android:id="@+id/marker_edit_waypoint_section"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical" >
<EditText
android:drawableLeft="@drawable/ic_marker_blue_pushpin"
android:hint="@string/generic_name"
android:id="@+id/marker_edit_waypoint_name"
android:imeOptions="actionNext"
style="@style/EditNameMarker" />
<TextView
android:text="@string/marker_edit_marker_type"
style="@style/EditLabel.WithPaddingTop" />
<AutoCompleteTextView
android:hint="@string/marker_edit_marker_type_hint"
android:id="@+id/marker_edit_waypoint_marker_type"
android:imeOptions="actionNext"
android:layout_width="match_parent"
style="@style/EditCategory" />
<TextView
android:text="@string/generic_description"
style="@style/EditLabel.WithPaddingTop" />
<EditText
android:hint="@string/generic_description"
android:id="@+id/marker_edit_waypoint_description"
android:imeOptions="actionDone"
style="@style/EditDescription" />
</LinearLayout>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView style="@style/ScrollView.WithBottomButtons">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
style="@style/EditLabel"
android:text="@string/generic_name" />
<LinearLayout
android:id="@+id/marker_edit_statistics_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
android:id="@+id/marker_edit_statistics_name"
style="@style/EditNameMarker"
android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
android:hint="@string/generic_name"
android:imeOptions="actionDone" />
</LinearLayout>
<LinearLayout
android:id="@+id/marker_edit_waypoint_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
android:id="@+id/marker_edit_waypoint_name"
style="@style/EditNameMarker"
android:drawableLeft="@drawable/ic_marker_blue_pushpin"
android:hint="@string/generic_name"
android:imeOptions="actionNext" />
<TextView
style="@style/EditLabel.WithPaddingTop"
android:text="@string/marker_edit_marker_type" />
<AutoCompleteTextView
android:id="@+id/marker_edit_waypoint_marker_type"
style="@style/EditCategory"
android:layout_width="match_parent"
android:hint="@string/marker_edit_marker_type_hint"
android:imeOptions="actionNext" />
<TextView
style="@style/EditLabel.WithPaddingTop"
android:text="@string/generic_description" />
<EditText
android:id="@+id/marker_edit_waypoint_description"
style="@style/EditDescription"
android:hint="@string/generic_description"
android:imeOptions="actionDone" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar">
<include layout="@layout/marker_edit_buttons" />
</LinearLayout>
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/marker_edit_buttons" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/marker_edit_buttons.xml
+13 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,15 +13,16 @@ 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- In v14, postive button on the right. -->
<Button
android:id="@+id/marker_edit_cancel"
android:layout_gravity="left"
android:text="@string/generic_cancel"
style="@style/BottomButton" />
<Button
android:id="@+id/marker_edit_done"
android:layout_gravity="right"
style="@style/BottomButton" />
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<!-- In v14, postive button on the right. -->
<Button
android:id="@+id/marker_edit_cancel"
style="@style/BottomButton"
android:layout_gravity="left"
android:text="@string/generic_cancel" />
<Button
android:id="@+id/marker_edit_done"
style="@style/BottomButton"
android:layout_gravity="right" />
</merge>
src/main/res/layout/marker_list.xml
+13 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,16 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<ListView
android:id="@+id/marker_list"
android:layout_height="match_parent"
android:layout_width="match_parent" />
<TextView
android:id="@+id/marker_list_empty"
android:text="@string/marker_list_empty_message"
style="@style/ListEmptyTextView" >
</TextView>
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/marker_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView
android:id="@+id/marker_list_empty"
style="@style/ListEmptyTextView"
android:text="@string/marker_list_empty_message"></TextView>
</merge>
src/main/res/layout/search_list.xml
+13 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,16 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<ListView
android:id="@+id/search_list"
android:layout_height="match_parent"
android:layout_width="match_parent" />
<TextView
android:id="@+id/search_list_empty"
android:text="@string/search_list_empty_message"
style="@style/ListEmptyTextView" >
</TextView>
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/search_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView
android:id="@+id/search_list_empty"
style="@style/ListEmptyTextView"
android:text="@string/search_list_empty_message"></TextView>
</merge>
src/main/res/layout/sensor_state.xml
+57 -50
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,52 +14,60 @@ 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" >
<TextView
android:text="@string/menu_sensor_state"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state"
style="@style/SensorStateValue" />
<!-- Last sensor time -->
<TextView
android:text="@string/sensor_state_last_sensor_time"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue" />
<!-- Heart rate -->
<TextView
android:text="@string/sensor_state_heart_rate"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" />
<!-- Cadence -->
<TextView
android:text="@string/sensor_state_cadence"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" />
<!-- Power -->
<TextView
android:text="@string/sensor_state_power"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" />
<!-- Battery level -->
<TextView
android:text="@string/sensor_state_battery"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_battery"
style="@style/SensorStateValue" />
</LinearLayout>
style="@style/ScrollView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
style="@style/TextMedium"
android:text="@string/menu_sensor_state" />
<TextView
android:id="@+id/sensor_state"
style="@style/SensorStateValue" />
<!-- Last sensor time -->
<TextView
style="@style/TextMedium"
android:text="@string/sensor_state_last_sensor_time" />
<TextView
android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue" />
<!-- Heart rate -->
<TextView
style="@style/TextMedium"
android:text="@string/sensor_state_heart_rate" />
<TextView
android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" />
<!-- Cadence -->
<TextView
style="@style/TextMedium"
android:text="@string/sensor_state_cadence" />
<TextView
android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" />
<!-- Power -->
<TextView
style="@style/TextMedium"
android:text="@string/sensor_state_power" />
<TextView
android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" />
<!-- Battery level -->
<TextView
style="@style/TextMedium"
android:text="@string/sensor_state_battery" />
<TextView
android:id="@+id/sensor_state_battery"
style="@style/SensorStateValue" />
</LinearLayout>
</ScrollView>
src/main/res/layout/stats.xml
+10 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +14,13 @@ 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/StatsScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical">
<include layout="@layout/stats_content" />
</LinearLayout>
style="@style/StatsScrollView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/stats_content" />
</LinearLayout>
</ScrollView>
src/main/res/layout/stats_activity_type.xml
+16 -16
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,18 +14,19 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/StatsLargeItemContainer" >
<!-- Label -->
<TextView
android:id="@+id/stats_label"
android:text="@string/track_edit_activity_type_hint"
style="@style/StatsLargeLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsLargeValueContainer" >
<Spinner
android:id="@+id/stats_activity_type_icon"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_width="wrap_content" />
</LinearLayout>
style="@style/StatsLargeItemContainer">
<!-- Label -->
<TextView
android:id="@+id/stats_label"
style="@style/StatsLargeLabel"
android:text="@string/track_edit_activity_type_hint" />
<!-- Value container -->
<LinearLayout style="@style/StatsLargeValueContainer">
<Spinner
android:id="@+id/stats_activity_type_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/stats_content.xml
+153 -141
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,151 +13,164 @@ 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- Distance and activity type -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<include
android:id="@+id/stats_distance"
layout="@layout/stats_large_item" />
<include
android:id="@+id/stats_calorie"
layout="@layout/stats_activity_type" />
</LinearLayout>
<!-- Total time and moving time -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<include
android:id="@+id/stats_total_time"
layout="@layout/stats_large_item" />
<include
android:id="@+id/stats_moving_time"
layout="@layout/stats_large_item" />
</LinearLayout>
<!-- Horizontal line -->
<View style="@style/StatsHorizontalLine" />
<!-- Speed and average speed -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<include
android:id="@+id/stats_speed"
layout="@layout/stats_small_item" />
<include
android:id="@+id/stats_average_speed"
layout="@layout/stats_small_item" />
</LinearLayout>
<!-- Max speed and average moving speed -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<include
android:id="@+id/stats_max_speed"
layout="@layout/stats_small_item" />
<include
android:id="@+id/stats_average_moving_speed"
layout="@layout/stats_small_item" />
</LinearLayout>
<!-- Horizontal line -->
<View
android:id="@+id/stats_grade_elevation_separator"
style="@style/StatsHorizontalLine" />
<LinearLayout
android:id="@+id/stats_grade_elevation_container"
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<!-- Grade -->
<LinearLayout style="@style/StatsSmallGroupContainer" >
<!-- Grade label -->
<TextView
android:text="@string/stats_grade"
style="@style/StatsSmallLabel" />
<TableLayout
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content" >
<!-- Grade min -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Distance and activity type -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_grade_min"
layout="@layout/stats_small_group_item" />
<!-- Grade max -->
android:id="@+id/stats_distance"
layout="@layout/stats_large_item" />
<include
android:id="@+id/stats_grade_max"
layout="@layout/stats_small_group_item" />
</TableLayout>
android:id="@+id/stats_calorie"
layout="@layout/stats_activity_type" />
</LinearLayout>
<!-- Elevation -->
<LinearLayout style="@style/StatsSmallGroupContainer" >
<!-- Elevation label -->
<TextView
android:text="@string/stats_elevation"
style="@style/StatsSmallLabel" />
<TableLayout
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content" >
<!-- Total time and moving time -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_total_time"
layout="@layout/stats_large_item" />
<include
android:id="@+id/stats_moving_time"
layout="@layout/stats_large_item" />
</LinearLayout>
<!-- Horizontal line -->
<View style="@style/StatsHorizontalLine" />
<!-- Speed and average speed -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_speed"
layout="@layout/stats_small_item" />
<include
android:id="@+id/stats_average_speed"
layout="@layout/stats_small_item" />
</LinearLayout>
<!-- Max speed and average moving speed -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_max_speed"
layout="@layout/stats_small_item" />
<include
android:id="@+id/stats_average_moving_speed"
layout="@layout/stats_small_item" />
</LinearLayout>
<!-- Horizontal line -->
<View
android:id="@+id/stats_grade_elevation_separator"
style="@style/StatsHorizontalLine" />
<LinearLayout
android:id="@+id/stats_grade_elevation_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Grade -->
<LinearLayout style="@style/StatsSmallGroupContainer">
<!-- Grade label -->
<TextView
style="@style/StatsSmallLabel"
android:text="@string/stats_grade" />
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<!-- Grade min -->
<include
android:id="@+id/stats_grade_min"
layout="@layout/stats_small_group_item" />
<!-- Grade max -->
<include
android:id="@+id/stats_grade_max"
layout="@layout/stats_small_group_item" />
</TableLayout>
</LinearLayout>
<!-- Elevation -->
<include
android:id="@+id/stats_elevation"
layout="@layout/stats_small_group_item" />
<!-- Elevation gain -->
<include
android:id="@+id/stats_elevation_gain"
layout="@layout/stats_small_group_item" />
<!-- Elevation min -->
<include
android:id="@+id/stats_elevation_min"
layout="@layout/stats_small_group_item" />
<!-- Elevation max -->
<include
android:id="@+id/stats_elevation_max"
layout="@layout/stats_small_group_item" />
</TableLayout>
<LinearLayout style="@style/StatsSmallGroupContainer">
<!-- Elevation label -->
<TextView
style="@style/StatsSmallLabel"
android:text="@string/stats_elevation" />
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<!-- Elevation -->
<include
android:id="@+id/stats_elevation"
layout="@layout/stats_small_group_item" />
<!-- Elevation gain -->
<include
android:id="@+id/stats_elevation_gain"
layout="@layout/stats_small_group_item" />
<!-- Elevation min -->
<include
android:id="@+id/stats_elevation_min"
layout="@layout/stats_small_group_item" />
<!-- Elevation max -->
<include
android:id="@+id/stats_elevation_max"
layout="@layout/stats_small_group_item" />
</TableLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- Horizontal line -->
<View
android:id="@+id/stats_coordinate_separator"
style="@style/StatsHorizontalLine" />
<!-- Latitude and longitude -->
<LinearLayout
android:id="@+id/stats_coordinate_container"
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<include
android:id="@+id/stats_latitude"
layout="@layout/stats_small_item" />
<include
android:id="@+id/stats_longitude"
layout="@layout/stats_small_item" />
</LinearLayout>
<!-- Sensor data: heart rate-->
<View
android:id="@+id/stats_sensor_separator"
style="@style/StatsHorizontalLine" />
<LinearLayout
android:id="@+id/stats_sensor_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_sensor_heart_rate_value"
layout="@layout/stats_large_item" />
<LinearLayout style="@style/StatsSmallGroupContainer">
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<!-- Horizontal line -->
<View
android:id="@+id/stats_coordinate_separator"
style="@style/StatsHorizontalLine" />
<!-- Latitude and longitude -->
<LinearLayout
android:id="@+id/stats_coordinate_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_sensor_heart_rate_sensor"
layout="@layout/stats_tiny_item" />
</TableLayout>
android:id="@+id/stats_latitude"
layout="@layout/stats_small_item" />
<include
android:id="@+id/stats_longitude"
layout="@layout/stats_small_item" />
</LinearLayout>
<!-- Sensor data: heart rate-->
<View
android:id="@+id/stats_sensor_separator"
style="@style/StatsHorizontalLine" />
<LinearLayout
android:id="@+id/stats_sensor_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/stats_sensor_heart_rate_value"
layout="@layout/stats_large_item" />
<LinearLayout style="@style/StatsSmallGroupContainer">
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<include
android:id="@+id/stats_sensor_heart_rate_sensor"
layout="@layout/stats_tiny_item" />
</TableLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</merge>
src/main/res/layout/stats_large_item.xml
+16 -17
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,20 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/StatsLargeItemContainer" >
<!-- Label -->
<TextView
android:id="@+id/stats_label"
style="@style/StatsLargeLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsLargeValueContainer" >
<!-- Value -->
style="@style/StatsLargeItemContainer">
<!-- Label -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsLargeValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
android:id="@+id/stats_label"
style="@style/StatsLargeLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsLargeValueContainer">
<!-- Value -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsLargeValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/stats_small_group_item.xml
+31 -31
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,33 +14,34 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="wrap_content" >
<!-- Value container -->
<LinearLayout
android:layout_gravity="right|bottom"
style="@style/StatsSmallValueContainer" >
<!-- Value -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsSmallValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
<!-- Label container -->
<LinearLayout
android:layout_gravity="left|bottom"
style="@style/StatsSmallValueContainer" >
<TextView
android:visibility="invisible"
style="@style/StatsSmallValue" />
<!-- Label -->
<TextView
android:id="@+id/stats_label"
android:layout_gravity="bottom"
android:paddingLeft="8dp"
style="@style/StatsSmallLabel" />
</LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!-- Value container -->
<LinearLayout
style="@style/StatsSmallValueContainer"
android:layout_gravity="right|bottom">
<!-- Value -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsSmallValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
<!-- Label container -->
<LinearLayout
style="@style/StatsSmallValueContainer"
android:layout_gravity="left|bottom">
<TextView
style="@style/StatsSmallValue"
android:visibility="invisible" />
<!-- Label -->
<TextView
android:id="@+id/stats_label"
style="@style/StatsSmallLabel"
android:layout_gravity="bottom"
android:paddingLeft="8dp" />
</LinearLayout>
</TableRow>
src/main/res/layout/stats_small_item.xml
+16 -17
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,20 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/StatsSmallItemContainer" >
<!-- Label -->
<TextView
android:id="@+id/stats_label"
style="@style/StatsSmallLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsSmallValueContainer" >
<!-- Value -->
style="@style/StatsSmallItemContainer">
<!-- Label -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsSmallValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
android:id="@+id/stats_label"
style="@style/StatsSmallLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsSmallValueContainer">
<!-- Value -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsSmallValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/stats_tiny_item.xml
+16 -17
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,20 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/StatsSmallItemContainer" >
<!-- Label -->
<TextView
android:id="@+id/stats_label"
style="@style/StatsSmallLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsSmallValueContainer" >
<!-- Value -->
style="@style/StatsSmallItemContainer">
<!-- Label -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsTinyValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
android:id="@+id/stats_label"
style="@style/StatsSmallLabel" />
<!-- Value container -->
<LinearLayout style="@style/StatsSmallValueContainer">
<!-- Value -->
<TextView
android:id="@+id/stats_value"
style="@style/StatsTinyValue" />
<!-- Unit -->
<TextView
android:id="@+id/stats_unit"
style="@style/StatsUnit" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/track_controller.xml
+61 -54
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,57 +13,65 @@ 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<LinearLayout
android:background="@color/track_controller_background"
android:id="@+id/track_controller_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingBottom="8dp"
android:paddingTop="8dp" >
<View
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="0dp" />
<ImageButton
android:background="@android:color/transparent"
android:contentDescription="@string/image_record"
android:id="@+id/track_controller_record"
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_width="0dp" />
<RelativeLayout
android:layout_height="match_parent"
android:layout_weight="6"
android:layout_width="0dp" >
<TextView
android:id="@+id/track_controller_total_time"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/track_controller_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="@android:color/white"
style="@style/TextSmall" />
<TextView
android:id="@+id/track_controller_status"
android:layout_above="@id/track_controller_total_time"
android:layout_alignParentLeft="true"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:singleLine="true"
style="@style/TextMicro" />
</RelativeLayout>
<ImageButton
android:background="@android:color/transparent"
android:contentDescription="@string/image_stop"
android:id="@+id/track_controller_stop"
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_width="0dp"
android:src="@drawable/ic_button_stop_disabled" />
<View
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="0dp" />
</LinearLayout>
android:background="@color/track_controller_background"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageButton
android:id="@+id/track_controller_record"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:background="@android:color/transparent"
android:contentDescription="@string/image_record" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="6">
<TextView
android:id="@+id/track_controller_total_time"
style="@style/TextSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:textColor="@android:color/white" />
<TextView
android:id="@+id/track_controller_status"
style="@style/TextMicro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/track_controller_total_time"
android:layout_alignParentLeft="true"
android:singleLine="true" />
</RelativeLayout>
<ImageButton
android:id="@+id/track_controller_stop"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:background="@android:color/transparent"
android:contentDescription="@string/image_stop"
android:src="@drawable/ic_button_stop_disabled" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
</merge>
src/main/res/layout/track_detail.xml
+15 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,18 @@ 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="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<TabHost
android:id="@android:id/tabhost"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="match_parent" >
<include layout="@layout/track_details_tab" />
</TabHost>
<include layout="@layout/track_controller" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TabHost
android:id="@android:id/tabhost"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<include layout="@layout/track_details_tab" />
</TabHost>
<include layout="@layout/track_controller" />
</LinearLayout>
src/main/res/layout/track_details_tab.xml
+26 -23
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,25 +13,29 @@ 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<LinearLayout
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<TabWidget
android:id="@android:id/tabs"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_width="match_parent" />
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_height="0dp"
android:layout_weight="0"
android:layout_width="0dp" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="match_parent" />
</LinearLayout>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0" />
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="0" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</merge>
src/main/res/layout/track_edit.xml
+65 -53
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,56 +14,69 @@ 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="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:text="@string/generic_name"
style="@style/EditLabel" />
<EditText
android:hint="@string/generic_name"
android:id="@+id/track_edit_name"
android:imeOptions="actionNext"
style="@style/EditNameTrack" />
<TextView
android:id="@+id/track_edit_activity_type_label"
android:text="@string/track_edit_activity_type"
style="@style/EditLabel.WithPaddingTop" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<AutoCompleteTextView
android:hint="@string/track_edit_activity_type_hint"
android:id="@+id/track_edit_activity_type"
android:imeOptions="actionNext"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="0dp"
style="@style/EditCategory" />
<Spinner
android:id="@+id/track_edit_activity_type_icon"
android:layout_gravity="bottom"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
</LinearLayout>
<TextView
android:text="@string/generic_description"
style="@style/EditLabel.WithPaddingTop" />
<EditText
android:hint="@string/generic_description"
android:id="@+id/track_edit_description"
android:imeOptions="actionDone"
style="@style/EditDescription" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView style="@style/ScrollView.WithBottomButtons">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
style="@style/EditLabel"
android:text="@string/generic_name" />
<EditText
android:id="@+id/track_edit_name"
style="@style/EditNameTrack"
android:hint="@string/generic_name"
android:imeOptions="actionNext" />
<TextView
android:id="@+id/track_edit_activity_type_label"
style="@style/EditLabel.WithPaddingTop"
android:text="@string/track_edit_activity_type" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<AutoCompleteTextView
android:id="@+id/track_edit_activity_type"
style="@style/EditCategory"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:hint="@string/track_edit_activity_type_hint"
android:imeOptions="actionNext" />
<Spinner
android:id="@+id/track_edit_activity_type_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom" />
</LinearLayout>
<TextView
style="@style/EditLabel.WithPaddingTop"
android:text="@string/generic_description" />
<EditText
android:id="@+id/track_edit_description"
style="@style/EditDescription"
android:hint="@string/generic_description"
android:imeOptions="actionDone" />
</LinearLayout>
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar">
<include layout="@layout/track_edit_buttons" />
</LinearLayout>
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/track_edit_buttons" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/track_edit_buttons.xml
+14 -14
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- In v14, postive button on the right. -->
<Button
android:id="@+id/track_edit_cancel"
android:layout_gravity="left"
android:text="@string/generic_cancel"
style="@style/BottomButton" />
<Button
android:id="@+id/track_edit_save"
android:layout_gravity="right"
android:text="@string/generic_save"
style="@style/BottomButton" />
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<!-- In v14, postive button on the right. -->
<Button
android:id="@+id/track_edit_cancel"
style="@style/BottomButton"
android:layout_gravity="left"
android:text="@string/generic_cancel" />
<Button
android:id="@+id/track_edit_save"
style="@style/BottomButton"
android:layout_gravity="right"
android:text="@string/generic_save" />
</merge>
src/main/res/layout/track_list.xml
+70 -61
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,63 +14,73 @@ 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="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<ListView
android:id="@+id/track_list"
android:layout_height="0dp"
android:layout_weight="1.0"
android:layout_width="match_parent" />
<RelativeLayout
android:id="@+id/track_list_empty_view"
android:layout_height="0dp"
android:layout_weight="1.0"
android:layout_width="match_parent" >
<LinearLayout
android:id="@+id/track_list_arrow_long"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingBottom="12dp"
android:paddingTop="16dp" >
<View
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="0dp" />
<ImageView
android:contentDescription="@string/image_arrow"
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_width="0dp"
android:src="@drawable/ic_arrow_long" />
<View
android:layout_height="match_parent"
android:layout_weight="17"
android:layout_width="0dp" />
</LinearLayout>
<LinearLayout
android:layout_above="@id/track_list_arrow_long"
android:layout_height="wrap_content"
android:layout_width="match_parent" >
<View
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_width="0dp" />
<TextView
android:gravity="left"
android:layout_height="wrap_content"
android:layout_weight="22"
android:layout_width="0dp"
android:text="@string/track_list_empty_message"
android:textColor="@color/list_empty_text"
style="@style/TextLarge" >
</TextView>
<View
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="0dp" />
</LinearLayout>
</RelativeLayout>
<include layout="@layout/track_controller" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ListView
android:id="@+id/track_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.0" />
<RelativeLayout
android:id="@+id/track_list_empty_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.0">
<LinearLayout
android:id="@+id/track_list_arrow_long"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingTop="16dp"
android:paddingBottom="12dp">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:contentDescription="@string/image_arrow"
android:src="@drawable/ic_arrow_long" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="17" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/track_list_arrow_long">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5" />
<TextView
style="@style/TextLarge"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="22"
android:gravity="left"
android:text="@string/track_list_empty_message"
android:textColor="@color/list_empty_text"></TextView>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
</RelativeLayout>
<include layout="@layout/track_controller" />
</LinearLayout>
src/main/res/layout/track_widget_4x1.xml
+105 -85
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,91 +14,112 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/TrackWidgetBoundingBox" >
<!-- android:orientation="horizontal", override from the style -->
<LinearLayout
android:orientation="horizontal"
android:paddingBottom="4dp"
android:paddingTop="4dp"
style="@style/TrackWidgetFrame" >
style="@style/TrackWidgetBoundingBox">
<!-- android:orientation="horizontal", override from the style -->
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
<ImageButton
android:contentDescription="@string/image_record"
android:id="@+id/track_widget_record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<LinearLayout
android:id="@+id/track_widget_stats_container"
android:layout_height="match_parent"
android:layout_weight="18"
android:layout_width="0dp"
android:padding="0dp"
style="@style/TrackWidgetStatsContainer" >
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer" >
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer" >
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
style="@style/TrackWidgetFrame"
android:orientation="horizontal"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
<ImageButton
android:id="@+id/track_widget_record_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_record"
android:src="@drawable/button_record" />
<LinearLayout
android:id="@+id/track_widget_stats_container"
style="@style/TrackWidgetStatsContainer"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="18"
android:padding="0dp">
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer">
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer">
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
style="@style/TrackWidgetHorizontalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetHorizontalLine"
android:layout_weight="38" />
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection">
<LinearLayout style="@style/TrackWidgetItemContainer">
<!-- item2 -->
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer">
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetHorizontalSeparator" >
<ImageButton
android:id="@+id/track_widget_stop_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_stop"
android:src="@drawable/ic_button_stop_disabled" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
<LinearLayout
android:layout_weight="38"
style="@style/TrackWidgetHorizontalLine" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection" >
<LinearLayout style="@style/TrackWidgetItemContainer" >
<!-- item2 -->
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer" >
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
</LinearLayout>
<ImageButton
android:contentDescription="@string/image_stop"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
<ImageView
android:contentDescription="@string/image_my_tracks_logo"
style="@style/TrackWidgetLogo" />
<ImageView
style="@style/TrackWidgetLogo"
android:contentDescription="@string/image_my_tracks_logo" />
</RelativeLayout>
src/main/res/layout/track_widget_4x2.xml
+175 -138
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,147 +14,185 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/TrackWidgetBoundingBox" >
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetFrame" >
style="@style/TrackWidgetBoundingBox">
<LinearLayout
android:baselineAligned="false"
android:id="@+id/track_widget_stats_container"
android:layout_weight="1"
style="@style/TrackWidgetStatsContainer" >
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2" >
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer" >
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
style="@style/TrackWidgetFrame"
android:baselineAligned="false">
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetVerticalSeparator" >
<LinearLayout
android:layout_weight="2"
style="@style/TrackWidgetVerticalSpacer" />
<LinearLayout
android:id="@+id/track_widget_stats_container"
style="@style/TrackWidgetStatsContainer"
android:layout_weight="1"
style="@style/TrackWidgetVerticalLine" />
android:baselineAligned="false">
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2">
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer">
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
style="@style/TrackWidgetVerticalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="2" />
<LinearLayout
style="@style/TrackWidgetVerticalLine"
android:layout_weight="1" />
</LinearLayout>
<!-- item3 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2">
<TextView
android:id="@+id/track_widget_item3_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer">
<TextView
android:id="@+id/track_widget_item3_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item3_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item3_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
style="@style/TrackWidgetHorizontalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetHorizontalLine"
android:layout_weight="38" />
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item2 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2">
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer">
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
style="@style/TrackWidgetVerticalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetVerticalLine"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="2" />
</LinearLayout>
<!-- item4 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2">
<TextView
android:id="@+id/track_widget_item4_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer">
<TextView
android:id="@+id/track_widget_item4_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item4_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item4_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- item3 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2" >
<TextView
android:id="@+id/track_widget_item3_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer" >
<LinearLayout style="@style/TrackWidgetButtonContainer">
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
<ImageButton
android:id="@+id/track_widget_record_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_record"
android:src="@drawable/button_record" />
<TextView
android:id="@+id/track_widget_item3_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item3_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item3_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
android:id="@+id/track_widget_record_status"
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:id="@+id/track_widget_stop_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_stop"
android:src="@drawable/ic_button_stop_disabled" />
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetHorizontalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
<LinearLayout
android:layout_weight="38"
style="@style/TrackWidgetHorizontalLine" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item2 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2" >
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer" >
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetVerticalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalLine" />
<LinearLayout
android:layout_weight="2"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
<!-- item4 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x2" >
<TextView
android:id="@+id/track_widget_item4_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer" >
<TextView
android:id="@+id/track_widget_item4_value"
style="@style/TrackWidgetValue" />
<TextView
android:id="@+id/track_widget_item4_unit"
style="@style/TrackWidgetUnit" />
<Chronometer
android:id="@+id/track_widget_item4_chronometer"
style="@style/TrackWidgetValue" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/TrackWidgetButtonContainer" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
<ImageButton
android:contentDescription="@string/image_record"
android:id="@+id/track_widget_record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:contentDescription="@string/image_stop"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
</LinearLayout>
<ImageView
android:contentDescription="@string/image_my_tracks_logo"
style="@style/TrackWidgetLogo" />
<ImageView
style="@style/TrackWidgetLogo"
android:contentDescription="@string/image_my_tracks_logo" />
</RelativeLayout>
src/main/res/layout/track_widget_4x3.xml
+175 -138
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,147 +14,185 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/TrackWidgetBoundingBox" >
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetFrame" >
style="@style/TrackWidgetBoundingBox">
<LinearLayout
android:baselineAligned="false"
android:id="@+id/track_widget_stats_container"
android:layout_weight="2"
style="@style/TrackWidgetStatsContainer" >
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3" >
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
style="@style/TrackWidgetFrame"
android:baselineAligned="false">
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetVerticalSeparator" >
<LinearLayout
android:id="@+id/track_widget_stats_container"
style="@style/TrackWidgetStatsContainer"
android:layout_weight="2"
style="@style/TrackWidgetVerticalSpacer" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalLine" />
android:baselineAligned="false">
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3">
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
style="@style/TrackWidgetVerticalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="2" />
<LinearLayout
style="@style/TrackWidgetVerticalLine"
android:layout_weight="1" />
</LinearLayout>
<!-- item3 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3">
<TextView
android:id="@+id/track_widget_item3_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item3_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item3_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item3_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
style="@style/TrackWidgetHorizontalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetHorizontalLine"
android:layout_weight="38" />
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item2 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3">
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
style="@style/TrackWidgetVerticalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetVerticalLine"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="2" />
</LinearLayout>
<!-- item4 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3">
<TextView
android:id="@+id/track_widget_item4_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item4_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item4_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item4_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- item3 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3" >
<TextView
android:id="@+id/track_widget_item3_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<LinearLayout style="@style/TrackWidgetButtonContainer">
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
<ImageButton
android:id="@+id/track_widget_record_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_record"
android:src="@drawable/button_record" />
<TextView
android:id="@+id/track_widget_item3_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item3_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item3_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
android:id="@+id/track_widget_record_status"
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:id="@+id/track_widget_stop_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_stop"
android:src="@drawable/ic_button_stop_disabled" />
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetHorizontalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
<LinearLayout
android:layout_weight="38"
style="@style/TrackWidgetHorizontalLine" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item2 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3" >
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetVerticalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalLine" />
<LinearLayout
android:layout_weight="2"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
<!-- item4 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3" >
<TextView
android:id="@+id/track_widget_item4_label"
style="@style/TrackWidgetLabel" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<TextView
android:id="@+id/track_widget_item4_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item4_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item4_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/TrackWidgetButtonContainer" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
<ImageButton
android:contentDescription="@string/image_record"
android:id="@+id/track_widget_record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:contentDescription="@string/image_stop"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
</LinearLayout>
<ImageView
android:contentDescription="@string/image_my_tracks_logo"
style="@style/TrackWidgetLogo" />
<ImageView
style="@style/TrackWidgetLogo"
android:contentDescription="@string/image_my_tracks_logo" />
</RelativeLayout>
src/main/res/layout/track_widget_4x4.xml
+184 -144
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,151 +14,192 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/TrackWidgetBoundingBox" >
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetFrame" >
style="@style/TrackWidgetBoundingBox">
<LinearLayout
android:baselineAligned="false"
android:id="@+id/track_widget_stats_container"
android:layout_weight="3"
style="@style/TrackWidgetStatsContainer" >
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x4" >
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue4x4" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit4x4" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue4x4" />
</LinearLayout>
style="@style/TrackWidgetFrame"
android:baselineAligned="false">
<LinearLayout
android:id="@+id/track_widget_stats_container"
style="@style/TrackWidgetStatsContainer"
android:layout_weight="3"
android:baselineAligned="false">
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item1 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x4">
<TextView
android:id="@+id/track_widget_item1_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item1_value"
style="@style/TrackWidgetValue4x4" />
<TextView
android:id="@+id/track_widget_item1_unit"
style="@style/TrackWidgetUnit4x4" />
<Chronometer
android:id="@+id/track_widget_item1_chronometer"
style="@style/TrackWidgetValue4x4" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
style="@style/TrackWidgetHorizontalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetHorizontalLine"
android:layout_weight="4" />
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item3 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x4">
<TextView
android:id="@+id/track_widget_item3_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item3_value"
style="@style/TrackWidgetValue4x4" />
<TextView
android:id="@+id/track_widget_item3_unit"
style="@style/TrackWidgetUnit4x4" />
<Chronometer
android:id="@+id/track_widget_item3_chronometer"
style="@style/TrackWidgetValue4x4" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/TrackWidgetHorizontalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetHorizontalLine"
android:layout_weight="38" />
<LinearLayout
style="@style/TrackWidgetHorizontalSpacer"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection">
<!-- item2 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3">
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
style="@style/TrackWidgetVerticalSeparator"
android:baselineAligned="false">
<LinearLayout
style="@style/TrackWidgetVerticalLine"
android:layout_weight="1" />
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="2" />
</LinearLayout>
<!-- item4 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3">
<TextView
android:id="@+id/track_widget_item4_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3">
<TextView
android:id="@+id/track_widget_item4_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item4_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item4_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- horizontal separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetHorizontalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
<LinearLayout
android:layout_weight="4"
style="@style/TrackWidgetHorizontalLine" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item3 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x4" >
<TextView
android:id="@+id/track_widget_item3_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<LinearLayout style="@style/TrackWidgetButtonContainer">
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
<ImageButton
android:id="@+id/track_widget_record_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_record"
android:src="@drawable/button_record" />
<TextView
android:id="@+id/track_widget_item3_value"
style="@style/TrackWidgetValue4x4" />
<TextView
android:id="@+id/track_widget_item3_unit"
style="@style/TrackWidgetUnit4x4" />
<Chronometer
android:id="@+id/track_widget_item3_chronometer"
style="@style/TrackWidgetValue4x4" />
</LinearLayout>
android:id="@+id/track_widget_record_status"
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:id="@+id/track_widget_stop_button"
style="@style/TrackWidgetButton"
android:contentDescription="@string/image_stop"
android:src="@drawable/ic_button_stop_disabled" />
<LinearLayout
style="@style/TrackWidgetVerticalSpacer"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetHorizontalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
<LinearLayout
android:layout_weight="38"
style="@style/TrackWidgetHorizontalLine" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetHorizontalSpacer" />
</LinearLayout>
<LinearLayout style="@style/TrackWidgetStatsSection" >
<!-- item2 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3" >
<TextView
android:id="@+id/track_widget_item2_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<TextView
android:id="@+id/track_widget_item2_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item2_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item2_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
<!-- vertical separator -->
<LinearLayout
android:baselineAligned="false"
style="@style/TrackWidgetVerticalSeparator" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalLine" />
<LinearLayout
android:layout_weight="2"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
<!-- item4 -->
<LinearLayout style="@style/TrackWidgetItemContainer4x3" >
<TextView
android:id="@+id/track_widget_item4_label"
style="@style/TrackWidgetLabel4x4" />
<LinearLayout style="@style/TrackWidgetValueContainer4x3" >
<TextView
android:id="@+id/track_widget_item4_value"
style="@style/TrackWidgetValue4x3" />
<TextView
android:id="@+id/track_widget_item4_unit"
style="@style/TrackWidgetUnit4x3" />
<Chronometer
android:id="@+id/track_widget_item4_chronometer"
style="@style/TrackWidgetValue4x3" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/TrackWidgetButtonContainer" >
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
<ImageButton
android:contentDescription="@string/image_record"
android:id="@+id/track_widget_record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:contentDescription="@string/image_stop"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
style="@style/TrackWidgetVerticalSpacer" />
</LinearLayout>
</LinearLayout>
<ImageView
android:contentDescription="@string/image_my_tracks_logo"
style="@style/TrackWidgetLogo4x4" />
<ImageView
style="@style/TrackWidgetLogo4x4"
android:contentDescription="@string/image_my_tracks_logo" />
</RelativeLayout>
src/main/res/layout/track_widget_config.xml
+36 -28
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,31 +14,40 @@ 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="match_parent"
android:layout_width="match_parent"
android:orientation="vertical" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<Spinner
android:id="@+id/track_widget_config_item1"
style="@style/TrackWidgetConfigSpinner" />
<Spinner
android:id="@+id/track_widget_config_item2"
style="@style/TrackWidgetConfigSpinner" />
<Spinner
android:id="@+id/track_widget_config_item3"
style="@style/TrackWidgetConfigSpinner" />
<Spinner
android:id="@+id/track_widget_config_item4"
style="@style/TrackWidgetConfigSpinner" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView style="@style/ScrollView.WithBottomButtons">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<Spinner
android:id="@+id/track_widget_config_item1"
style="@style/TrackWidgetConfigSpinner" />
<Spinner
android:id="@+id/track_widget_config_item2"
style="@style/TrackWidgetConfigSpinner" />
<Spinner
android:id="@+id/track_widget_config_item3"
style="@style/TrackWidgetConfigSpinner" />
<Spinner
android:id="@+id/track_widget_config_item4"
style="@style/TrackWidgetConfigSpinner" />
</LinearLayout>
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar">
<include layout="@layout/track_widget_config_buttons" />
</LinearLayout>
</ScrollView>
<View style="@style/BottomButtonDivider" />
<LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/track_widget_config_buttons" />
</LinearLayout>
</LinearLayout>
src/main/res/layout/track_widget_config_buttons.xml
+14 -14
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- In v14, postive button on the right. -->
<Button
android:id="@+id/track_widget_config_cancel"
android:layout_gravity="left"
android:text="@string/generic_cancel"
style="@style/BottomButton" />
<Button
android:id="@+id/track_widget_config_add"
android:layout_gravity="right"
android:text="@string/generic_add"
style="@style/BottomButton" />
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<!-- In v14, postive button on the right. -->
<Button
android:id="@+id/track_widget_config_cancel"
style="@style/BottomButton"
android:layout_gravity="left"
android:text="@string/generic_cancel" />
<Button
android:id="@+id/track_widget_config_add"
style="@style/BottomButton"
android:layout_gravity="right"
android:text="@string/generic_add" />
</merge>