Skip to content

Battery Fully Charged Notification Re-Enable #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pinnamanivenkat wants to merge 4 commits into
base: 7.1
Choose a base branch
from
Open

Battery Fully Charged Notification Re-Enable #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbe4872
[1/4] Battery Fully Charged Notification [1/4]
pinnamanivenkat Jun 23, 2017
c7e5201
[2/4] Battery Fully Charged Notification [2/4]
pinnamanivenkat Jun 23, 2017
f76fa5f
[3/4] Battery Fully Charged Notification [3/4]
pinnamanivenkat Jun 23, 2017
e23f830
[4/4] Battery Fully Charged Notification [4/4]
pinnamanivenkat Jun 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/res/res/values/cm_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@
<!-- Protected Apps Notification -->
<string name="notify_package_component_protected_title">Activity launch blocked</string>
<string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> is protected from being launched. Tap to authenticate and launch the application.</string>

<!-- Battery fully charged notification -->
<string name="notify_battery_fully_charged_title">Battery fully charged</string>
<string name="notify_battery_fully_charged_text">Disconnect your device from the charger to improve battery longevity.</string>

<!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
<string name="lock_to_app_toast_no_navbar">To unpin this screen, touch and hold the Back button.</string>
Expand Down
5 changes: 5 additions & 0 deletions core/res/res/values/cm_symbols.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
<java-symbol type="string" name="tethered_notification_no_device_message" />
<java-symbol type="string" name="tethered_notification_one_device_message" />
<java-symbol type="string" name="tethered_notification_multi_device_message" />

<!-- Show battery fully charged notification -->
<java-symbol type="bool" name="config_showBatteryFullyChargedNotification" />
<java-symbol type="string" name="notify_battery_fully_charged_title" />
<java-symbol type="string" name="notify_battery_fully_charged_text" />

<!-- Whether notify fingerprint client of successful cancelled authentication -->
<java-symbol type="bool" name="config_notifyClientOnFingerprintCancelSuccess" />
Expand Down
3 changes: 3 additions & 0 deletions core/res/res/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2951,4 +2951,7 @@

<!-- Whether notify fingerprint client of successful cancelled authentication -->
<bool name="config_notifyClientOnFingerprintCancelSuccess">false</bool>

<!-- Show battery fully charged notification -->
<bool name="config_showBatteryFullyChargedNotification">false</bool>
</resources>
64 changes: 64 additions & 0 deletions services/core/java/com/android/server/BatteryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
import com.android.server.lights.LightsManager;

import android.app.ActivityManagerNative;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
Expand Down Expand Up @@ -172,6 +174,9 @@ public final class BatteryService extends SystemService {
private boolean mMultiColorLed;

private boolean mSentLowBatteryBroadcast = false;

private boolean mShowBatteryFullyChargedNotification;
private boolean mIsShowingBatteryFullyChargedNotification;

private final int mVbattSamplingIntervalMsec = 30000; /* sampling frequency - 30 seconds */
private final int mWeakChgCutoffVoltageMv;
Expand Down Expand Up @@ -222,6 +227,9 @@ public BatteryService(Context context) {
com.android.internal.R.integer.config_lowBatteryCloseWarningBump);
mShutdownBatteryTemperature = mContext.getResources().getInteger(
com.android.internal.R.integer.config_shutdownBatteryTemperature);

mShowBatteryFullyChargedNotification = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_showBatteryFullyChargedNotification);

// watch for invalid charger messages if the invalid_charger switch exists
if (new File("/sys/devices/virtual/switch/invalid_charger/state").exists()) {
Expand Down Expand Up @@ -624,6 +632,12 @@ public void run() {

// Update the battery LED
mLed.updateLightsLocked();

if (shouldShowBatteryFullyChargedNotificationLocked()) {
showBatteryFullyChargedNotificationLocked();
} else if (shouldClearBatteryFullyChargedNotificationLocked()) {
clearBatteryFullyChargedNotificationLocked();
}

// This needs to be done after sendIntent() so that we get the lastest battery stats.
if (logOutlier && dischargeDuration != 0) {
Expand Down Expand Up @@ -931,6 +945,56 @@ private void dumpInternal(FileDescriptor fd, PrintWriter pw, String[] args) {

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

private boolean shouldShowBatteryFullyChargedNotificationLocked() {
return mShowBatteryFullyChargedNotification && mPlugType != 0
&& mBatteryProps.batteryLevel == BATTERY_SCALE
&& !mIsShowingBatteryFullyChargedNotification;
}

private void showBatteryFullyChargedNotificationLocked() {
NotificationManager nm = mContext.getSystemService(NotificationManager.class);
Intent intent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY);
PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0,
intent, 0, null, UserHandle.CURRENT);

CharSequence title = mContext.getText(
com.android.internal.R.string.notify_battery_fully_charged_title);
CharSequence message = mContext.getText(
com.android.internal.R.string.notify_battery_fully_charged_text);

Notification notification = new Notification.Builder(mContext)
.setSmallIcon(com.android.internal.R.drawable.stat_sys_battery_charge)
.setWhen(0)
.setOngoing(false)
.setAutoCancel(true)
.setTicker(title)
.setDefaults(0) // please be quiet
.setPriority(Notification.PRIORITY_DEFAULT)
.setColor(mContext.getColor(
com.android.internal.R.color.system_notification_accent_color))
.setContentTitle(title)
.setContentText(message)
.setStyle(new Notification.BigTextStyle().bigText(message))
.setContentIntent(pi)
.setVisibility(Notification.VISIBILITY_PUBLIC)
.build();

nm.notifyAsUser(null, com.android.internal.R.string.notify_battery_fully_charged_title,
notification, UserHandle.ALL);
mIsShowingBatteryFullyChargedNotification = true;
}

private boolean shouldClearBatteryFullyChargedNotificationLocked() {
return mIsShowingBatteryFullyChargedNotification &&
(mPlugType == 0 || mBatteryProps.batteryLevel < BATTERY_SCALE);
}

private void clearBatteryFullyChargedNotificationLocked() {
NotificationManager nm = mContext.getSystemService(NotificationManager.class);
nm.cancel(com.android.internal.R.string.notify_battery_fully_charged_title);
mIsShowingBatteryFullyChargedNotification = false;
}

private final class Led {
Expand Down