diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-03 20:28:58 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-03 20:28:58 +0100 |
| commit | c48407f3b4c5b2984fcdc33d9fce7a55ea0e94b9 (patch) | |
| tree | 67796bf64e4bf2236fb3422d78d5513214a0f234 | |
| parent | ec9c264cf757f0dd78991f72ebf54164bad12995 (diff) | |
| parent | e496a5409bac5a5090ceda51fe8c09493b010f15 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
| -rwxr-xr-x | art/render.rb | 2 | ||||
| -rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 3 |
2 files changed, 2 insertions, 3 deletions
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 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> |