From 6dbad1bd5a773731e91e5b1b1026525cfecc9eeb Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Mon, 19 Sep 2016 21:55:33 +0300
Subject: [PATCH] SDL: fixed service notification text color

---
 .../ballfield/AndroidAppSettings.cfg          |  2 +-
 project/jni/application/ninslash/src          |  2 +-
 project/res/drawable-hdpi/rectangle.png       |  1 -
 project/res/drawable-ldpi/rectangle.png       |  1 -
 project/res/drawable-mdpi/rectangle.png       |  1 -
 project/res/drawable-xhdpi/rectangle.png      |  1 -
 project/res/drawable-xxhdpi/rectangle.png     |  1 -
 project/res/drawable-xxxhdpi/rectangle.png    |  1 -
 project/res/layout-hdpi/main.xml              |  1 -
 project/res/layout-ldpi/main.xml              |  1 -
 project/res/layout-mdpi/main.xml              |  1 -
 project/res/layout-v21/notification.xml       | 49 +++++++++++++++++++
 project/res/layout-xhdpi/main.xml             |  1 -
 project/res/layout-xxhdpi/main.xml            |  1 -
 project/res/layout-xxxhdpi/main.xml           |  1 -
 project/res/layout/notification.xml           |  6 +--
 16 files changed, 52 insertions(+), 19 deletions(-)
 delete mode 120000 project/res/drawable-hdpi/rectangle.png
 delete mode 120000 project/res/drawable-ldpi/rectangle.png
 delete mode 120000 project/res/drawable-mdpi/rectangle.png
 delete mode 120000 project/res/drawable-xhdpi/rectangle.png
 delete mode 120000 project/res/drawable-xxhdpi/rectangle.png
 delete mode 120000 project/res/drawable-xxxhdpi/rectangle.png
 delete mode 120000 project/res/layout-hdpi/main.xml
 delete mode 120000 project/res/layout-ldpi/main.xml
 delete mode 120000 project/res/layout-mdpi/main.xml
 create mode 100644 project/res/layout-v21/notification.xml
 delete mode 120000 project/res/layout-xhdpi/main.xml
 delete mode 120000 project/res/layout-xxhdpi/main.xml
 delete mode 120000 project/res/layout-xxxhdpi/main.xml

diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index 8c6b5b4e9..7a410ef16 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -67,7 +67,7 @@ SdlVideoResizeKeepAspect=n
 InhibitSuspend=n
 
 # Create Android service, so the app is less likely to be killed while in background
-CreateService=
+CreateService=y
 
 # Application does not call SDL_Flip() or SDL_UpdateRects() appropriately, or draws from non-main thread -
 # enabling the compatibility mode will force screen update every 100 milliseconds, which is laggy and inefficient (y) or (n)
diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src
index ecead9bf0..85e330705 160000
--- a/project/jni/application/ninslash/src
+++ b/project/jni/application/ninslash/src
@@ -1 +1 @@
-Subproject commit ecead9bf0e13361819db62d33dd52ae7d0b33351
+Subproject commit 85e3307059da499ae8dfc41c5741864b33df891a
diff --git a/project/res/drawable-hdpi/rectangle.png b/project/res/drawable-hdpi/rectangle.png
deleted file mode 120000
index 994793d01..000000000
--- a/project/res/drawable-hdpi/rectangle.png
+++ /dev/null
@@ -1 +0,0 @@
-../drawable/rectangle.png
\ No newline at end of file
diff --git a/project/res/drawable-ldpi/rectangle.png b/project/res/drawable-ldpi/rectangle.png
deleted file mode 120000
index 994793d01..000000000
--- a/project/res/drawable-ldpi/rectangle.png
+++ /dev/null
@@ -1 +0,0 @@
-../drawable/rectangle.png
\ No newline at end of file
diff --git a/project/res/drawable-mdpi/rectangle.png b/project/res/drawable-mdpi/rectangle.png
deleted file mode 120000
index 994793d01..000000000
--- a/project/res/drawable-mdpi/rectangle.png
+++ /dev/null
@@ -1 +0,0 @@
-../drawable/rectangle.png
\ No newline at end of file
diff --git a/project/res/drawable-xhdpi/rectangle.png b/project/res/drawable-xhdpi/rectangle.png
deleted file mode 120000
index 994793d01..000000000
--- a/project/res/drawable-xhdpi/rectangle.png
+++ /dev/null
@@ -1 +0,0 @@
-../drawable/rectangle.png
\ No newline at end of file
diff --git a/project/res/drawable-xxhdpi/rectangle.png b/project/res/drawable-xxhdpi/rectangle.png
deleted file mode 120000
index 994793d01..000000000
--- a/project/res/drawable-xxhdpi/rectangle.png
+++ /dev/null
@@ -1 +0,0 @@
-../drawable/rectangle.png
\ No newline at end of file
diff --git a/project/res/drawable-xxxhdpi/rectangle.png b/project/res/drawable-xxxhdpi/rectangle.png
deleted file mode 120000
index 994793d01..000000000
--- a/project/res/drawable-xxxhdpi/rectangle.png
+++ /dev/null
@@ -1 +0,0 @@
-../drawable/rectangle.png
\ No newline at end of file
diff --git a/project/res/layout-hdpi/main.xml b/project/res/layout-hdpi/main.xml
deleted file mode 120000
index 568104135..000000000
--- a/project/res/layout-hdpi/main.xml
+++ /dev/null
@@ -1 +0,0 @@
-../layout/main.xml
\ No newline at end of file
diff --git a/project/res/layout-ldpi/main.xml b/project/res/layout-ldpi/main.xml
deleted file mode 120000
index 568104135..000000000
--- a/project/res/layout-ldpi/main.xml
+++ /dev/null
@@ -1 +0,0 @@
-../layout/main.xml
\ No newline at end of file
diff --git a/project/res/layout-mdpi/main.xml b/project/res/layout-mdpi/main.xml
deleted file mode 120000
index 568104135..000000000
--- a/project/res/layout-mdpi/main.xml
+++ /dev/null
@@ -1 +0,0 @@
-../layout/main.xml
\ No newline at end of file
diff --git a/project/res/layout-v21/notification.xml b/project/res/layout-v21/notification.xml
new file mode 100644
index 000000000..431b9d9dd
--- /dev/null
+++ b/project/res/layout-v21/notification.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:paddingLeft="10dp"
+	android:paddingRight="10dp"
+	android:paddingTop="10dp"
+	android:paddingBottom="10dp"
+	android:id="@+id/notificationView"
+	android:clickable="true"
+	>
+
+	<ImageView
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:id="@+id/notificationIcon"
+		android:gravity="center_vertical"
+		android:src="@drawable/icon"
+		android:layout_alignParentLeft="true"
+		android:clickable="true"
+		android:scaleType="centerInside"
+		android:adjustViewBounds="true"
+	/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:layout_toRightOf="@id/notificationIcon"
+		android:id="@+id/notificationText"
+		android:text="App is running"
+		android:textAppearance="@android:style/TextAppearance.Material.Notification.Title"
+		android:gravity="center_vertical"
+		android:clickable="true"
+		android:paddingLeft="10dp"
+	/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:id="@+id/notificationStop"
+		android:text="@string/notification_stop"
+		android:gravity="center_vertical"
+		android:singleLine="true"
+		android:layout_alignParentRight="true"
+		android:textAlignment="center"
+	/>
+
+</RelativeLayout>
diff --git a/project/res/layout-xhdpi/main.xml b/project/res/layout-xhdpi/main.xml
deleted file mode 120000
index 568104135..000000000
--- a/project/res/layout-xhdpi/main.xml
+++ /dev/null
@@ -1 +0,0 @@
-../layout/main.xml
\ No newline at end of file
diff --git a/project/res/layout-xxhdpi/main.xml b/project/res/layout-xxhdpi/main.xml
deleted file mode 120000
index 568104135..000000000
--- a/project/res/layout-xxhdpi/main.xml
+++ /dev/null
@@ -1 +0,0 @@
-../layout/main.xml
\ No newline at end of file
diff --git a/project/res/layout-xxxhdpi/main.xml b/project/res/layout-xxxhdpi/main.xml
deleted file mode 120000
index 568104135..000000000
--- a/project/res/layout-xxxhdpi/main.xml
+++ /dev/null
@@ -1 +0,0 @@
-../layout/main.xml
\ No newline at end of file
diff --git a/project/res/layout/notification.xml b/project/res/layout/notification.xml
index 379f46884..c35ba1e5a 100644
--- a/project/res/layout/notification.xml
+++ b/project/res/layout/notification.xml
@@ -19,7 +19,7 @@
 		android:src="@drawable/icon"
 		android:layout_alignParentLeft="true"
 		android:clickable="true"
-		android:scaleType="centerCrop"
+		android:scaleType="centerInside"
 		android:adjustViewBounds="true"
 	/>
 
@@ -35,10 +35,6 @@
 		android:paddingLeft="10dp"
 	/>
 
-<!--
-		android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
--->
-
 	<Button
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"