From 2d02b70c07e45312ccf2bb5af249032f946ded40 Mon Sep 17 00:00:00 2001
From: PaoloMessina <phemt.latd@gmail.com>
Date: Fri, 16 Jan 2015 15:44:36 +0100
Subject: [PATCH] Android fix

Fix android release
---
 android/ZBarScannerActivity.java     |  7 ------
 android/res/layout/cszbarscanner.xml | 35 +++-------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/android/ZBarScannerActivity.java b/android/ZBarScannerActivity.java
index b04fa97..6b3bb93 100644
--- a/android/ZBarScannerActivity.java
+++ b/android/ZBarScannerActivity.java
@@ -94,11 +94,6 @@ implements SurfaceHolder.Callback {
         // Set content view
         setContentView(getResourceId("layout/cszbarscanner"));
 
-        // Update view with customisable strings
-        TextView view_textTitle = (TextView) findViewById(getResourceId("id/csZbarScannerTitle"));
-        TextView view_textInstructions = (TextView) findViewById(getResourceId("id/csZbarScannerInstructions"));
-        view_textTitle.setText(textTitle);
-        view_textInstructions.setText(textInstructions);
 
         // Create preview SurfaceView
         scannerSurface = new SurfaceView (this) {
@@ -118,8 +113,6 @@ implements SurfaceHolder.Callback {
 
         // Add preview SurfaceView to the screen
         ((FrameLayout) findViewById(getResourceId("id/csZbarScannerView"))).addView(scannerSurface);
-        findViewById(getResourceId("id/csZbarScannerTitle")).bringToFront();
-        findViewById(getResourceId("id/csZbarScannerInstructions")).bringToFront();
     }
 
     @Override
diff --git a/android/res/layout/cszbarscanner.xml b/android/res/layout/cszbarscanner.xml
index 168e92d..7292e7a 100644
--- a/android/res/layout/cszbarscanner.xml
+++ b/android/res/layout/cszbarscanner.xml
@@ -3,42 +3,13 @@
     android:id="@+id/csZbarScannerViewContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
-    
+
     <FrameLayout
 	    android:id="@+id/csZbarScannerView"
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
 	    android:background="@color/csZbarScannerBackground" >
-	
-	    <TextView android:id="@+id/csZbarScannerTitle"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_gravity="top|center_horizontal"
-	        android:paddingTop="15dp"
-	        android:paddingBottom="5dp"
-	        android:paddingLeft="5dp"
-	        android:paddingRight="5dp"
-	        android:gravity="center"
-	        android:text="@string/csZbarScannerTitle"
-	        android:textColor="@color/csZbarScannerTextColor"
-	        android:background="@color/csZbarScannerTextBackground"
-	        android:fontFamily="sans-serif-light"
-	        android:textSize="20pt" />
-	
-	    <TextView android:id="@+id/csZbarScannerInstructions"
-	        android:layout_gravity="bottom|center_horizontal"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:paddingTop="5dp"
-	        android:paddingBottom="15dp"
-	        android:paddingLeft="5dp"
-	        android:paddingRight="5dp"
-	        android:gravity="center"
-	        android:textSize="12pt"
-	        android:textColor="@color/csZbarScannerTextColor"
-	        android:background="@color/csZbarScannerTextBackground"
-	        android:fontFamily="sans-serif-light"
-	        android:text="@string/csZbarScannerInstructions" />
+
 	</FrameLayout>
-    
+
 </RelativeLayout>