aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-06-09 19:28:03 -0700
committerKenny Root <kenny@the-b.org>2015-06-09 19:28:03 -0700
commitd6b1f6f91291d233561fbb025e01ebe7bde83e6b (patch)
tree9a439a4626a5d75612d7f2e7cccf9d772995f324
parentc65cf580933f2c3be2d7b114f1ddb083968ed76b (diff)
parent74508ed00b32ec56c6d83d70a831cabd31141670 (diff)
downloadconnectbot-d6b1f6f91291d233561fbb025e01ebe7bde83e6b.tar.gz
connectbot-d6b1f6f91291d233561fbb025e01ebe7bde83e6b.tar.bz2
connectbot-d6b1f6f91291d233561fbb025e01ebe7bde83e6b.zip
Merge branch 'master' into gradle-conversion
-rw-r--r--app/src/main/res/layout/wiz_eula.xml11
1 files changed, 1 insertions, 10 deletions
diff --git a/app/src/main/res/layout/wiz_eula.xml b/app/src/main/res/layout/wiz_eula.xml
index 06b7c56..af06555 100644
--- a/app/src/main/res/layout/wiz_eula.xml
+++ b/app/src/main/res/layout/wiz_eula.xml
@@ -51,20 +51,11 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
+ android:autoLink="web"
android:text="@string/copyright_info"
android:textAppearance="?android:attr/textAppearanceSmall"
/>
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingTop="10dip"
- android:autoLink="web"
- android:text="You can view the full text at http://www.gnu.org/licenses/gpl-3.0.txt"
- android:textSize="14sp"
- android:textColor="#bebebe"
- />
-
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"