Merge heads

This commit is contained in:
youtaol
2012-06-04 13:20:38 +08:00
parent cad1a105ca
commit 953bd8b908
22 changed files with 325 additions and 306 deletions
+20 -21
View File
@@ -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>
+19
View File
@@ -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>
+7 -2
View File
@@ -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>