From 0850d50f93a67f557c677cac4daf5bcc151c0378 Mon Sep 17 00:00:00 2001
From: Ralf Kistner <ralf.kistner@gmail.com>
Date: Fri, 14 Dec 2012 11:07:01 +0200
Subject: Namespace some resources to prevent conflicts.

Also removed some unused resources.
---
 src/com/google/zxing/client/android/HelpActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/google/zxing/client/android/HelpActivity.java')

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());
-- 
cgit v1.2.3