Remove unnecessary wrapper layouts

app/src/main/res/layout/notification.xml

@@ -14,20 +14,13 @@
   ~ limitations under the License
   -->
 
-<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="64dp">
-
-    <LinearLayout
     android:id="@+id/root"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="64dp"
-        android:background="#00000000"
     android:baselineAligned="false"
-        android:orientation="horizontal"
+    android:orientation="horizontal">
-        tools:ignore="UselessParent">
 
     <FrameLayout
         android:id="@+id/icon_group"
@@ -139,5 +132,3 @@
     </LinearLayout>
 
 </LinearLayout>
-
-</FrameLayout>

app/src/main/res/layout/notification_big.xml

@@ -16,18 +16,11 @@
 
 <!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
 
-<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="128dp">
-
-    <RelativeLayout
     android:id="@+id/root"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="128dp">
-        android:background="#00000000"
-        tools:ignore="UselessParent">
 
     <ImageView
         android:id="@+id/image"
@@ -36,6 +29,18 @@
         android:scaleType="centerCrop"
         tools:ignore="ContentDescription" />
 
+    <ImageButton
+        android:id="@+id/action_quit"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="2dp"
+        android:background="@drawable/notification_selector"
+        android:padding="6dp"
+        android:scaleType="fitCenter"
+        tools:ignore="ContentDescription" />
+
     <LinearLayout
         android:id="@+id/media_titles"
         android:layout_width="match_parent"
@@ -45,7 +50,9 @@
         android:layout_marginStart="12dp"
         android:layout_marginTop="8dp"
         android:layout_toEndOf="@id/image"
+        android:layout_toLeftOf="@id/action_quit"
         android:layout_toRightOf="@id/image"
+        android:layout_toStartOf="@id/action_quit"
         android:minHeight="@dimen/notification_large_icon_height"
         android:orientation="vertical">
 
@@ -143,5 +150,3 @@
     </LinearLayout>
 
 </RelativeLayout>
-
-</FrameLayout>