Merge branch 'development' of https://github.com/siacs/Conversations into development

iNPUTmice created 11 years ago

Change summary

art/render.rb                                    | 2 +-
src/main/res/layout/activity_contact_details.xml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)

Detailed changes

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

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>
+</ScrollView>