From 913c53c3f48abae42a663c50566591f9187a5b2a Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 4 Jan 2014 22:11:50 +0530
Subject: [PATCH 01/49] new layout xml for a notificaiton

---
 project.properties                 | 2 +-
 res/layout/layout_notification.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/layout_notification.xml

diff --git a/project.properties b/project.properties
index 3b45b07..0a52332 100644
--- a/project.properties
+++ b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-18
 android.library.reference.1=external/ActionBarSherlock/actionbarsherlock
diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
new file mode 100644
index 0000000..435138e
--- /dev/null
+++ b/res/layout/layout_notification.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    
+
+</LinearLayout>
-- 
1.8.3.2


From f70da355ae9b032c2dd67a86f0a72b6ee4798a9f Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 4 Jan 2014 22:17:56 +0530
Subject: [PATCH 02/49] Style sheet for version 2.2 or lower

---
 res/values/styles.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..769dc00
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NotificationText">
+      <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+    </style>
+    <style name="NotificationTitle">
+      <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+      <item name="android:textStyle">bold</item>
+    </style>
+</resources>
-- 
1.8.3.2


From 30baf7b3fc44f89c737c9ba22fd99af232ce3e25 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 4 Jan 2014 22:20:58 +0530
Subject: [PATCH 03/49] Style sheet for version 2.3 or higher created

---
 res/values-v9/styles.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 res/values-v9/styles.xml

diff --git a/res/values-v9/styles.xml b/res/values-v9/styles.xml
new file mode 100644
index 0000000..b3fe8af
--- /dev/null
+++ b/res/values-v9/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
+    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
+</resources>
-- 
1.8.3.2


From ce9c2976281c55d23a2067f2923f1a364fcaa5b9 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Tue, 7 Jan 2014 23:37:56 +0530
Subject: [PATCH 04/49] notification layout changed for testing , also java
 code written to make notification and old code commented out

---
 res/layout/layout_notification.xml                 | 36 ++++++++++++++++++----
 src/org/torproject/android/service/TorService.java | 18 +++++++----
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 435138e..6596be3 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -1,8 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-    
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/custom_notification"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center" >
 
-</LinearLayout>
+    <ImageView
+        android:id="@+id/notification_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+    />
+
+    <TextView 
+        android:id="@+id/notification_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/notification_image"
+        android:layout_alignTop="@+id/notification_image"
+        style="@style/NotificationTitle"
+    />
+
+    <TextView
+        android:id="@+id/notification_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_image"
+        android:layout_below="@+id/notification_title"
+        style="@style/NotificationText"
+    />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 1167d4e..986443e 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -31,7 +31,6 @@ import org.torproject.android.TorConstants;
 import org.torproject.android.Utils;
 import org.torproject.android.settings.AppManager;
 
-import android.annotation.SuppressLint;
 import android.app.Application;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -46,13 +45,12 @@ import android.content.SharedPreferences.Editor;
 import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.os.Build;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.util.Log;
+import android.widget.RemoteViews;
 
 public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler
 {
@@ -1016,7 +1014,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		//Reusable code.
 		Intent intent = new Intent(TorService.this, Orbot.class);
 		PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
-		
+		/*
 		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		
 				if (mNotifyBuilder == null)
@@ -1035,8 +1033,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
 			    			mNotifyBuilder.getNotification());
-			
-
+			*/
+		//Testing new code for notification here.
+		Notification notification = new Notification(R.drawable.ic_stat_tor,"Test Notificaiton",System.currentTimeMillis());
+		
+		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
+		contentView.setImageViewResource(R.id.n, R.drawable.ic_action_settings);
+		contentView.setTextViewText(R.id.notification_title, "My custom notification title");
+		contentView.setTextViewText(R.id.notification_text, "My custom notification text");
+		notification.contentView = contentView;
+		
 	}
 
 
-- 
1.8.3.2


From 4bd2557204edee240fc3064bb6f63adebc65500f Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Tue, 7 Jan 2014 23:42:26 +0530
Subject: [PATCH 05/49] more modifications made to torservice.java , testing
 the code now

---
 src/org/torproject/android/service/TorService.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 986443e..21f245f 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1038,11 +1038,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		Notification notification = new Notification(R.drawable.ic_stat_tor,"Test Notificaiton",System.currentTimeMillis());
 		
 		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
-		contentView.setImageViewResource(R.id.n, R.drawable.ic_action_settings);
+		contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
 		contentView.setTextViewText(R.id.notification_title, "My custom notification title");
 		contentView.setTextViewText(R.id.notification_text, "My custom notification text");
 		notification.contentView = contentView;
 		
+		notification.contentIntent=pendIntent;	
+		
+		notification.flags |= Notification.FLAG_NO_CLEAR;
+		
+		mNotificationManager.notify(NOTIFICATION_ID, notification);
 	}
 
 
-- 
1.8.3.2


From 9b97e653f039df7f60750f355d259a4d2361cf1c Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Tue, 7 Jan 2014 23:43:49 +0530
Subject: [PATCH 06/49] typo correction

---
 src/org/torproject/android/service/TorService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 21f245f..c522da8 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1047,7 +1047,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		notification.flags |= Notification.FLAG_NO_CLEAR;
 		
-		mNotificationManager.notify(NOTIFICATION_ID, notification);
+		mNotificationManager.notify(NOTIFY_ID, notification);
 	}
 
 
-- 
1.8.3.2


From b3f5dafea202b70ff9b7e9542d524bed315294f5 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 09:44:25 +0530
Subject: [PATCH 07/49] remote view rearranged a little

---
 res/layout/layout_notification.xml                 | 10 +---------
 src/org/torproject/android/service/TorService.java |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 6596be3..23743f4 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -5,18 +5,10 @@
     android:layout_height="fill_parent"
     android:gravity="center" >
 
-    <ImageView
-        android:id="@+id/notification_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-    />
-
     <TextView 
         android:id="@+id/notification_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/notification_image"
-        android:layout_alignTop="@+id/notification_image"
         style="@style/NotificationTitle"
     />
 
@@ -24,9 +16,9 @@
         android:id="@+id/notification_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notification_image"
         android:layout_below="@+id/notification_title"
         style="@style/NotificationText"
     />
+    
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index c522da8..2329c89 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1038,7 +1038,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		Notification notification = new Notification(R.drawable.ic_stat_tor,"Test Notificaiton",System.currentTimeMillis());
 		
 		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
-		contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
+		//contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
 		contentView.setTextViewText(R.id.notification_title, "My custom notification title");
 		contentView.setTextViewText(R.id.notification_text, "My custom notification text");
 		notification.contentView = contentView;
-- 
1.8.3.2


From b8688b3b0e4615b976fe894bc4f9bc718b0a678b Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 09:51:31 +0530
Subject: [PATCH 08/49] remote view image added back , more modifications will
 be done later today

---
 res/layout/layout_notification.xml                 | 6 ++++++
 src/org/torproject/android/service/TorService.java | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 23743f4..57bced8 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -20,5 +20,11 @@
         style="@style/NotificationText"
     />
     
+    <ImageView
+        android:id="@+id/notification_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_title"
+    />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 2329c89..c522da8 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1038,7 +1038,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		Notification notification = new Notification(R.drawable.ic_stat_tor,"Test Notificaiton",System.currentTimeMillis());
 		
 		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
