summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-07-07 23:07:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-07 23:07:33 +0000
commit846362fa06e717784e2e60882c83c20a9350b1a7 (patch)
tree46fd7aac42cb58de70551527c070220de7823609
parentb5e3eba1665f0a5f42bcfc2630d67011edb70f05 (diff)
parent5f95520cfde1d56b725d20a37f4da23eb9469c1f (diff)
downloadframeworks_base-846362fa06e717784e2e60882c83c20a9350b1a7.zip
frameworks_base-846362fa06e717784e2e60882c83c20a9350b1a7.tar.gz
frameworks_base-846362fa06e717784e2e60882c83c20a9350b1a7.tar.bz2
Merge "Use 'dp' paddings instead of 'mm' for VPN dialogs" into mnc-dev
-rw-r--r--packages/VpnDialogs/res/layout/confirm.xml8
-rw-r--r--packages/VpnDialogs/res/layout/manage.xml2
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/VpnDialogs/res/layout/confirm.xml b/packages/VpnDialogs/res/layout/confirm.xml
index 66fec59..b245a10 100644
--- a/packages/VpnDialogs/res/layout/confirm.xml
+++ b/packages/VpnDialogs/res/layout/confirm.xml
@@ -22,8 +22,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:paddingTop="4mm"
- android:paddingLeft="3mm"
- android:paddingRight="3mm"
- android:paddingBottom="4mm"/>
+ android:paddingTop="16dp"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:paddingBottom="8dp"/>
</ScrollView>
diff --git a/packages/VpnDialogs/res/layout/manage.xml b/packages/VpnDialogs/res/layout/manage.xml
index 6b504e4..d0b14b3 100644
--- a/packages/VpnDialogs/res/layout/manage.xml
+++ b/packages/VpnDialogs/res/layout/manage.xml
@@ -18,7 +18,7 @@
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="3mm"
+ android:padding="24dp"
android:stretchColumns="0,1"
android:shrinkColumns="1">