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

Commit 86c3de81 authored by John Spurlock's avatar John Spurlock
Browse files

PowerUI: Remove the fallback dialogs. 

- Low battery notifications are now always notifications, even
  if not HUNs.
- Remove obsolete dialogs used only as HUN fallbacks.
- Extend the default HUN timeout to 10 seconds and remove the
  ongoing hack for the warning notification.

Bug:17070231
Change-Id: I29069c3d90dcca6f9bce512e5a0ccbd983704de5
parent fe9c0a58

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
    <bool name="config_show4GForLTE">true</bool>



    <!-- milliseconds before the heads up notification auto-dismisses. -->

    <integer name="heads_up_notification_decay">3700</integer>

    <integer name="heads_up_notification_decay">10000</integer>



    <!-- milliseconds before the heads up notification accepts touches. -->

    <integer name="heads_up_sensitivity_delay">700</integer>

packages/SystemUI/src/com/android/systemui/power/PowerDialogWarnings.java

deleted100644 → 0
+0 −219
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.power;



import android.app.AlertDialog;

import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.media.AudioManager;

import android.media.Ringtone;

import android.media.RingtoneManager;

import android.net.Uri;

import android.os.SystemClock;

import android.provider.Settings;

import android.util.Slog;

import android.view.ContextThemeWrapper;

import android.view.WindowManager;



import com.android.systemui.R;

import com.android.systemui.statusbar.phone.PhoneStatusBar;



import java.io.PrintWriter;



public class PowerDialogWarnings implements PowerUI.WarningsUI {

    private static final String TAG = PowerUI.TAG + ".Dialog";

    private static final boolean DEBUG = PowerUI.DEBUG;



    private final Context mContext;

    private final PhoneStatusBar mPhoneStatusBar;



    private int mBatteryLevel;

    private int mBucket;

    private long mScreenOffTime;

    private boolean mSaver;



    private AlertDialog mInvalidChargerDialog;

    private AlertDialog mLowBatteryDialog;



    public PowerDialogWarnings(Context context, PhoneStatusBar phoneStatusBar) {

        mContext = new ContextThemeWrapper(context, android.R.style.Theme_DeviceDefault_Light);

        mPhoneStatusBar = phoneStatusBar;

    }



    @Override

    public void dump(PrintWriter pw) {

        pw.print("mInvalidChargerDialog=");

        pw.println(mInvalidChargerDialog == null ? "null" : mInvalidChargerDialog.toString());

        pw.print("mLowBatteryDialog=");

        pw.println(mLowBatteryDialog == null ? "null" : mLowBatteryDialog.toString());

    }



    @Override

    public void update(int batteryLevel, int bucket, long screenOffTime) {

        mBatteryLevel = batteryLevel;

        mBucket = bucket;

        mScreenOffTime = screenOffTime;

    }



    @Override

    public boolean isInvalidChargerWarningShowing() {

        return mInvalidChargerDialog != null;

    }



    @Override

    public void updateLowBatteryWarning() {

        if (mLowBatteryDialog != null) {

            showLowBatteryWarning(false /*playSound*/);

        }

    }



    @Override

    public void dismissLowBatteryWarning() {

        if (mLowBatteryDialog != null) {

            Slog.i(TAG, "closing low battery warning: level=" + mBatteryLevel);

            mLowBatteryDialog.dismiss();

        }

    }



    @Override

    public void showLowBatteryWarning(boolean playSound) {

        Slog.i(TAG,

                ((mLowBatteryDialog == null) ? "showing" : "updating")

                + " low battery warning: level=" + mBatteryLevel

                + " [" + mBucket + "]");



        final int textRes = mSaver ? R.string.battery_low_percent_format_saver_started

                : R.string.battery_low_percent_format;

        final CharSequence levelText = mContext.getString(textRes, mBatteryLevel);



        if (mLowBatteryDialog != null) {

            mLowBatteryDialog.setMessage(levelText);

        } else {

            AlertDialog.Builder b = new AlertDialog.Builder(mContext);

            b.setCancelable(true);

            b.setTitle(R.string.battery_low_title);

            b.setMessage(levelText);

            b.setPositiveButton(android.R.string.ok, null);



            final Intent intent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY);

            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                    | Intent.FLAG_ACTIVITY_MULTIPLE_TASK

                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS

                    | Intent.FLAG_ACTIVITY_NO_HISTORY);

