forked from upstream-mirrors/OpenTracks
merge heads
This commit is contained in:
Jimmy Shih
@@ -34,6 +34,7 @@ limitations under the License.
|
||||
style="@style/ListEmptyTextView" >
|
||||
</TextView>
|
||||
<ImageButton
|
||||
android:background="@color/transparent"
|
||||
android:contentDescription="@string/menu_record_track"
|
||||
android:id="@+id/track_list_record_button"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -14,71 +14,72 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="@drawable/app_widget_background"
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:paddingBottom="5dp"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingTop="5dp" >
|
||||
<ImageButton
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@string/my_tracks_app_name"
|
||||
android:id="@+id/appwidget_button"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:src="@drawable/app_widget_button_disabled" />
|
||||
android:padding="@dimen/widget_margin" >
|
||||
<LinearLayout
|
||||
android:clickable="true"
|
||||
android:id="@+id/appwidget_track_statistics"
|
||||
android:background="@drawable/app_widget_background"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0dp"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="16dp" >
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<ImageButton
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@string/my_tracks_app_name"
|
||||
android:id="@+id/track_widget_button"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/app_widget_button_disabled" />
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/appwidget_distance_text"
|
||||
style="@style/TrackWidgetValue" />
|
||||
<TextView
|
||||
android:text="@string/stats_total_distance"
|
||||
style="@style/TextSmall" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:background="@color/appwidget_hr"
|
||||
android:layout_height="1dp"
|
||||
android:layout_width="fill_parent" />
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/appwidget_time_text"
|
||||
style="@style/TrackWidgetValue" />
|
||||
<TextView
|
||||
android:text="@string/stats_moving_time"
|
||||
style="@style/TextSmall" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:background="@color/appwidget_hr"
|
||||
android:layout_height="1dp"
|
||||
android:layout_width="fill_parent" />
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/appwidget_speed_text"
|
||||
style="@style/TrackWidgetValue" />
|
||||
<TextView
|
||||
android:text="@string/stats_speed"
|
||||
style="@style/TextSmall" />
|
||||
android:clickable="true"
|
||||
android:id="@+id/track_widget_statistics"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0dp"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="8dp" >
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/track_widget_distance_value"
|
||||
style="@style/TrackWidgetValue" />
|
||||
<TextView
|
||||
android:text="@string/stats_total_distance"
|
||||
style="@style/TrackWidgetLabel" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:background="@color/track_widget_line"
|
||||
android:layout_height="1dp"
|
||||
android:layout_width="fill_parent" />
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/track_widget_time_value"
|
||||
style="@style/TrackWidgetValue" />
|
||||
<TextView
|
||||
android:id="@+id/track_widget_time_label"
|
||||
style="@style/TrackWidgetLabel" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:background="@color/track_widget_line"
|
||||
android:layout_height="1dp"
|
||||
android:layout_width="fill_parent" />
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/track_widget_speed_value"
|
||||
style="@style/TrackWidgetValue" />
|
||||
<TextView
|
||||
android:id="@+id/track_widget_speed_label"
|
||||
style="@style/TrackWidgetLabel" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2012 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<dimen name="widget_margin">0dp</dimen>
|
||||
</resources>
|
||||
@@ -19,46 +19,45 @@ limitations under the License.
|
||||
<color name="blue">#FF0000FF</color>
|
||||
<color name="gray">#FFAAAAAA</color>
|
||||
<color name="red">#FFFF0000</color>
|
||||
<color name="transparent">#00000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
|
||||
<!-- holo_orange_dark -->
|
||||
<color name="warning_background">#FFFF8800</color>
|
||||
|
||||
<!-- Chart colors by series. -->
|
||||
<!-- Green and a transparent green -->
|
||||
|
||||
<!-- elevation chart colors, green and transparent green -->
|
||||
<color name="elevation_border">#FF339933</color>
|
||||
<color name="elevation_fill">#40B3CFB3</color>
|
||||
|
||||
<!-- Blue and a transparent blue -->
|
||||
<!-- speed chart colors, blue and transparent blue -->
|
||||
<color name="speed_border">#FF0066FF</color>
|
||||
<color name="speed_fill">#40C8E0FF</color>
|
||||
|
||||
<!-- Blue and a transparent blue -->
|
||||
<!-- pace chart colors, blue and transparent blue -->
|
||||
<color name="pace_border">#FF0066FF</color>
|
||||
<color name="pace_fill">#40C8E0FF</color>
|
||||
|
||||
<!-- Red and a transparent red -->
|
||||
<color name="heartrate_border">#FFCC3300</color>
|
||||
<color name="heartrate_fill">#40E88A70</color>
|
||||
|
||||
<!-- Pink and a transparent pink -->
|
||||
<!-- heart rate chart colors, red and transparent red -->
|
||||
<color name="heart_rate_border">#FFCC3300</color>
|
||||
<color name="heart_rate_fill">#40E88A70</color>
|
||||
|
||||
<!-- cadence chart colors, pink and transparent pink -->
|
||||
<color name="cadence_border">#FFF128F3</color>
|
||||
<color name="cadence_fill">#40F128F3</color>
|
||||
|
||||
<!-- Purple and a transparent purple -->
|
||||
<!-- power chart colors, purple and transparent purple -->
|
||||
<color name="power_border">#FF401465</color>
|
||||
<color name="power_fill">#40401465</color>
|
||||
|
||||
<!-- AppWidget colors -->
|
||||
<color name="appwidget_hr">#99999999</color>
|
||||
|
||||
<!-- Colors for dynamic track drawing -->
|
||||
<!-- Green -->
|
||||
<!-- track widget line -->
|
||||
<color name="track_widget_line">#99999999</color>
|
||||
|
||||
<!-- dynamic track slow path, green -->
|
||||
<color name="slow_path">#F774DF00</color>
|
||||
|
||||
<!-- Blue -->
|
||||
|
||||
<!-- dynamic track normal path, blue -->
|
||||
<color name="normal_path">#F75858FA</color>
|
||||
|
||||
<!-- Red -->
|
||||
|
||||
<!-- dynamic track fast path, red -->
|
||||
<color name="fast_path">#F7DF0101</color>
|
||||
</resources>
|
||||
</resources>
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2012 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<dimen name="widget_margin">8dp</dimen>
|
||||
</resources>
|
||||
@@ -157,8 +157,13 @@ limitations under the License.
|
||||
</style>
|
||||
<!-- Theme selector -->
|
||||
<style name="ThemeSelector" parent="android:Theme" />
|
||||
<!-- The style for the track widget value -->
|
||||
<style name="TrackWidgetValue" parent="@style/TextSmall">
|
||||
<!-- The style for the track widget label -->
|
||||
<style name="TrackWidgetLabel" parent="@style/TextSmall">
|
||||
<item name="android:width">100dp</item>
|
||||
</style>
|
||||
<!-- The style for the track widget value -->
|
||||
<style name="TrackWidgetValue" parent="@style/TextSmall">
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -29,8 +29,8 @@ limitations under the License.
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/stats_use_total_time_key"
|
||||
android:summaryOff="@string/stats_total_time"
|
||||
android:summaryOn="@string/stats_moving_time"
|
||||
android:summaryOff="@string/stats_moving_time"
|
||||
android:summaryOn="@string/stats_total_time"
|
||||
android:title="@string/settings_stats_time_title" />
|
||||
<PreferenceCategory android:title="@string/settings_show" >
|
||||
<CheckBoxPreference
|
||||
|
||||
@@ -14,9 +14,8 @@ 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.
|
||||
-->
|
||||
<appwidget-provider
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:initialLayout="@layout/track_widget"
|
||||
android:minHeight="72dp"
|
||||
android:minWidth="294dp"
|
||||
android:minHeight="110dp"
|
||||
android:minWidth="250dp"
|
||||
android:updatePeriodMillis="0" />
|
||||
|
||||
Reference in New Issue
Block a user