am 1247d192: Merge "Add disclaimer string."

* commit '1247d19204f6eb1e8d3c560c8ba8e1ef900a897c':
  Add disclaimer string.
This commit is contained in:
Jeff Sharkey
2011-10-10 17:22:48 -07:00
committed by Android Git Automerger

View File

@@ -49,6 +49,15 @@
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@*android:dimen/preference_item_padding_side"
android:paddingRight="@*android:dimen/preference_item_padding_side"
android:paddingBottom="8dip"
android:text="@string/data_usage_disclaimer"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
@@ -56,7 +65,6 @@
android:visibility="gone"
android:paddingLeft="@*android:dimen/preference_item_padding_side"
android:paddingRight="@*android:dimen/preference_item_padding_side"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:text="@string/data_usage_empty"
android:textAppearance="?android:attr/textAppearanceSmall" />