aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2013-12-28 10:18:24 +0100
committerBananeweizen <Bananeweizen@gmx.de>2013-12-28 10:18:24 +0100
commit8a4a97f46ac02d7475a4a9532cb3b80800dcda90 (patch)
tree4d4d22ccf07a70ed5ebe27427e2da8cb0be1b600 /main
parent3fed37273133841a9d110a7acf6b209c0cfc8f20 (diff)
downloadcgeo-8a4a97f46ac02d7475a4a9532cb3b80800dcda90.zip
cgeo-8a4a97f46ac02d7475a4a9532cb3b80800dcda90.tar.gz
cgeo-8a4a97f46ac02d7475a4a9532cb3b80800dcda90.tar.bz2
#3449: debug change
This change needs to be reverted after it has been tested by the affected users, as it disables the fix for #2057.
Diffstat (limited to 'main')
-rw-r--r--main/res/layout/cachedetail_description_page.xml4
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java6
2 files changed, 4 insertions, 6 deletions
diff --git a/main/res/layout/cachedetail_description_page.xml b/main/res/layout/cachedetail_description_page.xml
index dba6789..8325798 100644
--- a/main/res/layout/cachedetail_description_page.xml
+++ b/main/res/layout/cachedetail_description_page.xml
@@ -11,7 +11,7 @@
<!-- Short description -->
- <cgeo.geocaching.ui.IndexOutOfBoundsAvoidingTextView
+ <TextView
android:id="@+id/shortdesc"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
<!-- Long description -->
- <cgeo.geocaching.ui.IndexOutOfBoundsAvoidingTextView
+ <TextView
android:id="@+id/longdesc"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 079562e..54aca71 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -31,7 +31,6 @@ import cgeo.geocaching.ui.EditNoteDialog.EditNoteDialogListener;
import cgeo.geocaching.ui.Formatter;
import cgeo.geocaching.ui.HtmlImageCounter;
import cgeo.geocaching.ui.ImagesList;
-import cgeo.geocaching.ui.IndexOutOfBoundsAvoidingTextView;
import cgeo.geocaching.ui.LoggingUI;
import cgeo.geocaching.ui.OwnerActionsClickListener;
import cgeo.geocaching.ui.WeakReferenceHandler;
@@ -1655,15 +1654,14 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
*/
private class LoadDescriptionTask extends AsyncTask<Object, Void, Void> {
private final View loadingIndicatorView;
- private final IndexOutOfBoundsAvoidingTextView descriptionView;
+ private final TextView descriptionView;
private final String descriptionString;
private Spanned description;
private final View shortDescView;
public LoadDescriptionTask(final String description, final View descriptionView, final View loadingIndicatorView, final View shortDescView) {
- assert descriptionView instanceof IndexOutOfBoundsAvoidingTextView;
this.descriptionString = description;
- this.descriptionView = (IndexOutOfBoundsAvoidingTextView) descriptionView;
+ this.descriptionView = (TextView) descriptionView;
this.loadingIndicatorView = loadingIndicatorView;
this.shortDescView = shortDescView;
}