Merged to head

This commit is contained in:
Rodrigo Damazio
2011-11-14 23:27:04 -02:00
parent a4ae9e8fd5
commit c3cda97692
193 changed files with 8457 additions and 11274 deletions
@@ -30,7 +30,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView android:text="@string/waypointdetails_name"
<TextView android:text="@string/marker_detail_marker_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<LinearLayout
@@ -51,7 +51,7 @@ limitations under the License.
android:autoText="true"
android:capitalize="words"
android:selectAllOnFocus="true"
android:hint="@string/waypointdetails_name_hint"
android:hint="@string/marker_detail_marker_name"
android:imeOptions="actionNext"/>
</LinearLayout>
<LinearLayout android:id="@+id/waypointdetails_description_layout"
@@ -61,16 +61,16 @@ limitations under the License.
android:visibility="visible"
android:layout_weight="1">
<TextView android:id="@+id/waypointdetails_category_label"
android:text="@string/waypointdetails_category"
android:text="@string/marker_detail_marker_type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<AutoCompleteTextView android:id="@+id/waypointdetails_category"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:hint="@string/waypointdetails_category_hint"
android:hint="@string/marker_detail_marker_type_hint"
android:imeOptions="actionNext"/>
<TextView android:text="@string/waypointdetails_description"
<TextView android:text="@string/marker_detail_marker_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<EditText android:id="@+id/waypointdetails_description"
@@ -84,7 +84,7 @@ limitations under the License.
android:maxLines="50"
android:gravity="top"
android:layout_weight="1"
android:hint="@string/waypointdetails_description_hint"
android:hint="@string/marker_detail_marker_description"
android:imeOptions="actionDone"/>
</LinearLayout>
@@ -101,12 +101,12 @@ limitations under the License.
android:id="@+id/total_distance_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
<TextView
android:id="@+id/max_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_speed_label" />
android:text="@string/stat_max_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -116,7 +116,7 @@ limitations under the License.
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -125,7 +125,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/mile"
android:text="@string/unit_mile"
android:textColor="@color/stat_label_text" />
<!-- TODO 4/08/2009
The following is a bad hack to get a spacer the same size as the
@@ -145,7 +145,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<LinearLayout
@@ -183,12 +183,12 @@ limitations under the License.
android:id="@+id/track_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/total_time_label" />
android:text="@string/stat_total_time" />
<TextView
android:id="@+id/average_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_speed_label" />
android:text="@string/stat_average_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -201,7 +201,7 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_span="2"
android:layout_width="fill_parent"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -217,7 +217,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<LinearLayout
@@ -255,12 +255,12 @@ limitations under the License.
android:id="@+id/moving_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
<TextView
android:id="@+id/average_moving_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/average_moving_speed_label" />
android:text="@string/stat_average_moving_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -273,7 +273,7 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -289,7 +289,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<LinearLayout
@@ -327,12 +327,12 @@ limitations under the License.
android:id="@+id/elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/elevation_label" />
android:text="@string/stat_elevation" />
<TextView
android:id="@+id/elevation_gain_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/elevation_gain_label" />
android:text="@string/stat_elevation_gain" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -342,7 +342,7 @@ limitations under the License.
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -351,7 +351,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text"/>
<TextView
android:background="@color/black"
@@ -366,7 +366,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -375,7 +375,7 @@ limitations under the License.
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -385,12 +385,12 @@ limitations under the License.
android:id="@+id/min_elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_elevation_label" />
android:text="@string/stat_min_elevation" />
<TextView
android:id="@+id/max_elevation_label"
android:layout_column="4"
android:layout_span="3"
android:text="@string/max_elevation_label" />
android:text="@string/stat_max_elevation" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -400,7 +400,7 @@ limitations under the License.
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -409,7 +409,7 @@ limitations under the License.
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
@@ -424,7 +424,7 @@ limitations under the License.
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -433,7 +433,7 @@ limitations under the License.
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:text="@string/feet"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -443,12 +443,12 @@ limitations under the License.
android:id="@+id/min_grade_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/min_grade_label" />
android:text="@string/stat_min_grade" />
<TextView
android:id="@+id/max_grade_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/max_grade_label" />
android:text="@string/stat_max_grade" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -461,7 +461,7 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
<TextView
@@ -480,36 +480,23 @@ limitations under the License.
android:layout_marginTop="-9dip"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/unknown"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
</TableRow>
</TableLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:padding="3dip">
<Button android:id="@+id/waypointdetails_cancel"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="right"
android:text="@string/cancel"
android:textSize="14dip"/>
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button android:id="@+id/waypointdetails_save"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"/>
<Button android:id="@+id/waypointdetails_cancel"
android:layout_gravity="right"
android:text="@string/save"
android:textSize="14dip"/>
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>