vpn2: show third-party VPN services

VPN apps are shown alongside configured VPNs now. The requirement that
a password is set is now only enforced when setting up a configured
VPN as this is not necessary for apps.

Some UI redesign.

Bug: 19573824
Bug: 17474682
Bug: 19575658
Change-Id: I02bd977136929647d65b9784fb4cc5df24b45428

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

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.vpn2;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.internal.net.VpnConfig;
+import com.android.settings.R;
+
+/**
+ * UI for managing the connection controlled by an app.
+ *
+ * Among the actions available are (depending on context):
+ * <ul>
+ *   <li><strong>Forget</strong>: revoke the managing app's VPN permission</li>
+ *   <li><strong>Dismiss</strong>: continue to use the VPN</li>
+ * </ul>
+ *
+ * {@see ConfigDialog}
+ */
+class AppDialog extends AlertDialog implements DialogInterface.OnClickListener {
+    private final PackageInfo mPkgInfo;
+    private final Listener mListener;
+    private final boolean mConnected;
+
+    AppDialog(Context context, Listener listener, PackageInfo pkgInfo, boolean connected) {
+        super(context);
+
+        mListener = listener;
+        mPkgInfo = pkgInfo;
+        mConnected = connected;
+    }
+
+    public final PackageInfo getPackageInfo() {
+        return mPkgInfo;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        CharSequence vpnName;
+        try {
+            vpnName = VpnConfig.getVpnLabel(getContext(), mPkgInfo.packageName);
+        } catch (PackageManager.NameNotFoundException ex) {
+            vpnName = mPkgInfo.packageName;
+        }
+
+        setTitle(vpnName);
+        setMessage(getContext().getString(R.string.vpn_version, mPkgInfo.versionName));
+
+        createButtons();
+        super.onCreate(savedState);
+    }
+
+    protected void createButtons() {
+        Context context = getContext();
+
+        if (mConnected) {
+            // Forget the network
+            setButton(DialogInterface.BUTTON_NEGATIVE,
+                    context.getString(R.string.vpn_forget), this);
+        }
+
+        // Dismiss
+        setButton(DialogInterface.BUTTON_POSITIVE,
+                context.getString(R.string.vpn_done), this);
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == DialogInterface.BUTTON_NEGATIVE) {
+            mListener.onForget(dialog);
+        }
+        dismiss();
+    }
+
+    public interface Listener {
+        public void onForget(DialogInterface dialog);
+    }
+}