-		//contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
+		contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
 		contentView.setTextViewText(R.id.notification_title, "My custom notification title");
 		contentView.setTextViewText(R.id.notification_text, "My custom notification text");
 		notification.contentView = contentView;
-- 
1.8.3.2


From 7ee73f08a62732eb4f565f64a31c6b9843e81405 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 14:11:14 +0530
Subject: [PATCH 09/49] testing more changes to the java code

---
 src/org/torproject/android/service/TorService.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index c522da8..cc08290 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -48,6 +48,7 @@ import android.os.Build;
 import android.os.IBinder;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.util.Log;
 import android.widget.RemoteViews;
@@ -1014,7 +1015,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		//Reusable code.
 		Intent intent = new Intent(TorService.this, Orbot.class);
 		PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
-		/*
+		
+		Notification notification = new Notification();
+		
 		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		
 				if (mNotifyBuilder == null)
@@ -1029,13 +1032,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  			
 				mNotifyBuilder.setOngoing(persistent);			    
 				mNotifyBuilder.setContentText(message);
- 
+ /*
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
 			    			mNotifyBuilder.getNotification());
-			*/
+		*/
 		//Testing new code for notification here.
-		Notification notification = new Notification(R.drawable.ic_stat_tor,"Test Notificaiton",System.currentTimeMillis());
 		
 		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
 		contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
-- 
1.8.3.2


From eb56d794ddac69c3f3f56064cc62abe2388257ec Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 14:13:49 +0530
Subject: [PATCH 10/49] notification builder not used in previous commit ,
 changed and testing

---
 src/org/torproject/android/service/TorService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index cc08290..cdfbc3d 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1016,7 +1016,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		Intent intent = new Intent(TorService.this, Orbot.class);
 		PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
 		
-		Notification notification = new Notification();
+		Notification notification = null;
 		
 		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		
@@ -1043,6 +1043,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
 		contentView.setTextViewText(R.id.notification_title, "My custom notification title");
 		contentView.setTextViewText(R.id.notification_text, "My custom notification text");
+		
+		notification = mNotifyBuilder.getNotification();
 		notification.contentView = contentView;
 		
 		notification.contentIntent=pendIntent;	
-- 
1.8.3.2


From fe114a1898015830d78e1888d0bb73cc979873d0 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 14:23:05 +0530
Subject: [PATCH 11/49] startNotification() edited to use older notification
 builder along with the new remote view implementation , more edits need to be
 made in order to add other properties of the notification and also the
 messages being displayed.

---
 src/org/torproject/android/service/TorService.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index cdfbc3d..cf19d29 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1016,6 +1016,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		Intent intent = new Intent(TorService.this, Orbot.class);
 		PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
 		
+		//This is the remote view that will be used for the notification
+		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
+		//contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
+		contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
+		
 		Notification notification = null;
 		
 		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@@ -1024,8 +1029,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				{
 					mNotifyBuilder = new NotificationCompat.Builder(this)
 						.setContentTitle(getString(R.string.app_name))
-						.setContentText( getString(R.string.status_activated))
-						.setSmallIcon(R.drawable.ic_stat_tor);
+						.setContentText( getString(R.string.status_activated));
 
 					mNotifyBuilder.setContentIntent(pendIntent);
 				}		
@@ -1036,13 +1040,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
 			    			mNotifyBuilder.getNotification());
-		*/
-		//Testing new code for notification here.
+		*/	
 		
-		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
-		contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
-		contentView.setTextViewText(R.id.notification_title, "My custom notification title");
-		contentView.setTextViewText(R.id.notification_text, "My custom notification text");
+		contentView.setTextViewText(R.id.notification_text, message);
 		
 		notification = mNotifyBuilder.getNotification();
 		notification.contentView = contentView;
-- 
1.8.3.2


From 993ada3ea1793c7ec97edc3601599730c6712d0f Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 15:52:26 +0530
Subject: [PATCH 12/49] More changes made to TorService() and code moved around
 and deleted to get final notification without using any deprecated code

---
 src/org/torproject/android/service/TorService.java | 26 ++++++++--------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index cf19d29..9fb90ed 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1028,30 +1028,22 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				if (mNotifyBuilder == null)
 				{
 					mNotifyBuilder = new NotificationCompat.Builder(this)
-						.setContentTitle(getString(R.string.app_name))
-						.setContentText( getString(R.string.status_activated));
-
+						/*.setContentTitle(getString(R.string.app_name))
+						.setContentText( getString(R.string.status_activated))*/
+						.setSmallIcon(R.drawable.ic_stat_tor);
+						
 					mNotifyBuilder.setContentIntent(pendIntent);
 				}		
  			
-				mNotifyBuilder.setOngoing(persistent);			    
-				mNotifyBuilder.setContentText(message);
- /*
+				mNotifyBuilder.setOngoing(persistent);		
+				mNotifyBuilder.setContent(contentView);
+				contentView.setTextViewText(R.id.notification_text, message);
+				contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
+				
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
 			    			mNotifyBuilder.getNotification());
-		*/	
-		
-		contentView.setTextViewText(R.id.notification_text, message);
-		
-		notification = mNotifyBuilder.getNotification();
-		notification.contentView = contentView;
-		
-		notification.contentIntent=pendIntent;	
-		
-		notification.flags |= Notification.FLAG_NO_CLEAR;
 		
-		mNotificationManager.notify(NOTIFY_ID, notification);
 	}
 
 
-- 
1.8.3.2


From 27183edb7a7e6a809dad0aebe6dfad5ba5d351bc Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 15:55:36 +0530
Subject: [PATCH 13/49] changes made to the layout_notification xml in order to
 mimic the old notification but using this new code

---
 res/layout/layout_notification.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 57bced8..bfe4ae1 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -3,8 +3,15 @@
     android:id="@+id/custom_notification"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:gravity="center" >
+    android:gravity="left" >
 
+    <ImageView
+        android:id="@+id/notification_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_title"
+    />
+    
     <TextView 
         android:id="@+id/notification_title"
         android:layout_width="wrap_content"
@@ -19,12 +26,5 @@
         android:layout_below="@+id/notification_title"
         style="@style/NotificationText"
     />
-    
-    <ImageView
-        android:id="@+id/notification_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notification_title"
-    />
 
 </RelativeLayout>
\ No newline at end of file
-- 
1.8.3.2


From 0429ec1a5d25d8084dd01527d77d7ce9752e4230 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 15:55:41 +0530
Subject: [PATCH 14/49] changes made to the layout_notification xml in order to
 mimic the old notification but using this new code

---
 res/layout/layout_notification.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index bfe4ae1..f782d06 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/notification_title"
     />
-    
+    	
     <TextView 
         android:id="@+id/notification_title"
         android:layout_width="wrap_content"
-- 
1.8.3.2


From b6eba16cfd1440d76c142c545b70dc7c9f179d86 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 16:00:21 +0530
Subject: [PATCH 15/49] changes made to the TorService class in order to set
 image and other modification(including deleting comented out old code)

