aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-11-08 00:50:11 -0600
committerSamuel Holland <samuel@sholland.org>2017-11-08 00:50:24 -0600
commita794ec3735764fbb77e61d63d8e4bcec467af4c0 (patch)
tree17733ea74c298aa4f21561194c78a2920d3733c2 /app/src/main/res
parentVpnService: Add helper for importing configs (diff)
downloadwireguard-android-a794ec3735764fbb77e61d63d8e4bcec467af4c0.tar.xz
wireguard-android-a794ec3735764fbb77e61d63d8e4bcec467af4c0.zip
ConfigActivity: Add import menu item
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/ic_open.xml9
-rw-r--r--app/src/main/res/menu/config_list.xml6
-rw-r--r--app/src/main/res/values/strings.xml1
3 files changed, 16 insertions, 0 deletions
diff --git a/app/src/main/res/drawable/ic_open.xml b/app/src/main/res/drawable/ic_open.xml
new file mode 100644
index 00000000..f76831cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"
+ android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/menu/config_list.xml b/app/src/main/res/menu/config_list.xml
index ef1651f6..9a0a481c 100644
--- a/app/src/main/res/menu/config_list.xml
+++ b/app/src/main/res/menu/config_list.xml
@@ -6,4 +6,10 @@
android:icon="@drawable/ic_action_add"
android:showAsAction="always"
android:title="@string/add" />
+ <item
+ android:id="@+id/menu_action_import"
+ android:alphabeticShortcut="o"
+ android:icon="@drawable/ic_open"
+ android:showAsAction="ifRoom"
+ android:title="@string/import_config" />
</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc2ec7a9..61602b12 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,4 +42,5 @@
<string name="settings">Settings</string>
<string name="status">Status</string>
<string name="toggle">Toggle</string>
+ <string name="import_config">Import</string>
</resources>