            if (intent.resolveActivity(mContext.getPackageManager()) != null) {

                b.setNegativeButton(R.string.battery_low_why,

                        new DialogInterface.OnClickListener() {

                    @Override

                    public void onClick(DialogInterface dialog, int which) {

                        mPhoneStatusBar.startActivity(intent, true /* dismissShade */);

                        dismissLowBatteryWarning();

                    }

                });

            }



            AlertDialog d = b.create();

            d.setOnDismissListener(new DialogInterface.OnDismissListener() {

                    @Override

                    public void onDismiss(DialogInterface dialog) {

                        mLowBatteryDialog = null;

                    }

                });

            d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);

            d.getWindow().getAttributes().privateFlags |=

                    WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

            d.show();

            mLowBatteryDialog = d;

            if (playSound) {

                playLowBatterySound();

            }

        }

    }



    private void playLowBatterySound() {

        final ContentResolver cr = mContext.getContentResolver();



        final int silenceAfter = Settings.Global.getInt(cr,

                Settings.Global.LOW_BATTERY_SOUND_TIMEOUT, 0);

        final long offTime = SystemClock.elapsedRealtime() - mScreenOffTime;

        if (silenceAfter > 0

                && mScreenOffTime > 0

                && offTime > silenceAfter) {

            Slog.i(TAG, "screen off too long (" + offTime + "ms, limit " + silenceAfter

                    + "ms): not waking up the user with low battery sound");

            return;

        }



        if (DEBUG) {

            Slog.d(TAG, "playing low battery sound. pick-a-doop!"); // WOMP-WOMP is deprecated

        }



        if (Settings.Global.getInt(cr, Settings.Global.POWER_SOUNDS_ENABLED, 1) == 1) {

            final String soundPath = Settings.Global.getString(cr,

                    Settings.Global.LOW_BATTERY_SOUND);

            if (soundPath != null) {

                final Uri soundUri = Uri.parse("file://" + soundPath);

                if (soundUri != null) {

                    final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);

                    if (sfx != null) {

                        sfx.setStreamType(AudioManager.STREAM_SYSTEM);

                        sfx.play();

                    }

                }

            }

        }

    }



    @Override

    public void dismissInvalidChargerWarning() {

        if (mInvalidChargerDialog != null) {

            mInvalidChargerDialog.dismiss();

        }

    }



    @Override

    public void showInvalidChargerWarning() {

        Slog.d(TAG, "showing invalid charger dialog");



        dismissLowBatteryWarning();



        AlertDialog.Builder b = new AlertDialog.Builder(mContext);

        b.setCancelable(true);

        b.setTitle(R.string.invalid_charger_title);

        b.setMessage(R.string.invalid_charger_text);

        b.setPositiveButton(android.R.string.ok, null);



        AlertDialog d = b.create();

            d.setOnDismissListener(new DialogInterface.OnDismissListener() {

                    public void onDismiss(DialogInterface dialog) {

                        mInvalidChargerDialog = null;

                    }

                });



        d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);

        d.getWindow().getAttributes().privateFlags |=

                WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

        d.show();

        mInvalidChargerDialog = d;

    }



    @Override

    public void showSaverMode(boolean mode) {

        mSaver = mode;

    }

}

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+3 −32
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 


    private static final String TAG_NOTIFICATION = "low_battery";

    private static final int ID_NOTIFICATION = 100;

    private static final int AUTO_DISMISS_MS = 10000;



    private static final int SHOWING_NOTHING = 0;

    private static final int SHOWING_WARNING = 1;
@@ -62,8 +61,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        "SHOWING_INVALID_CHARGER",

    };



    private static final String ACTION_SHOW_FALLBACK_WARNING = "PNW.warningFallback";

    private static final String ACTION_SHOW_FALLBACK_CHARGER = "PNW.chargerFallback";

    private static final String ACTION_SHOW_BATTERY_SETTINGS = "PNW.batterySettings";

    private static final String ACTION_START_SAVER = "PNW.startSaver";

    private static final String ACTION_STOP_SAVER = "PNW.stopSaver";
@@ -76,7 +73,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    private final Context mContext;

    private final NotificationManager mNoMan;

    private final Handler mHandler = new Handler();

    private final PowerDialogWarnings mFallbackDialogs;

    private final Receiver mReceiver = new Receiver();

    private final Intent mOpenBatterySettings = settings(Intent.ACTION_POWER_USAGE_SUMMARY);

    private final Intent mOpenSaverSettings = settings(Settings.ACTION_BATTERY_SAVER_SETTINGS);
@@ -97,7 +93,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    public PowerNotificationWarnings(Context context, PhoneStatusBar phoneStatusBar) {

        mContext = context;

        mNoMan = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

        mFallbackDialogs = new PowerDialogWarnings(context, phoneStatusBar);

        mReceiver.init();

    }