---
 src/org/torproject/android/service/TorService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 9fb90ed..8ae3060 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1028,8 +1028,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				if (mNotifyBuilder == null)
 				{
 					mNotifyBuilder = new NotificationCompat.Builder(this)
-						/*.setContentTitle(getString(R.string.app_name))
-						.setContentText( getString(R.string.status_activated))*/
 						.setSmallIcon(R.drawable.ic_stat_tor);
 						
 					mNotifyBuilder.setContentIntent(pendIntent);
@@ -1037,8 +1035,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  			
 				mNotifyBuilder.setOngoing(persistent);		
 				mNotifyBuilder.setContent(contentView);
+				
 				contentView.setTextViewText(R.id.notification_text, message);
 				contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
+				contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_stat_tor);
 				
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
-- 
1.8.3.2


From 63e4487fa3d06a6366f8002e1433c671da5f4751 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Wed, 8 Jan 2014 16:03:46 +0530
Subject: [PATCH 16/49] the layout_notification xml modified to do what the old
 notification did , missed the relative layout modification in the previous
 commit for this code.

---
 res/layout/layout_notification.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index f782d06..92191c9 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -9,13 +9,13 @@
         android:id="@+id/notification_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notification_title"
     />
     	
     <TextView 
         android:id="@+id/notification_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_image"
         style="@style/NotificationTitle"
     />
 
@@ -23,6 +23,7 @@
         android:id="@+id/notification_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_image"
         android:layout_below="@+id/notification_title"
         style="@style/NotificationText"
     />
-- 
1.8.3.2


From 4301b2708e2ce4531d5fc8722ea88656447ea03d Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 10:38:35 +0530
Subject: [PATCH 17/49] renamed the stop button icon according to the android
 convention

---
 res/drawable/button_stop.png       | Bin 1462 -> 0 bytes
 res/layout/layout_notification.xml |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 res/drawable/button_stop.png

