From 9fd7ac1ec7c0c3984f225a237bd6e3dbafc7f831 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sat, 25 Aug 2012 00:06:08 -0700
Subject: Always-on VPN.

Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS.  Moved "add" operation into action bar.

Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
---
 res/menu/vpn.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 res/menu/vpn.xml

(limited to 'res/menu')

diff --git a/res/menu/vpn.xml b/res/menu/vpn.xml
new file mode 100644
index 0000000..dd8f64c
--- /dev/null
+++ b/res/menu/vpn.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/vpn_create"
+        android:title="@string/vpn_create"
+        android:icon="@drawable/ic_menu_add"
+        android:showAsAction="always" />
+    <item
+        android:id="@+id/vpn_lockdown"
+        android:title="@string/vpn_menu_lockdown"
+        android:showAsAction="never" />
+</menu>
-- 
cgit v1.1