diff options
| author | 2011-09-13 15:47:46 -0700 | |
|---|---|---|
| committer | 2011-09-13 15:47:46 -0700 | |
| commit | c6ceb6a084452c4e815f6bd3a6ea096857e68982 (patch) | |
| tree | 795618f2dd6ea8beba3c278a78de183a28c181c0 | |
| parent | d309a0434a74a4d3982d2309c49d7076e4611229 (diff) | |
| parent | d80549c8dc36b19f3f030974def05366e086aff7 (diff) | |
Merge "VpnDialogs: allow strings wrapped into multiple lines."
| -rw-r--r-- | packages/VpnDialogs/res/layout/manage.xml | 3 | ||||
| -rw-r--r-- | packages/VpnDialogs/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/VpnDialogs/res/values/styles.xml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/packages/VpnDialogs/res/layout/manage.xml b/packages/VpnDialogs/res/layout/manage.xml index 3dcbb469ecf5..ec710ffe20e5 100644 --- a/packages/VpnDialogs/res/layout/manage.xml +++ b/packages/VpnDialogs/res/layout/manage.xml @@ -19,7 +19,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="3mm" - android:stretchColumns="0,1"> + android:stretchColumns="0,1" + android:shrinkColumns="1"> <TableRow> <TextView android:text="@string/session" style="@style/label"/> diff --git a/packages/VpnDialogs/res/values/strings.xml b/packages/VpnDialogs/res/values/strings.xml index df6d36bd2814..fcd58faeedbd 100644 --- a/packages/VpnDialogs/res/values/strings.xml +++ b/packages/VpnDialogs/res/values/strings.xml @@ -35,8 +35,8 @@ <string name="session">Session:</string> <string name="duration">Duration:</string> - <string name="data_transmitted">Data Transmitted:</string> - <string name="data_received">Data Received:</string> + <string name="data_transmitted">Sent:</string> + <string name="data_received">Received:</string> <string name="blank_value">--</string> <string name="data_value_format"> diff --git a/packages/VpnDialogs/res/values/styles.xml b/packages/VpnDialogs/res/values/styles.xml index 6eae2184c573..cf105969b49a 100644 --- a/packages/VpnDialogs/res/values/styles.xml +++ b/packages/VpnDialogs/res/values/styles.xml @@ -24,7 +24,7 @@ <style name="label"> <item name="android:gravity">center_vertical|right</item> - <item name="android:paddingRight">5mm</item> + <item name="android:paddingRight">2mm</item> <item name="android:textSize">16sp</item> </style> |