From c7d59f19855b0241446b4075cbeb51499eb3f4c2 Mon Sep 17 00:00:00 2001
From: "M. Dietrich" <mdt@emdete.de>
Date: Sat, 1 Nov 2014 22:27:11 +0100
Subject: adjust path in render script

---
 art/render.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/art/render.rb b/art/render.rb
index 2847891d..7999996d 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -14,7 +14,7 @@ images = {
 images.each do |source, result|
 	resolutions.each do |name, factor|
 		size = factor * result[1]
-		path = "../res/drawable-#{name}/#{result[0]}.png"
+		path = "../src/main/res/drawable-#{name}/#{result[0]}.png"
 		cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}"
 		puts cmd
 		system cmd
-- 
cgit v1.2.3


From 39ae34d3e68a791fee6695c04eee2d86ae54dea0 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Mon, 3 Nov 2014 08:28:20 -0500
Subject: Wrap "last seen" time.

Fixes #611
---
 src/main/res/layout/activity_contact_details.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f7cb2198..2b94e6f6 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -63,7 +63,6 @@
                         android:id="@+id/details_lastseen"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:singleLine="true"
                         android:textColor="@color/secondarytext"
                         android:textSize="?attr/TextSizeBody" />
                 </LinearLayout>
@@ -111,4 +110,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
-- 
cgit v1.2.3