frameworks/base: Battery and Notification Lights (21ad5e0c) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1202,6 +1202,13 @@ public class Notification implements Parcelable
		public static final int BADGE_ICON_LARGE = 2;
		private int mBadgeIcon = BADGE_ICON_NONE;

		/**
		* Used by light picker in Settings to force
		* notification lights on when screen is on
		* @hide
		*/
		public static final String EXTRA_FORCE_SHOW_LIGHTS = "android.forceShowLights";

		/**
		* Structure to encapsulate a named action that can be shown as part of this notification.
		* It must include an icon, a label, and a {@link PendingIntent} to be fired when the action is

services/core/java/com/android/server/BatteryService.java

+42 −22

Original line number	Diff line number	Diff line
		@@ -55,6 +55,9 @@ import android.util.EventLog;
		import android.util.Slog;
		import android.util.proto.ProtoOutputStream;

		import org.lineageos.internal.notification.LedValues;
		import org.lineageos.internal.notification.LineageBatteryLights;

		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileOutputStream;
		@@ -156,6 +159,8 @@ public final class BatteryService extends SystemService {

		private ActivityManagerInternal mActivityManagerInternal;

		private LineageBatteryLights mLineageBatteryLights;

		public BatteryService(Context context) {
		super(context);

		@@ -227,6 +232,16 @@ public final class BatteryService extends SystemService {
		false, obs, UserHandle.USER_ALL);
		updateBatteryWarningLevelLocked();
		}
		} else if (phase == PHASE_BOOT_COMPLETED) {
		mLineageBatteryLights = new LineageBatteryLights(mContext,
		new LineageBatteryLights.LedUpdater() {
		public void update() {
		updateLedPulse();
		}
		});

		// Update light state now that mLineageBatteryLights has been initialized.
		updateLedPulse();
		}
		}

		@@ -878,6 +893,10 @@ public final class BatteryService extends SystemService {
		proto.flush();
		}

		private synchronized void updateLedPulse() {
		mLed.updateLightsLocked();
		}

		private final class Led {
		private final Light mBatteryLight;

		@@ -906,29 +925,30 @@ public final class BatteryService extends SystemService {
		* Synchronize on BatteryService.
		*/
		public void updateLightsLocked() {
		final int level = mBatteryProps.batteryLevel;
		final int status = mBatteryProps.batteryStatus;
		if (level < mLowBatteryWarningLevel) {
		if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
		// Solid red when battery is charging
		mBatteryLight.setColor(mBatteryLowARGB);
		} else {
		// Flash red when battery is low and not charging
		mBatteryLight.setFlashing(mBatteryLowARGB, Light.LIGHT_FLASH_TIMED,
		mBatteryLedOn, mBatteryLedOff);
		}
		} else if (status == BatteryManager.BATTERY_STATUS_CHARGING
		\|\| status == BatteryManager.BATTERY_STATUS_FULL) {
		if (status == BatteryManager.BATTERY_STATUS_FULL \|\| level >= 90) {
		// Solid green when full or charging and nearly full
		mBatteryLight.setColor(mBatteryFullARGB);
		} else {
		// Solid orange when charging and halfway full
		mBatteryLight.setColor(mBatteryMediumARGB);
		// mBatteryProps could be null on startup (called by SettingsObserver)
		if (mBatteryProps == null) {
		Slog.w(TAG, "updateLightsLocked: mBatteryProps is null; skipping");
		return;
		}
		} else {
		// No lights if not charging and not low
		// mLineageBatteryLights is initialized during PHASE_BOOT_COMPLETED
		// This means we don't have Lineage battery settings yet so skip.
		if (mLineageBatteryLights == null) {
		Slog.w(TAG, "updateLightsLocked: mLineageBatteryLights is not yet ready; skipping");
		return;
		}

		LedValues ledValues = new LedValues(0 /* color */, mBatteryLedOn, mBatteryLedOff);
		mLineageBatteryLights.calcLights(ledValues,
		mBatteryProps.batteryLevel, mBatteryProps.batteryStatus,
		mBatteryProps.batteryLevel <= mLowBatteryWarningLevel);

		if (!ledValues.isEnabled()) {
		mBatteryLight.turnOff();
		} else if (ledValues.isPulsed()) {
		mBatteryLight.setFlashing(ledValues.getColor(), Light.LIGHT_FLASH_TIMED,
		ledValues.getOnMs(), ledValues.getOffMs());
		} else {
		mBatteryLight.setColor(ledValues.getColor());
		}
		}
		}

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

