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

Commit ffa2badf authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Trackball/LED fixes:" into froyo

parents 0e0692f3 c43894ea

services/java/com/android/server/LightsService.java

+8 −8
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class LightsService { 


        public void notificationPulse(int color, int onMs, int offMs) {

            synchronized (this) {

			setLightLocked(color, LIGHT_FLASH_TIMED, onMs, 1000, BRIGHTNESS_MODE_USER);

                setLightLocked(color, LIGHT_FLASH_TIMED, onMs, offMs, BRIGHTNESS_MODE_USER);

                    mH.sendMessageDelayed(Message.obtain(mH, 1, this), onMs);

            }

        }
@@ -216,7 +216,7 @@ public class LightsService { 
        @Override

        public void handleMessage(Message msg) {

            Light light = (Light)msg.obj;

            light.stopFlashing();

            light.turnOff();

        }

    };

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

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.media.AudioManager; 
import android.net.Uri;

import android.os.BatteryManager;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;
@@ -1396,6 +1397,7 @@ class NotificationManagerService extends INotificationManager.Stub { 
    }



    private void updateRGBLightsLocked() {

        boolean SHOLES_DEVICE = Build.DEVICE.contains("sholes");

        int mPulseScreen = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.TRACKBALL_SCREEN_ON, 0);

        int mSuccession = Settings.System.getInt(mContext.getContentResolver(),
@@ -1413,6 +1415,10 @@ class NotificationManagerService extends INotificationManager.Stub { 
            mPulseAllColor = 0;

        }



        if (SHOLES_DEVICE) {

            mBlendColor = 0;

        }



        // Battery low always shows, other states only show if charging.

        if (mBatteryLow) {

            if (mBatteryCharging) {