summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-01-17 04:12:36 -0800
committerfupduck <fupduck@riseup.net>2018-01-17 04:12:36 -0800
commit7b65ec0829d65f1e563a591c81ef2e5d6c5a2098 (patch)
tree537acc8138381200a268900d1a091d34d122b3aa /app/src/main/res
parentfb69ccd7088287ec886471e9acfc62a03bdad708 (diff)
parentb1499d1efb027464d5364bc8758b3529a60efdc0 (diff)
Merge branch '8788_two_notifications_on_android_kitkat' into '0.9.8'
8788 two notifications on android kitkat See merge request leap/bitmask_android!25
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.pngbin1427 -> 644 bytes
-rw-r--r--app/src/main/res/layout/custom_notification_layout.xml48
2 files changed, 48 insertions, 0 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png
index 22ea5603..2745087b 100644
--- a/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png
+++ b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png
Binary files differ
diff --git a/app/src/main/res/layout/custom_notification_layout.xml b/app/src/main/res/layout/custom_notification_layout.xml
new file mode 100644
index 00000000..e97fcbe2
--- /dev/null
+++ b/app/src/main/res/layout/custom_notification_layout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="@android:style/TextAppearance.StatusBar.EventContent"
+ >
+
+ <ImageView
+ android:id="@+id/image_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="20dp"
+ android:scaleType="center"
+ android:contentDescription="@string/app_name"
+ tools:src="@drawable/ic_stat_vpn"
+ tools:visibility="visible"
+ />
+
+
+ <LinearLayout
+ android:id="@+id/content_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="false"
+ android:layout_toRightOf="@+id/image_icon"
+ android:gravity="center_vertical"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ tools:text="Bitmask - Amsterdam"
+ />
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="2"
+ android:ellipsize="end"
+ tools:text="Connecting to Provider... with a long message that doesn't fit into the two lines of the notification."
+ />
+ </LinearLayout>
+</RelativeLayout> \ No newline at end of file