Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ffc2407 authored by kmobs's avatar kmobs
Browse files

Bug fixes. Fixed the if checks for Succession 

Conflicts:
	core/java/android/app/NotificationManager.java
	core/java/android/provider/Settings.java
	services/java/com/android/server/NotificationManagerService.java
parent 682573ee

core/java/android/provider/Settings.java

+3 −3
Original line number Diff line number Diff line
@@ -1954,19 +1954,19 @@ public final class Settings { 
          * Pulse notifications in Sucession.  The value is boolean (1 or 0).

          * @hide

          */

         public static final String TRACKBALL_NOTIFICATION_SUCESSION = "trackball_notification_sucession";

         public static final String TRACKBALL_NOTIFICATION_SUCESSION = "trackball_sucession";



         /**

          * Pulse notifications in Sucession.  The value is boolean (1 or 0).

          * @hide

          */

         public static final String TRACKBALL_NOTIFICATION_RANDOM = "trackball_notification_random";

         public static final String TRACKBALL_NOTIFICATION_RANDOM = "trackball_random_colors";



         /**

          * Pulse notifications in Sucession.  The value is boolean (1 or 0).

          * @hide

          */

         public static final String TRACKBALL_NOTIFICATION_PULSE_ORDER = "trackball_notification_pulse_order";

         public static final String TRACKBALL_NOTIFICATION_PULSE_ORDER = "trackball_pulse_in_order";





        /**

services/java/com/android/server/NotificationManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ class NotificationManagerService extends INotificationManager.Stub 
	    hasLights = false;

        } else { 

		hasLights = true;

                if(mSucsession != 0) {

                if(mSucsession == 1) {

                        int n = mLights.size();

                        if (n > 0) {

                                int thisLight = n;
@@ -1246,12 +1246,12 @@ class NotificationManagerService extends INotificationManager.Stub 
            	}

            }



            if(mRandomColor != 0) {

            if(mRandomColor == 1) {

                //Lets make this intresting...

                Random generator = new Random();

                int x = generator.nextInt(colorList.length - 1);

                ledARGB = Color.parseColor(colorList[x]);

            } else if(mPulseAllColor != 0) {

            } else if(mPulseAllColor == 1) {

            	if(lastColor >= colorList.length)

            		lastColor = 1;

            	ledARGB = Color.parseColor(colorList[lastColor - 1]);
@@ -1260,7 +1260,7 @@ class NotificationManagerService extends INotificationManager.Stub 


            if (mNotificationPulseEnabled) {

                // pulse repeatedly

            	if((mSucsession != 0) || (mRandomColor != 0) || (mPulseAllColor != 0)) {

            	if((mSucsession == 1) || (mRandomColor == 1) || (mPulseAllColor == 1)) {

			/* Our wake lock information to keep us alive */

			if(powerWake == null) {

				PowerMan = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);