aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-04 13:26:48 -0500
committerSam Whited <sam@samwhited.com>2014-11-04 13:26:48 -0500
commitdf786cbf0114d49974f46433740e5ac89a00d63a (patch)
treeaf4e2af1606c1d87c97382f0281ca7c3777e62e0 /src
parent7b67f1a19cd99403b1215c577b5ed5e378df32fe (diff)
Shorten license text and fix height of scrollview
Diffstat (limited to 'src')
-rw-r--r--src/main/res/layout/activity_about.xml4
-rw-r--r--src/main/res/values/strings.xml23
2 files changed, 7 insertions, 20 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index fb9959f7..06a4992a 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -6,8 +6,8 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
<TextView
android:text="@string/pref_about_message"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0f5a5899..547659b4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -270,26 +270,13 @@
\n
Minidns © 2014 Rene Treffer and is provided under the WTFPL\n
\n
- MemorizingTrustManager Copyright © 2010 Georg Lukas\n
+ http://wtfpl.org\n
\n
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to permit
- persons to whom the Software is furnished to do so, subject to the
- following conditions:\n
+ MemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT
+ License\n
\n
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.\n
- \n
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
- NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- USE OR OTHER DEALINGS IN THE SOFTWARE.</string>
+ http://opensource.org/licenses/MIT\n
+ </string>
<string name="pref_use_larger_font">Increase font size</string>
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>