newNotification.patch

project.properties
8	8	# project structure.
9	9
10	10	# Project target.
11		target=android-19
	11	target=android-18
12	12	android.library.reference.1=external/ActionBarSherlock/actionbarsherlock

     <?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>
+    -

     <?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>
+    -

res/values-v9/styles.xml
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<resources>
	3	<style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
	4	<style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
	5	</resources>
0		-

     <?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>

     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;
-...
     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
+    {
-...
     		//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)
-...
     				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;
+    	}
+    -

     		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);
+    	}
+    -

     		notification.flags |= Notification.FLAG_NO_CLEAR;
     		mNotificationManager.notify(NOTIFICATION_ID, notification);
     		mNotificationManager.notify(NOTIFY_ID, notification);
+    	}
+    -

         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"
         />
-...
             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>

     		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;
+    -

             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>

     		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;
+    -

     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;
-...
     		//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)
-...
     				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);
+    -

     		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);
-...
     		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;
+    -

     		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);
-...
+    				{
     					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);
+    				}
-...
     				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;
+    -

     				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);
+    	}
+    -

         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"
-...
             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>
+    -

             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/notification_title"
         />
         <TextView
             android:id="@+id/notification_title"
             android:layout_width="wrap_content"
+    -

     				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);
-...
     				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,
+    -

             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"
         />
-...
             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"
         />
+    -

         <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
+    -

         <ImageView
             android:id="@+id/notification_image"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_width="48dp"
             android:layout_height="48dp"
         />
         <TextView
+    -

         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"
         />
-...
             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"
         />
+    -

     	<FrameLayout
     	    android:id="@+id/notification_frame"
     		android:layout_width="65dp"
     		android:layout_width="64dp"
             android:layout_height="fill_parent"
+    	    >
         <ImageView

     				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,
+    -

     				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,
+    -

src/org/torproject/android/service/NotificationHandler.java
	1	package org.torproject.android.service;
	2
	3	public class NotificationHandler {
	4
	5	}

     				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,
+    -

           	<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"
+    -

     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);
+    	}
+    }
+    -

     	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
+    -

src/org/torproject/android/service/NotificationHandler.java
11	11	protected void onCreate(Bundle savedInstanceState) {
12	12	// TODO Auto-generated method stub
13	13	super.onCreate(savedInstanceState);
14		setContentView(R.layout.layout_main);
	14
15	15	}
16	16	}
17		-

     		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)
+    -

+    			}
+    		}
     	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) {
+    -

     			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)
+    -

     			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);
+    		}
+    -

     			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);
+    		}
+    -

      	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)
+    		{
-...
     			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);
-...
     			mNotifyBuilder.setContentIntent(pendIntent);
+    		}
     		mNotifyBuilder.setContentText(notifyMsg);
     		mNotifyBuilder.setSmallIcon(icon);
     		mNotifyBuilder.setOngoing(isOngoing);
+    -

+    		}
     		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)
+    -

             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"
         />
-...
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/notification_frame"
             android:layout_below="@+id/notification_title"
             android:paddingLeft="5dp"
             style="@style/NotificationText"
         />

     			mNotifyBuilder.setLights(Color.GREEN, 1000, 1000);
+    		}
     		mNotifyBuilder.setContent(notificationView);
     		mNotificationManager.notify(
     					notifyId,
+    -

Core Apps » Orbot