summaryrefslogtreecommitdiff
path: root/main/src/skeleton
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/skeleton')
-rw-r--r--main/src/skeleton/AndroidManifest.xml3
-rw-r--r--main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java2
-rw-r--r--main/src/skeleton/res/values/attrs.xml5
-rw-r--r--main/src/skeleton/res/values/refs.xml27
-rw-r--r--main/src/skeleton/res/values/styles.xml1
5 files changed, 7 insertions, 31 deletions
diff --git a/main/src/skeleton/AndroidManifest.xml b/main/src/skeleton/AndroidManifest.xml
index 02a91024..23b1c7d9 100644
--- a/main/src/skeleton/AndroidManifest.xml
+++ b/main/src/skeleton/AndroidManifest.xml
@@ -4,8 +4,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<application tools:ignore="AllowBackup,GoogleAppIndexingWarning">
<activity
diff --git a/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java b/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java
index c526a69f..1f5651ab 100644
--- a/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java
+++ b/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java
@@ -15,7 +15,7 @@ import java.security.GeneralSecurityException;
/* Dummy class that supports no encryption */
class ProfileEncryption {
- static void initMasterCryptAlias()
+ static void initMasterCryptAlias(Context context)
{
}
diff --git a/main/src/skeleton/res/values/attrs.xml b/main/src/skeleton/res/values/attrs.xml
new file mode 100644
index 00000000..051e23d0
--- /dev/null
+++ b/main/src/skeleton/res/values/attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+ <!-- allows to share the vector graphics with ui build, a little bit hacky... -->
+ <attr name="colorControlNormal" format="color" />
+</resources> \ No newline at end of file
diff --git a/main/src/skeleton/res/values/refs.xml b/main/src/skeleton/res/values/refs.xml
deleted file mode 100644
index a5105456..00000000
--- a/main/src/skeleton/res/values/refs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (c) 2012-2016 Arne Schwabe
- ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- -->
-
-
-<resources>
- <drawable name="ic_menu_close_clear_cancel">@android:drawable/ic_menu_close_clear_cancel</drawable>
- <drawable name="ic_menu_play">@android:drawable/ic_media_play</drawable>
- <drawable name="ic_menu_pause">@android:drawable/ic_media_pause</drawable>
- <drawable name="ic_menu_share">@android:drawable/ic_menu_share</drawable>
- <drawable name="ic_menu_save">@android:drawable/ic_menu_save</drawable>
- <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
- <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
- <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
- <drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>
- <drawable name="vpn_item_edit">@drawable/vpn_item_settings</drawable>
- <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
- <drawable name="ic_dialog_alert">@android:drawable/ic_dialog_alert</drawable>
- <drawable name="ic_menu_add_grey">@android:drawable/ic_menu_add</drawable>
- <drawable name="ic_menu_import_grey">@drawable/ic_menu_archive</drawable>
- <drawable name="ic_menu_delete_grey">@android:drawable/ic_menu_delete</drawable>
- <drawable name="ic_menu_copy">@drawable/ic_menu_copy_holo_light</drawable>
- <drawable name="ic_receipt">@drawable/ic_menu_log</drawable>
- <drawable name="ic_sort">@android:drawable/ic_menu_sort_by_size</drawable>
-
-</resources> \ No newline at end of file
diff --git a/main/src/skeleton/res/values/styles.xml b/main/src/skeleton/res/values/styles.xml
index dbe2d1e4..9a6ca1e8 100644
--- a/main/src/skeleton/res/values/styles.xml
+++ b/main/src/skeleton/res/values/styles.xml
@@ -14,5 +14,4 @@
<style name="blinkt" parent="blinkt.baseTheme" />
-
</resources> \ No newline at end of file