commit a3a83470b5a8277f31ef9fd7b6b34f76e086ac9d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 08 01:53:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 08 01:53:22 2017 +0000
tree 9d17fa3393627640f700849e7024feafc3686ef3
parent dde06062f4b67bec506e7c42d6ac63b678b14820
parent b43bc628d80d89cf040351e1e6fe0d8025b8a46f

Merge "VPN screen clean up"

res/layout/vpn_dialog.xml

diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 6822e95..61b0861 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -20,7 +20,7 @@
     <LinearLayout android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="8dp">
+            android:padding="24dp">
 
         <LinearLayout android:id="@+id/editor"
                 android:layout_width="match_parent"

src/com/android/settings/vpn2/LegacyVpnPreference.java

diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java
index c1550e2..a4d7221 100644
--- a/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -34,7 +34,7 @@
 
     LegacyVpnPreference(Context context) {
         super(context, null /* attrs */);
-        setIcon(R.mipmap.ic_launcher_settings);
+        setIcon(R.drawable.ic_settings_24dp);
     }
 
     public VpnProfile getProfile() {