From 322284ef9b3b6af758ddab115685a7d688769c50 Mon Sep 17 00:00:00 2001
From: Sathyanarayanan Gunasekaran <gsathya.ceg@gmail.com>
Date: Tue, 14 Jun 2011 22:38:14 +0530
Subject: [PATCH] Added warning icon to Warning screen

---
 res/drawable/warning.png                  | Bin 0 -> 2922 bytes
 res/layout/scrollingtext_buttons_view.xml |   8 +++++---
 src/org/torproject/android/LotsaText.java |   6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 res/drawable/warning.png

diff --git a/res/drawable/warning.png b/res/drawable/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..42dc6d665cd1cff03f98c1b7b64d7969acf1e3de
GIT binary patch
literal 2922
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
U>o=ueBme*a07*qoM6N<$g1{njng9R*

literal 0
HcmV?d00001

diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml
index 930bf729..ebecfad7 100644
--- a/res/layout/scrollingtext_buttons_view.xml
+++ b/res/layout/scrollingtext_buttons_view.xml
@@ -14,12 +14,12 @@
 	android:background="#000000"
 	>
         <ImageView 
-        	android:src="@drawable/tor" 
+        	android:src="@drawable/warning" 
         	android:id="@+id/orbot_image" 
         	android:layout_width="wrap_content" 
         	android:layout_height="wrap_content" 
         	android:layout_alignParentLeft="true"
-        	android:paddingLeft="20px" android:paddingRight="20px" >
+        	android:paddingLeft="20px" android:layout_marginLeft="10dip" android:layout_marginTop="8dip">
         </ImageView>
         <TextView 
         	android:textColor="#FFFFFF"
@@ -37,7 +37,9 @@
         	
         	
         	android:layout_centerInParent="true" 
-        	android:padding="20px"> 
+        	android:paddingLeft="5px"
+        	android:padding="20px"
+        	> 
         </TextView>
     </RelativeLayout>    
 <TableLayout  android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" >
diff --git a/src/org/torproject/android/LotsaText.java b/src/org/torproject/android/LotsaText.java
index 43e6d16c..9f845db2 100644
--- a/src/org/torproject/android/LotsaText.java
+++ b/src/org/torproject/android/LotsaText.java
@@ -73,8 +73,8 @@ public class LotsaText extends Activity implements TorConstants{
         ImageView img = (ImageView) findViewById(R.id.orbot_image);
         
     	btn1.setVisibility(Button.INVISIBLE);
-    	img.setVisibility(ImageView.VISIBLE);
-    	
+    	img.setImageResource(R.drawable.tor);
+
     	btn2.setOnClickListener(new View.OnClickListener() {
 			
 			@Override
@@ -108,7 +108,7 @@ public class LotsaText extends Activity implements TorConstants{
         ImageView img = (ImageView) findViewById(R.id.orbot_image);
         
     	btn1.setVisibility(Button.VISIBLE);
-    	img.setVisibility(ImageView.INVISIBLE);
+    	img.setImageResource(R.drawable.warning);
     	
     	btn1.setOnClickListener(new View.OnClickListener() {