diff --git a/res/drawable/button_stop.png b/res/drawable/button_stop.png
deleted file mode 100644
index d97a3a8edc3806086df0b9c54e3d3233ed72918c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1462
zcmV;n1xfmeP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000GjNkl<ZcwX$#
zK>+|D3;>~N|IV|7zk>*z-JP;KaRLOy2@nt`KtP-T0dWEZ{3YNqYi_-56j1=4U9Y|C
z?s|O-#sMNHjve2UA~jrI5K!?{cmUyCg#hITz+dP){DQppfi|HHLV~s+(Y%y5-l!8_
zOVfg=6t%UzyK!vCyPWYlqpamYD74j_WVIV>Z{IgFXU-&9S;?PUUS0TdX*K`B($bRm
z{{rB9EUqkGSX{|}f$z;hFew0FqpP1RJ`g1FRyaKNm3+o`nHSJq0C?l{GC!W>1+FB^
zXEw&d;jaacw7tB#_-Fpp{5Vqr0Mg?U&`*&_G@8p~{Sy<fh^bW47mrUxLBcN};jPp3
zB#w9gIyn`a$fQ%gSS%*yav61eJR0%zT({QN)+Ba%fN=DV+wG1=qb~{=0QXY71p)z-
znwe2tZghhtfetThCz8`@I26M7B3mR95j>*!ve9n5%Z>nxd%^1^!`<=1KGla(sWe3b
z9X^>#s2~tSJ2o7WBysS}C`&n@aoA~F$MC}vRFIHKXFvkykU)b^rITtf5F81Q_lJjv
zCTDVWW(0hDW$Svo(|*vXH!$#M34Rr2vsog62A|HP)L<|~g|9d2sNL@TwYhoidu9Y!
z5Jx@p^LzLAG)>p368s=xHkTt3hT${0v>FQ0;dR46_wMa!M^^7M3xcU>@apBOznNY1
zezjWtcL@PMnwy&=68i8iVLLaQg@hNT!-Lpzxvb%5;Ab&e2yJd|-o_H}i)u}cDj@(8
zUOjuZF9E~P&gIl_m=3RL8Y-4beR%u~mMcLbp;#*G&4z|(i7^-oqWSrGW&Yebbu2uF
zc%B~#-)uC|?ruqUz_ToXNI0@C>=ui9v+0oFIL0{v4+#v9V;H^x@H@Lj9p8(<vnhZs
zVP|JoZ!{WCc>1119j+-9b{z1G3!qCVfQ0&!`tgiG_Cp)_yk4)P!kq#Io?!v>oB$FE
zI|fc>rfH&1r-O?bn9tj&+wD3e=y1-R-wQ^sOW>br2<SP+fpO3mVA)Mgx<1YUE|<$b
zr`1BwGoJZBNZ`5NC2%+6i78o;l@stBK5*m!{Dr@DO-Gel4KhDdL*VrA(}}q3Q+$1B
ze$e8ab8ibdv4Bb@5(+PnijnyqK!;Dpam(9qq;$rtj@KCe88(~`3{<XENHSzt039A$
z-Z9Nt_?WEf+Joh-H~=6gkkFdCLjv0Z2t0yrKP{`O>X`pQwk-lS!!S^(ST^v7sZ>%?
zd_Dp|&KpFt*~Ai9FNF#Gjj8D=*#|(w)g8~<#|H!Wp4D0CLCY3P707!!7DIBvNg0Zw
zphP0!<K5^w7R;o8h1G>Oc^h7VZf{R_mPPh<*h|{t0DkkEt((Wi5(v??rsk*#;97FM
zBFktxKHZl9&w7oiApou7g%_(%#$qq|{eB|Fxd5`^E9DBncl+?ey$5IgnIs+#@^H22
zD3SN}?*HLe0;%=&^)3@VfaA=!y^>cRf_FgJ>-iJ#l(HEoyy2d3G6EpjD@ozUjmIA`
zGXzYIn-nEcqzQtS2l%RC4#CqTRBBbNIgl_aM9JfVou3&2yk(Z5%<YVVG7b(<wNf)o
zM1iOLKB0EE26@pK3D9aCTD)aFVMah8Fm@XjI1l&t_f1F3YdQt~ze^Y_rAh4XKSG^O
z`(ZXa_Z=fikR-7L@8*8+cs%2ZB1`SoVGCNnWA%E=8ynZQPx*Jo*O5!ukVGjgiXI+T
zkQTuIZS{`wSFUW`VXhE5fBw7>iG<&?IFtsp_a(Rd^QB9djHhtV524TdIFow>E&t=i
zix<tOISu~Po*fhc001Bi^6VelAhHO2XOCY6000000000000000000007<zss&(b@J
Q<p2Nx07*qoM6N<$f&d4n*Z=?k

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 92191c9..7927eb9 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/notification_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
     />
     	
     <TextView 
-- 
1.8.3.2


From a5cdc39f3e8f77192febd1eb20a5322ef44e29e1 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 10:41:34 +0530
Subject: [PATCH 18/49] no caps

---
 res/layout/layout_notification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 7927eb9..025d2d9 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/notification_image"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
     />
     	
     <TextView 
-- 
1.8.3.2


From 3c943f76168177fe257b9385b3ef5e40feab60ba Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 11:11:48 +0530
Subject: [PATCH 19/49] image placed in a frame view to get the exact effect as
 in the standard notification , got new ideas to notify the user about tor
 status , background color of the notification icon will change according to
 the tor status.Will run it by n8fr8 before implementation.

---
 res/layout/layout_notification.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 025d2d9..302744c 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -4,18 +4,25 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="left" >
-
+    
+	<FrameLayout 
+	    android:id="@+id/notification_frame"
+		android:layout_width="65dp"
+        android:layout_height="fill_parent"
+	    >
     <ImageView
         android:id="@+id/notification_image"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
     />
-    	
+	</FrameLayout>
+    
     <TextView 
         android:id="@+id/notification_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notification_image"
+        android:layout_toRightOf="@+id/notification_frame"
         style="@style/NotificationTitle"
     />
 
@@ -23,7 +30,7 @@
         android:id="@+id/notification_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notification_image"
+        android:layout_toRightOf="@+id/notification_frame"
         android:layout_below="@+id/notification_title"
         style="@style/NotificationText"
     />
-- 
1.8.3.2


From dd41dd45578298f73c1388846a3107aaf17f80f6 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 17:17:46 +0530
Subject: [PATCH 20/49] background color for frame layout tested and width of
 notification image fixed

---
 res/layout/layout_notification.xml                 | 2 +-
 src/org/torproject/android/service/TorService.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 302744c..725453c 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -7,7 +7,7 @@
     
 	<FrameLayout 
 	    android:id="@+id/notification_frame"
-		android:layout_width="65dp"
+		android:layout_width="64dp"
         android:layout_height="fill_parent"
 	    >
     <ImageView
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 8ae3060..8e69b28 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1039,6 +1039,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				contentView.setTextViewText(R.id.notification_text, message);
 				contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
 				contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_stat_tor);
+				contentView.setInt(R.id.notification_frame, "setBackgroundColor",Color.parseColor("#FFFFFF"));
 				
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
-- 
1.8.3.2


From dad19176d3257675816b7a762a25abd3b5e1de67 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 17:28:17 +0530
Subject: [PATCH 21/49] background color of the frame view set

---
 src/org/torproject/android/service/TorService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 8e69b28..6fd28dd 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1039,7 +1039,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				contentView.setTextViewText(R.id.notification_text, message);
 				contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
 				contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_stat_tor);
-				contentView.setInt(R.id.notification_frame, "setBackgroundColor",Color.parseColor("#FFFFFF"));
+				contentView.setInt(R.id.notification_frame, "setBackgroundColor",Color.parseColor("#000000"));
 				
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
-- 
1.8.3.2


From 0505e2738aa1dca379aee2d64498596d196a115e Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 17:31:44 +0530
Subject: [PATCH 22/49] removed stop_tor button of the notification added back
 and tracked , forgot to track this image in the previous commit

---
 res/drawable/ic_stat_notify_stop_tor.png | Bin 0 -> 1462 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable/ic_stat_notify_stop_tor.png

diff --git a/res/drawable/ic_stat_notify_stop_tor.png b/res/drawable/ic_stat_notify_stop_tor.png
new file mode 100644
index 0000000000000000000000000000000000000000..d97a3a8edc3806086df0b9c54e3d3233ed72918c
GIT binary patch
literal 1462
zcmV;n1xfmeP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000GjNkl<ZcwX$#
zK>+|D3;>~N|IV|7zk>*z-JP;KaRLOy2@nt`KtP-T0dWEZ{3YNqYi_-56j1=4U9Y|C
z?s|O-#sMNHjve2UA~jrI5K!?{cmUyCg#hITz+dP){DQppfi|HHLV~s+(Y%y5-l!8_
zOVfg=6t%UzyK!vCyPWYlqpamYD74j_WVIV>Z{IgFXU-&9S;?PUUS0TdX*K`B($bRm
z{{rB9EUqkGSX{|}f$z;hFew0FqpP1RJ`g1FRyaKNm3+o`nHSJq0C?l{GC!W>1+FB^
zXEw&d;jaacw7tB#_-Fpp{5Vqr0Mg?U&`*&_G@8p~{Sy<fh^bW47mrUxLBcN};jPp3
zB#w9gIyn`a$fQ%gSS%*yav61eJR0%zT({QN)+Ba%fN=DV+wG1=qb~{=0QXY71p)z-
znwe2tZghhtfetThCz8`@I26M7B3mR95j>*!ve9n5%Z>nxd%^1^!`<=1KGla(sWe3b
z9X^>#s2~tSJ2o7WBysS}C`&n@aoA~F$MC}vRFIHKXFvkykU)b^rITtf5F81Q_lJjv
zCTDVWW(0hDW$Svo(|*vXH!$#M34Rr2vsog62A|HP)L<|~g|9d2sNL@TwYhoidu9Y!
z5Jx@p^LzLAG)>p368s=xHkTt3hT${0v>FQ0;dR46_wMa!M^^7M3xcU>@apBOznNY1
zezjWtcL@PMnwy&=68i8iVLLaQg@hNT!-Lpzxvb%5;Ab&e2yJd|-o_H}i)u}cDj@(8
zUOjuZF9E~P&gIl_m=3RL8Y-4beR%u~mMcLbp;#*G&4z|(i7^-oqWSrGW&Yebbu2uF
zc%B~#-)uC|?ruqUz_ToXNI0@C>=ui9v+0oFIL0{v4+#v9V;H^x@H@Lj9p8(<vnhZs
zVP|JoZ!{WCc>1119j+-9b{z1G3!qCVfQ0&!`tgiG_Cp)_yk4)P!kq#Io?!v>oB$FE
zI|fc>rfH&1r-O?bn9tj&+wD3e=y1-R-wQ^sOW>br2<SP+fpO3mVA)Mgx<1YUE|<$b
zr`1BwGoJZBNZ`5NC2%+6i78o;l@stBK5*m!{Dr@DO-Gel4KhDdL*VrA(}}q3Q+$1B
ze$e8ab8ibdv4Bb@5(+PnijnyqK!;Dpam(9qq;$rtj@KCe88(~`3{<XENHSzt039A$
z-Z9Nt_?WEf+Joh-H~=6gkkFdCLjv0Z2t0yrKP{`O>X`pQwk-lS!!S^(ST^v7sZ>%?
zd_Dp|&KpFt*~Ai9FNF#Gjj8D=*#|(w)g8~<#|H!Wp4D0CLCY3P707!!7DIBvNg0Zw
zphP0!<K5^w7R;o8h1G>Oc^h7VZf{R_mPPh<*h|{t0DkkEt((Wi5(v??rsk*#;97FM
zBFktxKHZl9&w7oiApou7g%_(%#$qq|{eB|Fxd5`^E9DBncl+?ey$5IgnIs+#@^H22
zD3SN}?*HLe0;%=&^)3@VfaA=!y^>cRf_FgJ>-iJ#l(HEoyy2d3G6EpjD@ozUjmIA`
zGXzYIn-nEcqzQtS2l%RC4#CqTRBBbNIgl_aM9JfVou3&2yk(Z5%<YVVG7b(<wNf)o
zM1iOLKB0EE26@pK3D9aCTD)aFVMah8Fm@XjI1l&t_f1F3YdQt~ze^Y_rAh4XKSG^O
z`(ZXa_Z=fikR-7L@8*8+cs%2ZB1`SoVGCNnWA%E=8ynZQPx*Jo*O5!ukVGjgiXI+T
zkQTuIZS{`wSFUW`VXhE5fBw7>iG<&?IFtsp_a(Rd^QB9djHhtV524TdIFow>E&t=i
zix<tOISu~Po*fhc001Bi^6VelAhHO2XOCY6000000000000000000007<zss&(b@J
Q<p2Nx07*qoM6N<$f&d4n*Z=?k

literal 0
HcmV?d00001

-- 
1.8.3.2


From a73566b7cc65e107909ab6b33d967e43fffb960b Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 19:59:31 +0530
Subject: [PATCH 23/49] Notification handler ,for button clicks, in the
 notification

---
 src/org/torproject/android/service/NotificationHandler.java | 5 +++++
 src/org/torproject/android/service/TorService.java          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 src/org/torproject/android/service/NotificationHandler.java

diff --git a/src/org/torproject/android/service/NotificationHandler.java b/src/org/torproject/android/service/NotificationHandler.java
new file mode 100644
index 0000000..758b0c7
--- /dev/null
+++ b/src/org/torproject/android/service/NotificationHandler.java
@@ -0,0 +1,5 @@
+package org.torproject.android.service;
+
+public class NotificationHandler {
+
+}
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 6fd28dd..89e6411 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1039,7 +1039,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				contentView.setTextViewText(R.id.notification_text, message);
 				contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
 				contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_stat_tor);
-				contentView.setInt(R.id.notification_frame, "setBackgroundColor",Color.parseColor("#000000"));
+				//contentView.setInt(R.id.notification_frame, "setBackgroundColor",R.color.abs__bright_foreground_disabled_holo_light);
 				
 				mNotificationManager.notify(
 			    			NOTIFY_ID,
-- 
1.8.3.2


From 19da935b5d56e38819c97fc194e74df526476de7 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 20:07:52 +0530
Subject: [PATCH 24/49] Notification Handler class added to the android
 manifest

---
 AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9f55338..6307a7a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -74,6 +74,8 @@
       	<activity android:name=".settings.SettingsPreferences"  android:label="@string/app_name"/>
         <activity android:name=".settings.AppManager"  android:label="@string/app_name"/>
       
+        <activity android:name=".service.NotificationHandler" android:label="@string/app_name"></activity>
+        
     	<service android:enabled="true"
     		android:name=".service.TorService" 
     		android:exported="false"
-- 
1.8.3.2


From b01868bbd4f1346c22e4cc82c8041b9dbb73a785 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 20:08:35 +0530
Subject: [PATCH 25/49] NotificationHandler class changed for testing purposes

---
 src/org/torproject/android/service/NotificationHandler.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/NotificationHandler.java b/src/org/torproject/android/service/NotificationHandler.java
index 758b0c7..2202f24 100644
--- a/src/org/torproject/android/service/NotificationHandler.java
+++ b/src/org/torproject/android/service/NotificationHandler.java
@@ -1,5 +1,16 @@
 package org.torproject.android.service;
 
-public class NotificationHandler {
+import org.torproject.android.R;
 
+import android.app.Activity;
+import android.os.Bundle;
+
+public class NotificationHandler extends Activity{
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.layout_main);
+	}
 }
-- 
1.8.3.2


From 9f14a6783b7f7b34eb572a6f14ddea54f6cfa861 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 20:09:14 +0530
Subject: [PATCH 26/49] notification pending intent changed to open the new
 notification handler class

---
 src/org/torproject/android/service/TorService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 89e6411..deb6970 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1013,7 +1013,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 	private void startNotification (String message, boolean persistent)
 	{
 		//Reusable code.
-		Intent intent = new Intent(TorService.this, Orbot.class);
+		Intent intent = new Intent(TorService.this, NotificationHandler.class);
 		PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
 		
 		//This is the remote view that will be used for the notification
-- 
1.8.3.2


From 85c24e9906ac368cecb4dcf569b433a0d9155bb9 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 9 Jan 2014 21:01:08 +0530
Subject: [PATCH 27/49] more changes made to the activity

---
 src/org/torproject/android/service/NotificationHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/NotificationHandler.java b/src/org/torproject/android/service/NotificationHandler.java
index 2202f24..ef5f8eb 100644
--- a/src/org/torproject/android/service/NotificationHandler.java
+++ b/src/org/torproject/android/service/NotificationHandler.java
@@ -11,6 +11,6 @@ public class NotificationHandler extends Activity{
 	protected void onCreate(Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.layout_main);
+		
 	}
 }
-- 
1.8.3.2


From 48568c95bf1ea42af2406d5a789d36a56c96e2cb Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Fri, 10 Jan 2014 10:16:38 +0530
Subject: [PATCH 28/49] unused notification variable removed

---
 src/org/torproject/android/service/TorService.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index deb6970..b9e7d07 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1020,9 +1020,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
 		//contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
 		contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
-		
-		Notification notification = null;
-		
+				
 		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		
 				if (mNotifyBuilder == null)
-- 
1.8.3.2


From 7238e30ff56453e62fd9b05e4e8b822e64417094 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 01:33:37 +0530
Subject: [PATCH 29/49] startNotification() removed and all calls to start
 notifications shifted to startToolbarNotification()

---
 src/org/torproject/android/service/TorService.java | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index d386976..48d7b12 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1031,41 +1031,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 				
 			}
 		}
-		
-	private void startNotification (String message, boolean persistent)
-	{
-		//Reusable code.
-		Intent intent = new Intent(TorService.this, NotificationHandler.class);
-		PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
-		
-		//This is the remote view that will be used for the notification
-		RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.layout_notification);
-		//contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_action_settings);
-		contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
-				
-		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-		
-				if (mNotifyBuilder == null)
-				{
-					mNotifyBuilder = new NotificationCompat.Builder(this)
-						.setSmallIcon(R.drawable.ic_stat_tor);
-						
-					mNotifyBuilder.setContentIntent(pendIntent);
-				}		
- 			
-				mNotifyBuilder.setOngoing(persistent);		
-				mNotifyBuilder.setContent(contentView);
-				
-				contentView.setTextViewText(R.id.notification_text, message);
-				contentView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
-				contentView.setImageViewResource(R.id.notification_image, R.drawable.ic_stat_tor);
-				//contentView.setInt(R.id.notification_frame, "setBackgroundColor",R.color.abs__bright_foreground_disabled_holo_light);
-				
-				mNotificationManager.notify(
-			    			NOTIFY_ID,
-			    			mNotifyBuilder.getNotification());
-		
-	}
 
 	public void message(String severity, String msg) {
 		
-- 
1.8.3.2


From 4fa0fa88613e637d1b9d30a5aefdc62a2266a4cb Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 01:39:33 +0530
Subject: [PATCH 30/49] Remote view added to showToolbarNotification()

---
 src/org/torproject/android/service/TorService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 48d7b12..404c9c8 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -209,6 +209,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			Intent intent = new Intent(TorService.this, Orbot.class);
 			PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
 			
+			//This is the remote view that will be used for the notification
+			RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
+			
 			mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 				
 			if (mNotifyBuilder == null)
-- 
1.8.3.2


From 4293b0ce02fe319e899dc5c6ce9eedabc562d04b Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 01:43:31 +0530
Subject: [PATCH 31/49] Useless if statement removed.

---
 src/org/torproject/android/service/TorService.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 404c9c8..488b565 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -213,16 +213,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
 			
 			mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-				
-			if (mNotifyBuilder == null)
-			{
-				mNotifyBuilder = new NotificationCompat.Builder(this)
-					.setContentTitle(getString(R.string.app_name))
-					.setContentText( getString(R.string.status_activated))
-					.setSmallIcon(R.drawable.ic_stat_tor);
+			
+			mNotifyBuilder = new NotificationCompat.Builder(this)
+				.setContentTitle(getString(R.string.app_name))
+				.setContentText( getString(R.string.status_activated))
+				.setSmallIcon(R.drawable.ic_stat_tor);
 
-				mNotifyBuilder.setContentIntent(pendIntent);
-			}		
+			mNotifyBuilder.setContentIntent(pendIntent);
 								
 		}
 
-- 
1.8.3.2


From 8f9edbe90a0bf5f7fa4121b7a9e71fc372a90c79 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 01:47:48 +0530
Subject: [PATCH 32/49] notification builder extra properties removed and
 properties added to remote view

---
 src/org/torproject/android/service/TorService.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 488b565..54b944e 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -215,10 +215,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 			
 			mNotifyBuilder = new NotificationCompat.Builder(this)
-				.setContentTitle(getString(R.string.app_name))
-				.setContentText( getString(R.string.status_activated))
 				.setSmallIcon(R.drawable.ic_stat_tor);
-
+			
+			notificationView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
+			notificationView.setTextViewText(R.id.notification_text, getString(R.string.status_activated));
+			
 			mNotifyBuilder.setContentIntent(pendIntent);
 								
 		}
-- 
1.8.3.2


From 6a4c10ad422dc6d1cf09dc93aa814f84c31f740b Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 01:49:37 +0530
Subject: [PATCH 33/49] remote view object creation moved outside the if
 condition as it will be need regardless of the condition

---
 src/org/torproject/android/service/TorService.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 54b944e..5788642 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -201,6 +201,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
    
  	private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags, boolean isOngoing)
  	{
+ 		//This is the remote view that will be used for the notification
+		RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
  				    
 		if (mNotifyBuilder == null)
 		{
@@ -209,8 +211,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			Intent intent = new Intent(TorService.this, Orbot.class);
 			PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
 			
-			//This is the remote view that will be used for the notification
-			RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
 			
 			mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 			
@@ -223,7 +223,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			mNotifyBuilder.setContentIntent(pendIntent);
 								
 		}
-
+		
+		
 		mNotifyBuilder.setContentText(notifyMsg);
 		mNotifyBuilder.setSmallIcon(icon);
 		mNotifyBuilder.setOngoing(isOngoing);
-- 
1.8.3.2


From 6f68b7a84022832b5b7c90dfc35c48a99e306973 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 01:52:24 +0530
Subject: [PATCH 34/49] more notification builder properties removed and
 replaced with remote view properties

---
 src/org/torproject/android/service/TorService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 5788642..ed27b35 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -225,8 +225,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		}
 		
 		
-		mNotifyBuilder.setContentText(notifyMsg);
-		mNotifyBuilder.setSmallIcon(icon);
+		notificationView.setTextViewText(R.id.notification_text, notifyMsg);
+		notificationView.setImageViewResource(R.id.notification_image, icon);
+		
 		mNotifyBuilder.setOngoing(isOngoing);
 		
 		if (notifyId == ERROR_NOTIFY_ID)
-- 
1.8.3.2


From 3f9178c7a4e088e69667ed8f68bb34e41f2a73cc Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 02:21:17 +0530
Subject: [PATCH 35/49] notification builder content set anf also padding added
 to the title and text of the notification

---
 res/layout/layout_notification.xml                 | 5 +++--
 src/org/torproject/android/service/TorService.java | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 725453c..9e9a504 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -16,13 +16,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
     />
-	</FrameLayout>
-    
+	</FrameLayout>   
     <TextView 
         android:id="@+id/notification_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/notification_frame"
+        android:paddingLeft="5dp"
         style="@style/NotificationTitle"
     />
 
@@ -32,6 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/notification_frame"
         android:layout_below="@+id/notification_title"
+        android:paddingLeft="5dp"
         style="@style/NotificationText"
     />
 
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index ed27b35..ada4e75 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -237,6 +237,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			mNotifyBuilder.setLights(Color.GREEN, 1000, 1000);
 		}
 		
+		mNotifyBuilder.setContent(notificationView);
 		
 		mNotificationManager.notify(
 					notifyId,
-- 
1.8.3.2


From d22862dcb24b250003707d2e9ab1afb80f70d6d9 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Sat, 11 Jan 2014 22:35:51 +0530
Subject: [PATCH 36/49] Remote view for big notification added

---
 src/org/torproject/android/service/TorService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index ada4e75..3b4dd9c 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -203,7 +203,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  	{
  		//This is the remote view that will be used for the notification
 		RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
- 				    
+		//This is the expanded remote view that will be used for the notification
+		RemoteViews expandedNotificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
+		
 		if (mNotifyBuilder == null)
 		{
 			
-- 
1.8.3.2


From 02d1e78c19007db4f639c9861545ff561f848901 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Mon, 13 Jan 2014 16:50:45 +0530
Subject: [PATCH 37/49] experimenting with layout_notification to hold the stop
 button

---
 res/layout/layout_notification.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 9e9a504..af71beb 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -35,5 +35,11 @@
         android:paddingLeft="5dp"
         style="@style/NotificationText"
     />
+    <ImageButton
+        android:id="@+id/notification_stop_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_text"
+        ></ImageButton>
 
 </RelativeLayout>
\ No newline at end of file
-- 
1.8.3.2


From d39f1bb5adc48aa2f444b2a858de76381f0e2644 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Mon, 13 Jan 2014 16:53:14 +0530
Subject: [PATCH 38/49] changes made to the java to fill the imagebutton view
 with an image(stop button)

---
 src/org/torproject/android/service/TorService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 3b4dd9c..429561b 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -229,6 +229,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		notificationView.setTextViewText(R.id.notification_text, notifyMsg);
 		notificationView.setImageViewResource(R.id.notification_image, icon);
+		notificationView.setImageViewResource(R.id.notification_stop_button, R.drawable.ic_stat_notify_stop_tor);
 		
 		mNotifyBuilder.setOngoing(isOngoing);
 		
-- 
1.8.3.2


From e3c74a67fba4aec740534717e161914c455ecf16 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Mon, 13 Jan 2014 17:01:49 +0530
Subject: [PATCH 39/49] notification title needs to be set weather or not the 
 notification builder is null

---
 src/org/torproject/android/service/TorService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 429561b..967f038 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -219,14 +219,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 			mNotifyBuilder = new NotificationCompat.Builder(this)
 				.setSmallIcon(R.drawable.ic_stat_tor);
 			
-			notificationView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
 			notificationView.setTextViewText(R.id.notification_text, getString(R.string.status_activated));
 			
 			mNotifyBuilder.setContentIntent(pendIntent);
 								
 		}
 		
-		
+		notificationView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
 		notificationView.setTextViewText(R.id.notification_text, notifyMsg);
 		notificationView.setImageViewResource(R.id.notification_image, icon);
 		notificationView.setImageViewResource(R.id.notification_stop_button, R.drawable.ic_stat_notify_stop_tor);
-- 
1.8.3.2


From d691fa685d20ad38651d9654936f8fbbc59ce284 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Tue, 14 Jan 2014 01:27:04 +0530
Subject: [PATCH 40/49] updated the new support libraries (v4) in the external
 projects and their changes have been reflected in some of the imports seen in
 the current project , these library changes will be needed to improve the
 notification and other ui of the application in the future and hence I have
 done them

---
 .classpath                                              |  2 +-
 project.properties                                      |  2 +-
 src/org/torproject/android/ImageProgressView.java       |  4 ----
 src/org/torproject/android/OnBootReceiver.java          |  1 -
 src/org/torproject/android/RandomColorCircleView.java   |  1 -
 .../torproject/android/service/NotificationHandler.java |  2 --
 src/org/torproject/android/service/TorServiceUtils.java |  1 -
 src/org/torproject/android/service/TorTransProxy.java   |  1 -
 src/org/torproject/android/settings/AppManager.java     |  1 -
 .../android/settings/SettingsPreferences.java           |  3 ---
 .../android/wizard/ChooseLocaleWizardActivity.java      | 17 -----------------
 .../torproject/android/wizard/ConfigureTransProxy.java  | 12 ------------
 src/org/torproject/android/wizard/LotsaText.java        |  4 ----
 src/org/torproject/android/wizard/Permissions.java      |  3 ---
 src/org/torproject/android/wizard/TipsAndTricks.java    | 10 ----------
 15 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/.classpath b/.classpath
index 807316f..9dfd708 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/jtorctl.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
diff --git a/project.properties b/project.properties
index 0a52332..3b45b07 100644
--- a/project.properties
+++ b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-18
+target=android-19
 android.library.reference.1=external/ActionBarSherlock/actionbarsherlock
diff --git a/src/org/torproject/android/ImageProgressView.java b/src/org/torproject/android/ImageProgressView.java
index 6e813eb..32b7e98 100644
--- a/src/org/torproject/android/ImageProgressView.java
+++ b/src/org/torproject/android/ImageProgressView.java
@@ -1,15 +1,11 @@
 package org.torproject.android;
 
-import java.util.Random;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
 import android.widget.ImageView;
 
 public class ImageProgressView extends ImageView
diff --git a/src/org/torproject/android/OnBootReceiver.java b/src/org/torproject/android/OnBootReceiver.java
index a5ca1d6..2ad83f6 100644
--- a/src/org/torproject/android/OnBootReceiver.java
+++ b/src/org/torproject/android/OnBootReceiver.java
@@ -6,7 +6,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 
 public class OnBootReceiver extends BroadcastReceiver {
 	
diff --git a/src/org/torproject/android/RandomColorCircleView.java b/src/org/torproject/android/RandomColorCircleView.java
index 6e9a839..ae99143 100644
--- a/src/org/torproject/android/RandomColorCircleView.java
+++ b/src/org/torproject/android/RandomColorCircleView.java
@@ -7,7 +7,6 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
 import android.view.View;
 
 public class RandomColorCircleView extends View
diff --git a/src/org/torproject/android/service/NotificationHandler.java b/src/org/torproject/android/service/NotificationHandler.java
index ef5f8eb..e2582ed 100644
--- a/src/org/torproject/android/service/NotificationHandler.java
+++ b/src/org/torproject/android/service/NotificationHandler.java
@@ -1,7 +1,5 @@
 package org.torproject.android.service;
 
-import org.torproject.android.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 
diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java
index fde8c9e..f6dc886 100644
--- a/src/org/torproject/android/service/TorServiceUtils.java
+++ b/src/org/torproject/android/service/TorServiceUtils.java
@@ -4,7 +4,6 @@ package org.torproject.android.service;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.StringTokenizer;
diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java
index 7760d92..1c4ff32 100644
--- a/src/org/torproject/android/service/TorTransProxy.java
+++ b/src/org/torproject/android/service/TorTransProxy.java
@@ -8,7 +8,6 @@ import org.torproject.android.settings.TorifiedApp;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
 public class TorTransProxy implements TorServiceConstants {
diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java
index 7121e5e..865d11b 100644
--- a/src/org/torproject/android/settings/AppManager.java
+++ b/src/org/torproject/android/settings/AppManager.java
@@ -6,7 +6,6 @@ package org.torproject.android.settings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java
index e6adcf9..80a9f60 100644
--- a/src/org/torproject/android/settings/SettingsPreferences.java
+++ b/src/org/torproject/android/settings/SettingsPreferences.java
@@ -6,9 +6,7 @@ package org.torproject.android.settings;
 import java.util.Locale;
 
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
 import org.torproject.android.service.TorServiceUtils;
-import org.torproject.android.service.TorTransProxy;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -19,7 +17,6 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
index a8bebe9..500b018 100644
--- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
+++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java
@@ -2,39 +2,22 @@ package org.torproject.android.wizard;
 
 import java.util.Locale;
 
-import org.torproject.android.Orbot;
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.drawable;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
-import org.torproject.android.R.string;
-import org.torproject.android.settings.AppManager;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Configuration;
-import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ListView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.Toast;
 
 public class ChooseLocaleWizardActivity extends Activity implements TorConstants {
 
diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java
index 974c968..2a7a93b 100644
--- a/src/org/torproject/android/wizard/ConfigureTransProxy.java
+++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java
@@ -1,34 +1,22 @@
 package org.torproject.android.wizard;
 
-import org.torproject.android.Orbot;
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.drawable;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
-import org.torproject.android.R.string;
 import org.torproject.android.settings.AppManager;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.Toast;
 
 public class ConfigureTransProxy extends Activity implements TorConstants {
 
diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java
index 2bff373..7ec87cf 100644
--- a/src/org/torproject/android/wizard/LotsaText.java
+++ b/src/org/torproject/android/wizard/LotsaText.java
@@ -2,10 +2,6 @@ package org.torproject.android.wizard;
 
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.drawable;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
-import org.torproject.android.R.string;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java
index 91e93db..c61e256 100644
--- a/src/org/torproject/android/wizard/Permissions.java
+++ b/src/org/torproject/android/wizard/Permissions.java
@@ -4,8 +4,6 @@ import org.torproject.android.R;
 import org.torproject.android.TorConstants;
 import org.torproject.android.service.Root;
 import org.torproject.android.service.TorService;
-import org.torproject.android.service.TorServiceUtils;
-import org.torproject.android.service.TorTransProxy;
 
 import android.app.Activity;
 import android.content.Context;
@@ -22,7 +20,6 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class Permissions extends Activity implements TorConstants {
 
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index 49bc311..0d59d5d 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -3,21 +3,11 @@ package org.torproject.android.wizard;
 import org.torproject.android.Orbot;
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.drawable;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
-import org.torproject.android.R.string;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-- 
1.8.3.2


From 9b4b484d28f548b0bee3eb7b1b2890cb5266bd2e Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 09:54:12 +0530
Subject: [PATCH 41/49] changing back to target version 18

---
 project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.properties b/project.properties
index 3b45b07..0a52332 100644
--- a/project.properties
+++ b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-18
 android.library.reference.1=external/ActionBarSherlock/actionbarsherlock
-- 
1.8.3.2


From 97836426d8b3f22b7585ee5257bff42ee8af3f03 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 10:09:14 +0530
Subject: [PATCH 42/49] deprecated function changed

---
 src/org/torproject/android/service/TorService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 967f038..cde3322 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -243,7 +243,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		mNotificationManager.notify(
 					notifyId,
-	    			mNotifyBuilder.getNotification());
+	    			mNotifyBuilder.build());
 			
 		
  	}
-- 
1.8.3.2


From 4f4d0619a9ca2637e2a585c2dc11c0f0af1da9ac Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 10:26:03 +0530
Subject: [PATCH 43/49] only one remote view is used , not two as I assumed
 before

---
 src/org/torproject/android/service/TorService.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index cde3322..0d5ef05 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -203,8 +203,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  	{
  		//This is the remote view that will be used for the notification
 		RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
-		//This is the expanded remote view that will be used for the notification
-		RemoteViews expandedNotificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
 		
 		if (mNotifyBuilder == null)
 		{
-- 
1.8.3.2


From e2e95f17321eea6e64e357a4ff3fa1b5e4025803 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 11:01:52 +0530
Subject: [PATCH 44/49] expanded notification with remote view testing and
 corresponding code commented out and added in

---
 src/org/torproject/android/service/TorService.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 0d5ef05..af40d43 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -203,6 +203,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  	{
  		//This is the remote view that will be used for the notification
 		RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
+		// Notification to be used if remote expanded view is used.
+		Notification notification;
 		
 		if (mNotifyBuilder == null)
 		{
@@ -239,11 +241,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		mNotifyBuilder.setContent(notificationView);
 		
+		notification = mNotifyBuilder.build();
+		notification.bigContentView = notificationView;
+		
 		mNotificationManager.notify(
 					notifyId,
+					notification);
+		
+		/*mNotificationManager.notify(
+					notifyId,
 	    			mNotifyBuilder.build());
 			
-		
+		*/
  	}
     
     /* (non-Javadoc)
-- 
1.8.3.2


From 197d71b24471e6fa979ab1703c4ebbfc11a64c4d Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 11:03:43 +0530
Subject: [PATCH 45/49] commented out the expanded view code and changed back
 to the original , more work to be done on the custom notification layout
 before we can implemeny the expanded view (it's basically empty right nwow)

---
 src/org/torproject/android/service/TorService.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index af40d43..40d92db 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -204,7 +204,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  		//This is the remote view that will be used for the notification
 		RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
 		// Notification to be used if remote expanded view is used.
-		Notification notification;
+		// Notification notification;
 		
 		if (mNotifyBuilder == null)
 		{
@@ -241,18 +241,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		mNotifyBuilder.setContent(notificationView);
 		
+		/*
 		notification = mNotifyBuilder.build();
 		notification.bigContentView = notificationView;
 		
 		mNotificationManager.notify(
 					notifyId,
 					notification);
+		*/
 		
-		/*mNotificationManager.notify(
+		mNotificationManager.notify(
 					notifyId,
 	    			mNotifyBuilder.build());
 			
-		*/
+		
  	}
     
     /* (non-Javadoc)
-- 
1.8.3.2


From 6a042941629ab367577765bebbeb1247d562bbf8 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 11:04:50 +0530
Subject: [PATCH 46/49] Image button removed

---
 res/layout/layout_notification.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index af71beb..723e6e0 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -35,11 +35,4 @@
         android:paddingLeft="5dp"
         style="@style/NotificationText"
     />
-    <ImageButton
-        android:id="@+id/notification_stop_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/notification_text"
-        ></ImageButton>
-
 </RelativeLayout>
\ No newline at end of file
-- 
1.8.3.2


From 42b11d3c5aaa33aba416adbcd504bc5f96901ec3 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 11:05:21 +0530
Subject: [PATCH 47/49] image button removed - reflected in the java file

---
 src/org/torproject/android/service/TorService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 40d92db..f79a5ad 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -228,7 +228,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		notificationView.setTextViewText(R.id.notification_title, getString(R.string.app_name));
 		notificationView.setTextViewText(R.id.notification_text, notifyMsg);
 		notificationView.setImageViewResource(R.id.notification_image, icon);
-		notificationView.setImageViewResource(R.id.notification_stop_button, R.drawable.ic_stat_notify_stop_tor);
 		
 		mNotifyBuilder.setOngoing(isOngoing);
 		
-- 
1.8.3.2


From 26b6efb4bc0a7852c1c77e3808777cad3c4fe15e Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 19:43:20 +0530
Subject: [PATCH 48/49] small icon height fixed, if made fill parent , it
 expands on expanding the notification

---
 res/layout/layout_notification.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index 723e6e0..d43f022 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -8,7 +8,7 @@
 	<FrameLayout 
 	    android:id="@+id/notification_frame"
 		android:layout_width="64dp"
-        android:layout_height="fill_parent"
+        android:layout_height="64dp" 
 	    >
     <ImageView
         android:id="@+id/notification_image"
-- 
1.8.3.2


From 3b1e66da3c1538f7e123f80f2aea0d84a0205d17 Mon Sep 17 00:00:00 2001
From: amoghbl1 <amoghbl1@gmail.com>
Date: Thu, 16 Jan 2014 20:40:24 +0530
Subject: [PATCH 49/49] notification layout added

---
 res/layout/layout_expanded_notification.xml        | 52 ++++++++++++++++++++++
 res/layout/layout_notification.xml                 |  2 +-
 src/org/torproject/android/service/TorService.java |  7 ++-
 3 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 res/layout/layout_expanded_notification.xml

diff --git a/res/layout/layout_expanded_notification.xml b/res/layout/layout_expanded_notification.xml
new file mode 100644
index 0000000..b044d25
--- /dev/null
+++ b/res/layout/layout_expanded_notification.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/custom_notification"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="left" >
+    
+	<FrameLayout 
+	    android:id="@+id/notification_frame"
+		android:layout_width="64dp"
+        android:layout_height="64dp"
+	    >
+    <ImageView
+        android:id="@+id/notification_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+    />
+	</FrameLayout>   
+    <TextView 
+        android:id="@+id/notification_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_frame"
+        android:paddingLeft="5dp"
+        style="@style/NotificationTitle"
+    />
+
+    <TextView
+        android:id="@+id/notification_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/notification_frame"
+        android:layout_below="@+id/notification_title"
+        android:paddingLeft="5dp"
+        style="@style/NotificationText"
+    />
+    <Button 
+        android:id="@+id/test"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="this is a test buttonn"
+        android:layout_below="@+id/notification_frame"
+        ></Button>
+    <Button 
+        android:id="@+id/test1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="this is a test buttonn"
+        android:layout_below="@+id/test"
+        ></Button>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/layout_notification.xml b/res/layout/layout_notification.xml
index d43f022..d1aa1e2 100644
--- a/res/layout/layout_notification.xml
+++ b/res/layout/layout_notification.xml
@@ -8,7 +8,7 @@
 	<FrameLayout 
 	    android:id="@+id/notification_frame"
 		android:layout_width="64dp"
-        android:layout_height="64dp" 
+        android:layout_height="64dp"
 	    >
     <ImageView
         android:id="@+id/notification_image"
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index f79a5ad..4210aa4 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -203,6 +203,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
  	{
  		//This is the remote view that will be used for the notification
 		RemoteViews notificationView = new RemoteViews(getPackageName(),R.layout.layout_notification);
+		//This is the expanded remote view that will be used for the notification (to be used later)
+		// RemoteViews expandedNotificationView = new RemoteViews(getPackageName(),R.layout.layout_expanded_notification);		
+		
 		// Notification to be used if remote expanded view is used.
 		// Notification notification;
 		
@@ -242,17 +245,17 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		/*
 		notification = mNotifyBuilder.build();
-		notification.bigContentView = notificationView;
+		notification.bigContentView = expandedNotificationView;
 		
 		mNotificationManager.notify(
 					notifyId,
 					notification);
+		
 		*/
 		
 		mNotificationManager.notify(
 					notifyId,
 	    			mNotifyBuilder.build());
-			
 		
  	}
     
-- 
1.8.3.2