diff options
| author | Robin Lee <rgl@google.com> | 2015-07-07 23:56:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 23:56:47 +0000 |
| commit | e211fc40271aa40f7c9527faf84b96309152fb2a (patch) | |
| tree | a56d1722580e73f8cff36d04f3b5724e0b9fff1f /packages/VpnDialogs | |
| parent | 29b48c22e17b24149c891719bb9b481228a2dde0 (diff) | |
| parent | 515a8406aa649fb5ea63a79f697eb04afadf4a3d (diff) | |
| download | frameworks_base-e211fc40271aa40f7c9527faf84b96309152fb2a.zip frameworks_base-e211fc40271aa40f7c9527faf84b96309152fb2a.tar.gz frameworks_base-e211fc40271aa40f7c9527faf84b96309152fb2a.tar.bz2 | |
am 515a8406: am 59ca7dd0: am 846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev
* commit '515a8406aa649fb5ea63a79f697eb04afadf4a3d':
Use 'dp' paddings instead of 'mm' for VPN dialogs
Diffstat (limited to 'packages/VpnDialogs')
| -rw-r--r-- | packages/VpnDialogs/res/layout/confirm.xml | 8 | ||||
| -rw-r--r-- | packages/VpnDialogs/res/layout/manage.xml | 2 |
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"> |