From df64627b8a6f913f24df30eae1e1cde7282182bc Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 29 Mar 2016 16:57:50 -0500
Subject: [PATCH] Remove speech bubble layout file

---
 .../layout/astrid_calendar_reminder_view.xml  | 40 +++++++++++++++-
 src/main/res/layout/astrid_speech_bubble.xml  | 47 -------------------
 2 files changed, 39 insertions(+), 48 deletions(-)
 delete mode 100644 src/main/res/layout/astrid_speech_bubble.xml

diff --git a/src/main/res/layout/astrid_calendar_reminder_view.xml b/src/main/res/layout/astrid_calendar_reminder_view.xml
index 68812085d..5556d5aad 100644
--- a/src/main/res/layout/astrid_calendar_reminder_view.xml
+++ b/src/main/res/layout/astrid_calendar_reminder_view.xml
@@ -45,7 +45,45 @@
         android:id="@+id/calendar_reminder_speech_bubble"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
-        <include layout="@layout/astrid_speech_bubble" />
+        <LinearLayout
+	    android:id="@+id/speech_bubble_container"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal"
+	    android:layout_marginLeft="2dip"
+	    android:layout_marginRight="5dip"
+	    android:layout_marginBottom="10dip"
+	    android:gravity="bottom">
+	    <ImageView
+	        android:id="@+id/astridIcon"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_marginBottom="5dip"
+	        android:src="@mipmap/ic_launcher"
+	        android:scaleType="fitCenter"
+	        android:layout_alignParentLeft="true"/>
+
+
+	    <LinearLayout
+	        android:id="@+id/speech_bubble_content"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_marginRight="5dip"
+	        android:layout_marginBottom="5dip"
+	        android:minHeight="60dip"
+	        android:layout_alignParentBottom="true"
+	        android:gravity="center_vertical"
+	        android:background="@drawable/speech_bubble_reminder"
+	        android:layout_toRightOf="@id/astridIcon">
+	        <TextView
+	            android:id="@+id/reminder_message"
+	            android:layout_width="fill_parent"
+	            android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:textColor="#000000"
+                android:gravity="center_vertical"/>
+	    </LinearLayout>
+	</LinearLayout>
     </FrameLayout>
     
     <TextView
diff --git a/src/main/res/layout/astrid_speech_bubble.xml b/src/main/res/layout/astrid_speech_bubble.xml
deleted file mode 100644
index d544dd169..000000000
--- a/src/main/res/layout/astrid_speech_bubble.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<LinearLayout
-	    android:id="@+id/speech_bubble_container"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:layout_marginLeft="2dip"
-	    android:layout_marginRight="5dip"
-	    android:layout_marginBottom="10dip"
-	    android:gravity="bottom">
-	    <ImageView 
-	        android:id="@+id/astridIcon"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="5dip"
-	        android:src="@mipmap/ic_launcher"
-	        android:scaleType="fitCenter"
-	        android:layout_alignParentLeft="true"/>
-	    
-	    
-	    <LinearLayout
-	        android:id="@+id/speech_bubble_content"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginRight="5dip"
-	        android:layout_marginBottom="5dip"
-	        android:minHeight="60dip"
-	        android:layout_alignParentBottom="true"
-	        android:gravity="center_vertical"
-	        android:background="@drawable/speech_bubble_reminder"
-	        android:layout_toRightOf="@id/astridIcon">
-	        <TextView 
-	            android:id="@+id/reminder_message"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:textColor="#000000"
-                android:gravity="center_vertical"/>
-	    </LinearLayout>
-	</LinearLayout>
-</merge>