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
+16 -5
View File
@@ -38,7 +38,7 @@ limitations under the License.
<item name="android:gravity">right</item>
<item name="android:layout_marginBottom">-9dip</item>
<item name="android:layout_marginTop">-9dip</item>
<item name="android:text">@string/unknown</item>
<item name="android:text">@string/value_unknown</item>
<item name="android:textColor">@color/stat_label_text</item>
<item name="android:textSize">40sp</item>
</style>
@@ -86,8 +86,19 @@ limitations under the License.
<item name="android:width">160px</item>
</style>
<!-- The style for the buttons on the bottom of a dialog. -->
<style name="DialogButton">
<!-- The style for the layout of the bottom buttons. -->
<style name="ButtonLayout">
<item name="android:background">@drawable/list_bar</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:orientation">horizontal</item>
<item name="android:paddingLeft">2dip</item>
<item name="android:paddingRight">2dip</item>
<item name="android:paddingTop">4dip</item>
</style>
<!-- The style for the bottom button. -->
<style name="Button">
<item name="android:layout_height">48dip</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dip</item>
@@ -95,8 +106,8 @@ limitations under the License.
<item name="android:textSize">14dip</item>
</style>
<!-- The style for the spacer on the left and right of the dialog buttons. -->
<style name="DialogButtonSpacer">
<!-- The style for the spacer on the left and right of the bottom buttons. -->
<style name="ButtonSpacer">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">0.25</item>
<item name="android:layout_width">0dip</item>