+54 −13

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		* Copyright (C) 2015 The CyanogenMod Project
		* Copyright (C) 2017 The LineageOS Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -172,6 +174,9 @@ import com.android.server.policy.PhoneWindowManager;
		import com.android.server.statusbar.StatusBarManagerInternal;
		import com.android.server.notification.ManagedServices.UserProfiles;

		import org.lineageos.internal.notification.LedValues;
		import org.lineageos.internal.notification.LineageNotificationLights;

		import libcore.io.IoUtils;

		import org.json.JSONException;
		@@ -358,6 +363,8 @@ public class NotificationManagerService extends SystemService {
		private GroupHelper mGroupHelper;
		private boolean mIsTelevision;

		private LineageNotificationLights mLineageNotificationLights;

		private static class Archive {
		final int mBufferSize;
		final ArrayDeque<StatusBarNotification> mBuffer;
		@@ -725,9 +732,12 @@ public class NotificationManagerService extends SystemService {
		@GuardedBy("mNotificationLock")
		private void clearLightsLocked() {
		// light
		// clear only if lockscreen is not active
		if (!mLineageNotificationLights.isKeyguardLocked()) {
		mLights.clear();
		updateLightsLocked();
		}
		}

		private final BroadcastReceiver mNotificationTimeoutReceiver = new BroadcastReceiver() {
		@Override
		@@ -894,7 +904,10 @@ public class NotificationManagerService extends SystemService {
		}
		} else if (action.equals(Intent.ACTION_USER_PRESENT)) {
		// turn off LED when user passes through lock screen
		// if lights with screen on is disabled.
		if (!mLineageNotificationLights.showLightsScreenOn()) {
		mNotificationLight.turnOff();
		}
		} else if (action.equals(Intent.ACTION_USER_SWITCHED)) {
		final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
		// reload per-user settings
		@@ -1280,6 +1293,13 @@ public class NotificationManagerService extends SystemService {
		timeoutFilter.addDataScheme(SCHEME_TIMEOUT);
		getContext().registerReceiver(mNotificationTimeoutReceiver, timeoutFilter);

		mLineageNotificationLights = new LineageNotificationLights(getContext(),
		new LineageNotificationLights.LedUpdater() {
		public void update() {
		updateNotificationPulse();
		}
		});

		publishBinderService(Context.NOTIFICATION_SERVICE, mService);
		publishLocalService(NotificationManagerInternal.class, mInternalService);
		}
		@@ -3805,9 +3825,8 @@ public class NotificationManagerService extends SystemService {
		// light
		// release the light
		boolean wasShowLights = mLights.remove(key);
		if (record.getLight() != null && aboveThreshold
		&& ((record.getSuppressedVisualEffects()
		& NotificationListenerService.SUPPRESSED_EFFECT_SCREEN_OFF) == 0)) {
		if (record.getLight() != null
		&& (aboveThreshold \|\| isLedNotificationForcedOn(record))) {
		mLights.add(key);
		updateLightsLocked();
		if (mUseAttentionLight) {
		@@ -4713,17 +4732,39 @@ public class NotificationManagerService extends SystemService {
		}
		}

		// Don't flash while we are in a call or screen is on
		if (ledNotification == null \|\| mInCall \|\| mScreenOn) {
		NotificationRecord.Light light = ledNotification != null ?
		ledNotification.getLight() : null;
		if (ledNotification == null \|\| mLineageNotificationLights == null \|\|
		light == null \|\| !mNotificationPulseEnabled) {
		mNotificationLight.turnOff();
		return;
		}

		LedValues ledValues = new LedValues(light.color, light.onMs, light.offMs);
		final String packageName = ledNotification.sbn.getPackageName();
		final boolean defaultLights =
		(ledNotification.sbn.getNotification().defaults
		& Notification.DEFAULT_LIGHTS) != 0;
		mLineageNotificationLights.calcLights(ledValues, packageName,
		isLedNotificationForcedOn(ledNotification), mScreenOn,
		mInCall, defaultLights, ledNotification.getSuppressedVisualEffects());

		if (!ledValues.isEnabled()) {
		mNotificationLight.turnOff();
		} else {
		NotificationRecord.Light light = ledNotification.getLight();
		if (light != null && mNotificationPulseEnabled) {
		// pulse repeatedly
		mNotificationLight.setFlashing(light.color, Light.LIGHT_FLASH_TIMED,
		light.onMs, light.offMs);
		mNotificationLight.setFlashing(ledValues.getColor(), Light.LIGHT_FLASH_TIMED,
		ledValues.getOnMs(), ledValues.getOffMs());
		}
		}

		private boolean isLedNotificationForcedOn(NotificationRecord nr) {
		if (nr != null) {
		final Notification n = nr.sbn.getNotification();
		if (n.extras != null) {
		return n.extras.getBoolean(Notification.EXTRA_FORCE_SHOW_LIGHTS, false);
		}
		}
		return false;
		}

		@GuardedBy("mNotificationLock")