commit b43bc628d80d89cf040351e1e6fe0d8025b8a46f
author Fan Zhang <zhfan@google.com> Tue Mar 07 16:19:00 2017 -0800
committer Fan Zhang <zhfan@google.com> Tue Mar 07 16:21:38 2017 -0800
tree dd53729a1b8a9b114f85d2157d8980036756821e
parent e0b65fce67511792aa3a983024f292754fd9ef5a

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

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() {