merge heads

This commit is contained in:
Jimmy Shih
2013-04-29 12:33:54 -07:00
parent 97defda41c
commit ce80f4e39a
4 changed files with 93 additions and 14 deletions
+6 -7
View File
@@ -20,18 +20,17 @@ limitations under the License.
<item name="android:paddingLeft">48dp</item>
</style>
<!-- bottom button -->
<style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
<style name="BottomButton">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item>
<item name="android:maxLines">2</item>
</style>
<!-- bottom button bar -->
<style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
<style name="BottomButtonBar">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:orientation">horizontal</item>
<item name="android:measureWithLargestChild">true</item>
</style>
<!-- choose upload service checkbox -->
<style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">
@@ -290,7 +289,6 @@ limitations under the License.
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:singleLine">true</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">@color/orange</item>
<item name="android:textSize">10dp</item>
<item name="android:textStyle">bold</item>
@@ -348,21 +346,22 @@ limitations under the License.
<item name="android:textSize">18dp</item>
</style>
<!-- track widget value -->
<style name="TrackWidgetValue" parent="@style/TextMedium">
<style name="TrackWidgetValue">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">2</item>
<item name="android:layout_width">0dp</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">18dp</item>
<item name="android:textStyle">bold</item>
</style>
<!-- track widget value 4x3 -->
<style name="TrackWidgetValue4x3" parent="@style/TrackWidgetValue">
<item name="android:textSize">28sp</item>
<item name="android:textSize">28dp</item>
</style>
<!-- track widget value 4x4 -->
<style name="TrackWidgetValue4x4" parent="@style/TrackWidgetValue">
<item name="android:textSize">36sp</item>
<item name="android:textSize">36dp</item>
</style>
<!-- track widget value container -->
<style name="TrackWidgetValueContainer">