diff --git a/android/res/layout/help.xml b/android/res/layout/help.xml
index 91b67821b..e1e69e2a0 100644
--- a/android/res/layout/help.xml
+++ b/android/res/layout/help.xml
@@ -39,10 +39,10 @@
android:layout_height="wrap_content"
android:text="@string/button_back"/>
-
+ android:text="@string/button_done"/>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 0a9f91044..c5f119a4c 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -25,8 +25,8 @@
CancelClipboard emptyDial number
+ DoneSend email
- ExitGet directionsSend MMSOK
@@ -65,6 +65,7 @@
Could not encode a barcode from the data provided.
Generating a barcode\u2026
+ Sorry, this book is not searchable.Sorry, the search encountered a problem.No page returnedPage
diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java
index be109866a..175066f0d 100644
--- a/android/src/com/google/zxing/client/android/HelpActivity.java
+++ b/android/src/com/google/zxing/client/android/HelpActivity.java
@@ -50,8 +50,8 @@ public final class HelpActivity extends Activity {
mBackButton = (Button)findViewById(R.id.back_button);
mBackButton.setOnClickListener(mBackListener);
- Button exitButton = (Button)findViewById(R.id.exit_button);
- exitButton.setOnClickListener(mExitListener);
+ Button doneButton = (Button)findViewById(R.id.done_button);
+ doneButton.setOnClickListener(mDoneListener);
}
@Override
@@ -81,7 +81,7 @@ public final class HelpActivity extends Activity {
}
};
- private final Button.OnClickListener mExitListener = new Button.OnClickListener() {
+ private final Button.OnClickListener mDoneListener = new Button.OnClickListener() {
public void onClick(View view) {
finish();
}
diff --git a/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java b/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
index a895433c4..44e1bdde5 100644
--- a/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
+++ b/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
@@ -179,6 +179,10 @@ public final class SearchBookContentsActivity extends Activity {
}
mResultListView.setAdapter(new SearchBookContentsAdapter(this, items));
} else {
+ String searchable = json.optString("searchable");
+ if (searchable != null && searchable.equals("false")) {
+ mHeaderView.setText(R.string.msg_sbc_book_not_searchable);
+ }
mResultListView.setAdapter(null);
}
} catch (JSONException e) {
@@ -237,9 +241,10 @@ public final class SearchBookContentsActivity extends Activity {
AndroidHttpClient client = null;
try {
// These return a JSON result which describes if and where the query was found. This API may
- // break or disappear at any time in the future. Since this is an API call rather than a website,
- // we don't use LocaleManager to change the TLD.
- URI uri = new URI("http", null, "www.google.com", -1, "/books", "vid=isbn" + mISBN + "&jscmd=SearchWithinVolume2&q=" + mQuery, null);
+ // break or disappear at any time in the future. Since this is an API call rather than a
+ // website, we don't use LocaleManager to change the TLD.
+ URI uri = new URI("http", null, "www.google.com", -1, "/books", "vid=isbn" + mISBN +
+ "&jscmd=SearchWithinVolume2&q=" + mQuery, null);
HttpUriRequest get = new HttpGet(uri);
get.setHeader("cookie", getCookie(uri.toString()));
client = AndroidHttpClient.newInstance(mUserAgent);