From b43bc628d80d89cf040351e1e6fe0d8025b8a46f Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 7 Mar 2017 16:19:00 -0800
Subject: [PATCH] VPN screen clean up

Fix: 35960168
Fix: 35856128
Test: visual
- Increase new vpn dialog padding
- Update VPN icon

Change-Id: Ibc7f4fc5b9eff24693a25542e7d3481fbe3c393d
---
 res/layout/vpn_dialog.xml                              | 2 +-
 src/com/android/settings/vpn2/LegacyVpnPreference.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 6822e954189..61b08615eb6 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"
diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java
index c1550e242ca..a4d7221ca1d 100644
--- a/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -34,7 +34,7 @@ public class LegacyVpnPreference extends ManageablePreference {
 
     LegacyVpnPreference(Context context) {
         super(context, null /* attrs */);
-        setIcon(R.mipmap.ic_launcher_settings);
+        setIcon(R.drawable.ic_settings_24dp);
     }
 
     public VpnProfile getProfile() {