summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/HelpActivity.java
diff options
context:
space:
mode:
authorRalf Kistner <ralf.kistner@gmail.com>2012-12-14 13:07:01 +0400
committerRalf Kistner <ralf.kistner@gmail.com>2012-12-14 13:07:01 +0400
commit0850d50f93a67f557c677cac4daf5bcc151c0378 (patch)
tree5eaabb37c189e2526235f01c341122b1a441501a /src/com/google/zxing/client/android/HelpActivity.java
parentaf8547025e9dfc9ec41db3d0f0bc09f02eb3bbd3 (diff)
downloadzxing-android-embedded-0850d50f93a67f557c677cac4daf5bcc151c0378.tar.xz
Namespace some resources to prevent conflicts.
Also removed some unused resources.
Diffstat (limited to 'src/com/google/zxing/client/android/HelpActivity.java')
-rw-r--r--src/com/google/zxing/client/android/HelpActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/google/zxing/client/android/HelpActivity.java b/src/com/google/zxing/client/android/HelpActivity.java
index cb145cc9..b23f6b1f 100644
--- a/src/com/google/zxing/client/android/HelpActivity.java
+++ b/src/com/google/zxing/client/android/HelpActivity.java
@@ -63,7 +63,7 @@ public final class HelpActivity extends Activity {
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
- setContentView(R.layout.help);
+ setContentView(R.layout.zxing_help);
webView = (WebView)findViewById(R.id.help_contents);
webView.setWebViewClient(new HelpClient());