@@ -121,7 +116,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        }

        mBucket = bucket;

        mScreenOffTime = screenOffTime;

        mFallbackDialogs.update(batteryLevel, bucket, screenOffTime);

    }



    @Override
@@ -134,8 +128,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    }



    private void updateNotification() {

        if (DEBUG) Slog.d(TAG, "updateNotification mWarning=" + mWarning

                + " mSaver=" + mSaver + " mInvalidCharger=" + mInvalidCharger);

        if (DEBUG) Slog.d(TAG, "updateNotification mWarning=" + mWarning + " mPlaySound="

                + mPlaySound + " mSaver=" + mSaver + " mInvalidCharger=" + mInvalidCharger);

        if (mInvalidCharger) {

            showInvalidChargerNotification();

            mShowing = SHOWING_INVALID_CHARGER;
@@ -162,7 +156,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                .setPriority(Notification.PRIORITY_MAX)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setVisibility(Notification.VISIBILITY_PUBLIC)

                .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_CHARGER), true)

                .setColor(mContext.getResources().getColor(

                        com.android.internal.R.color.system_notification_accent_color));

        final Notification n = nb.build();
@@ -182,12 +175,10 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                .setShowWhen(false)

                .setContentTitle(mContext.getString(R.string.battery_low_title))

                .setContentText(mContext.getString(textRes, mBatteryLevel))

                .setOngoing(true)

                .setOnlyAlertOnce(true)

                .setPriority(Notification.PRIORITY_MAX)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setVisibility(Notification.VISIBILITY_PUBLIC)

                .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_WARNING), true)

                .setColor(mContext.getResources().getColor(

                        com.android.internal.R.color.battery_saver_mode_color));

        if (hasBatterySettings()) {
@@ -266,14 +257,12 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    @Override

    public void updateLowBatteryWarning() {

        updateNotification();

        mFallbackDialogs.updateLowBatteryWarning();

    }



    @Override

    public void dismissLowBatteryWarning() {

        if (DEBUG) Slog.d(TAG, "dismissing low battery warning: level=" + mBatteryLevel);

        dismissLowBatteryNotification();

        mFallbackDialogs.dismissLowBatteryWarning();

    }



    private void dismissLowBatteryNotification() {
@@ -298,8 +287,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        mPlaySound = playSound;

        mWarning = true;

        updateNotification();

        mHandler.removeCallbacks(mDismissLowBatteryNotification);

        mHandler.postDelayed(mDismissLowBatteryNotification, AUTO_DISMISS_MS);

    }



    private void attachLowBatterySound(Notification.Builder b) {
@@ -336,7 +323,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    @Override

    public void dismissInvalidChargerWarning() {

        dismissInvalidChargerNotification();

        mFallbackDialogs.dismissInvalidChargerWarning();

    }



    private void dismissInvalidChargerNotification() {
@@ -378,8 +364,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 


        public void init() {

            IntentFilter filter = new IntentFilter();

            filter.addAction(ACTION_SHOW_FALLBACK_WARNING);

            filter.addAction(ACTION_SHOW_FALLBACK_CHARGER);

            filter.addAction(ACTION_SHOW_BATTERY_SETTINGS);

            filter.addAction(ACTION_START_SAVER);

            filter.addAction(ACTION_STOP_SAVER);
@@ -390,13 +374,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        public void onReceive(Context context, Intent intent) {

            final String action = intent.getAction();

            Slog.i(TAG, "Received " + action);

            if (action.equals(ACTION_SHOW_FALLBACK_WARNING)) {

                dismissLowBatteryNotification();

                mFallbackDialogs.showLowBatteryWarning(false /*playSound*/);

            } else if (action.equals(ACTION_SHOW_FALLBACK_CHARGER)) {

                dismissInvalidChargerNotification();

                mFallbackDialogs.showInvalidChargerWarning();

            } else if (action.equals(ACTION_SHOW_BATTERY_SETTINGS)) {

            if (action.equals(ACTION_SHOW_BATTERY_SETTINGS)) {

                dismissLowBatteryNotification();

                mContext.startActivityAsUser(mOpenBatterySettings, UserHandle.CURRENT);

            } else if (action.equals(ACTION_START_SAVER)) {
@@ -421,11 +399,4 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
            });

        }

    };



    private final Runnable mDismissLowBatteryNotification = new Runnable() {

        @Override

        public void run() {

            dismissLowBatteryNotification();

        }

    };

}