narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Shorten license text and fix height of scrollview

Browse source
This commit is contained in:
Sam Whited 2014-11-04 13:26:48 -05:00
parent 7b67f1a19c
commit df786cbf01
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/res/layout/activity_about.xml
View file

@ -6,8 +6,8 @@
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="fill_parent">
<TextView <TextView
android:text="@string/pref_about_message" android:text="@string/pref_about_message"

23
src/main/res/values/strings.xml
View file

@ -270,26 +270,13 @@
\n \n
Minidns © 2014 Rene Treffer and is provided under the WTFPL\n Minidns © 2014 Rene Treffer and is provided under the WTFPL\n
\n \n
MemorizingTrustManager Copyright © 2010 Georg Lukas\n http://wtfpl.org\n
\n \n
Permission is hereby granted, free of charge, to any person obtaining a MemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT
copy of this software and associated documentation files (the License\n
"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
\n \n
The above copyright notice and this permission notice shall be included http://opensource.org/licenses/MIT\n
in all copies or substantial portions of the Software.\n </string>
\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>
<string name="pref_use_larger_font">Increase font size</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_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> <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>