diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2012-03-20 17:17:40 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2012-03-28 13:46:51 +0200 |
| commit | 68d088baf6a8950f005f17a5e65a22e679989c56 (patch) | |
| tree | 4642345097ad31101f8e378db1960edc6cf28cbb /android | |
| parent | 335ee09b2553f8870d05e0370af6845810fdcfdc (diff) | |
| download | mupdf-68d088baf6a8950f005f17a5e65a22e679989c56.tar.xz | |
Disable link support in android app for 1.0 release.
The link support still has several outstanding issues that need to be
solved.
Diffstat (limited to 'android')
| -rw-r--r-- | android/res/layout/buttons.xml | 6 | ||||
| -rw-r--r-- | android/src/com/artifex/mupdf/MuPDFActivity.java | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml index 94e2593e..641a6cef 100644 --- a/android/res/layout/buttons.xml +++ b/android/res/layout/buttons.xml @@ -37,7 +37,7 @@ android:layout_toLeftOf="@+id/searchButton" android:contentDescription="@string/search_document" android:src="@drawable/ic_list" /> - +<!-- <ImageButton android:id="@+id/linkButton" android:layout_width="wrap_content" @@ -46,14 +46,14 @@ android:layout_toLeftOf="@+id/outlineButton" android:contentDescription="@string/link_control" android:src="@drawable/ic_link" /> - +--> <TextView android:id="@+id/docNameText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/linkButton" + android:layout_toLeftOf="@+id/searchButton" android:paddingLeft="15dp" android:singleLine="true" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/android/src/com/artifex/mupdf/MuPDFActivity.java b/android/src/com/artifex/mupdf/MuPDFActivity.java index a30e4dac..e8dfc3cb 100644 --- a/android/src/com/artifex/mupdf/MuPDFActivity.java +++ b/android/src/com/artifex/mupdf/MuPDFActivity.java @@ -77,7 +77,7 @@ public class MuPDFActivity extends Activity private ImageButton mCancelButton; private ImageButton mOutlineButton; private ViewSwitcher mTopBarSwitcher; - private ImageButton mLinkButton; +// XXX private ImageButton mLinkButton; private boolean mTopBarIsSearch; private ImageButton mSearchBack; private ImageButton mSearchFwd; @@ -206,7 +206,7 @@ public class MuPDFActivity extends Activity if (mLinkState != LinkState.INHIBIT) { MuPDFPageView pageView = (MuPDFPageView) mDocView.getDisplayedView(); if (pageView != null) { - linkPage = pageView.hitLinkPage(e.getX(), e.getY()); +// XXX linkPage = pageView.hitLinkPage(e.getX(), e.getY()); } } @@ -359,6 +359,7 @@ public class MuPDFActivity extends Activity } }); +/* XXX mLinkButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { switch(mLinkState) { @@ -381,6 +382,7 @@ public class MuPDFActivity extends Activity } } }); +*/ if (core.hasOutline()) { mOutlineButton.setOnClickListener(new View.OnClickListener() { @@ -580,7 +582,7 @@ public class MuPDFActivity extends Activity mSearchBack = (ImageButton)mButtonsView.findViewById(R.id.searchBack); mSearchFwd = (ImageButton)mButtonsView.findViewById(R.id.searchForward); mSearchText = (EditText)mButtonsView.findViewById(R.id.searchText); - mLinkButton = (ImageButton)mButtonsView.findViewById(R.id.linkButton); +// XXX mLinkButton = (ImageButton)mButtonsView.findViewById(R.id.linkButton); mTopBarSwitcher.setVisibility(View.INVISIBLE); mPageNumberView.setVisibility(View.INVISIBLE); mPageSlider.setVisibility(View.INVISIBLE); |