summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java6
-rw-r--r--main/src/main/res/drawable-hdpi/ic_close_white_24dp.pngbin324 -> 221 bytes
-rw-r--r--main/src/main/res/drawable-hdpi/ic_pause_white_24dp.pngbin0 -> 105 bytes
-rw-r--r--main/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.pngbin0 -> 195 bytes
-rw-r--r--main/src/main/res/drawable-mdpi/ic_close_white_24dp.pngbin279 -> 175 bytes
-rw-r--r--main/src/main/res/drawable-mdpi/ic_pause_white_24dp.pngbin0 -> 83 bytes
-rw-r--r--main/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.pngbin0 -> 157 bytes
-rw-r--r--main/src/main/res/drawable-xhdpi/ic_close_white_24dp.pngbin402 -> 257 bytes
-rw-r--r--main/src/main/res/drawable-xhdpi/ic_pause_white_24dp.pngbin0 -> 90 bytes
-rw-r--r--main/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.pngbin0 -> 220 bytes
-rw-r--r--main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.pngbin492 -> 347 bytes
-rw-r--r--main/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.pngbin0 -> 92 bytes
-rw-r--r--main/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.pngbin0 -> 283 bytes
-rw-r--r--main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.pngbin662 -> 436 bytes
-rw-r--r--main/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.pngbin0 -> 94 bytes
-rw-r--r--main/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.pngbin0 -> 343 bytes
-rw-r--r--main/src/main/res/values-v21/refs.xml2
-rw-r--r--main/src/main/res/values/refs.xml2
18 files changed, 7 insertions, 3 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index b9ff8efd..7dc93674 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -251,20 +251,20 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
disconnectVPN.setAction(DISCONNECT_VPN);
PendingIntent disconnectPendingIntent = PendingIntent.getActivity(this, 0, disconnectVPN, 0);
- nbuilder.addAction(android.R.drawable.ic_menu_close_clear_cancel,
+ nbuilder.addAction(R.drawable.ic_menu_close_clear_cancel,
getString(R.string.cancel_connection), disconnectPendingIntent);
Intent pauseVPN = new Intent(this, OpenVPNService.class);
if (mDeviceStateReceiver == null || !mDeviceStateReceiver.isUserPaused()) {
pauseVPN.setAction(PAUSE_VPN);
PendingIntent pauseVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
- nbuilder.addAction(android.R.drawable.ic_media_pause,
+ nbuilder.addAction(R.drawable.ic_menu_pause,
getString(R.string.pauseVPN), pauseVPNPending);
} else {
pauseVPN.setAction(RESUME_VPN);
PendingIntent resumeVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
- nbuilder.addAction(android.R.drawable.ic_media_play,
+ nbuilder.addAction(R.drawable.ic_menu_play,
getString(R.string.resumevpn), resumeVPNPending);
}
diff --git a/main/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/main/src/main/res/drawable-hdpi/ic_close_white_24dp.png
index 0fd15563..ceb1a1ee 100644
--- a/main/src/main/res/drawable-hdpi/ic_close_white_24dp.png
+++ b/main/src/main/res/drawable-hdpi/ic_close_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/main/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
new file mode 100644
index 00000000..4d2ea05c
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/main/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 00000000..57c9fa54
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/main/src/main/res/drawable-mdpi/ic_close_white_24dp.png
index e80681ae..af7f8288 100644
--- a/main/src/main/res/drawable-mdpi/ic_close_white_24dp.png
+++ b/main/src/main/res/drawable-mdpi/ic_close_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/main/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
new file mode 100644
index 00000000..2272d478
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/main/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 00000000..c61e948b
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/main/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
index 76e07f09..b7c7ffd0 100644
--- a/main/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
+++ b/main/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/main/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
new file mode 100644
index 00000000..f49aed75
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/main/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 00000000..a3c80e73
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
index 0eb9d8b0..6b717e0d 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
+++ b/main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/main/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
new file mode 100644
index 00000000..7192ad48
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/main/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 00000000..547ef30a
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
index 7b2a480a..39641921 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
+++ b/main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/main/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png
new file mode 100644
index 00000000..660ac658
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/main/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 00000000..be5c062b
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
Binary files differ
diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/main/res/values-v21/refs.xml
index a5329a5d..10ff5197 100644
--- a/main/src/main/res/values-v21/refs.xml
+++ b/main/src/main/res/values-v21/refs.xml
@@ -6,6 +6,8 @@
<resources>
<drawable name="ic_menu_close_clear_cancel">@drawable/ic_close_white_24dp</drawable>
+ <drawable name="ic_menu_play">@drawable/ic_play_arrow_white_24dp</drawable>
+ <drawable name="ic_menu_pause">@drawable/ic_pause_white_24dp</drawable>
<drawable name="ic_menu_share">@drawable/ic_share_white_24dp </drawable>
<drawable name="ic_menu_save">@drawable/ic_check_white_24dp</drawable>
<drawable name="ic_menu_view">@drawable/ic_filter_list_white_24dp</drawable>
diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml
index 3567bcbe..9d7d3201 100644
--- a/main/src/main/res/values/refs.xml
+++ b/main/src/main/res/values/refs.xml
@@ -6,6 +6,8 @@
<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>