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

Commit 0c7631f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev 

* changes:
  Added alert icon to high temp dialog.
  Add VR mode check for thermal notification
  Show notif when device reaches throttling temp
parents da8462aa bd4eeb72

packages/SystemUI/res/drawable/ic_device_thermostat_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2016 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M15,13L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v8c-1.21,0.91 -2,2.37 -2,4 0,2.76 2.24,5 5,5s5,-2.24 5,-5c0,-1.63 -0.79,-3.09 -2,-4zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1h-1v1h1v2h-1v1h1v2h-2L11,5z"/>

</vector>

packages/SystemUI/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -284,4 +284,6 @@ 


    <bool name="quick_settings_show_full_alarm">false</bool>



    <bool name="config_showTemperatureWarning">false</bool>



</resources>

packages/SystemUI/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
    <item type="id" name="notification_screenshot"/>

    <item type="id" name="notification_hidden"/>

    <item type="id" name="notification_volumeui"/>

    <item type="id" name="notification_temperature"/>

    <item type="id" name="transformation_start_x_tag"/>

    <item type="id" name="transformation_start_y_tag"/>

    <item type="id" name="transformation_start_scale_x_tag"/>

packages/SystemUI/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -1694,4 +1694,12 @@ 
    <!-- Label that replaces other notification controls when the notification is from the system

         and cannot be silenced (see @string/show_silently) or blocked (see @string/block) -->

    <string name="cant_silence_or_block">Notifications can\'t be silenced or blocked</string>



    <!-- Title for notification (and dialog) that user's phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=30] -->

    <string name="high_temp_title">Phone is getting warm</string>

    <!-- Message body for notification that user's phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=70] -->

    <string name="high_temp_notif_message">Some features limited while phone cools down</string>

    <!-- Text body for dialog alerting user that their phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=300] -->

    <string name="high_temp_dialog_message">Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally.</string>



</resources>

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

+67 −9
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    private static final String TAG = PowerUI.TAG + ".Notification";

    private static final boolean DEBUG = PowerUI.DEBUG;



    private static final String TAG_NOTIFICATION = "low_battery";

    private static final String TAG_NOTIFICATION_BATTERY = "low_battery";

    private static final String TAG_NOTIFICATION_TEMPERATURE = "high_temp";



    private static final int SHOWING_NOTHING = 0;

    private static final int SHOWING_WARNING = 1;
@@ -64,6 +65,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    private static final String ACTION_SHOW_BATTERY_SETTINGS = "PNW.batterySettings";

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

    private static final String ACTION_DISMISSED_WARNING = "PNW.dismissedWarning";

    private static final String ACTION_CLICKED_TEMP_WARNING = "PNW.clickedTempWarning";

    private static final String ACTION_DISMISSED_TEMP_WARNING = "PNW.dismissedTempWarning";



    private static final AudioAttributes AUDIO_ATTRIBUTES = new AudioAttributes.Builder()

            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -88,6 +91,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
    private boolean mPlaySound;

    private boolean mInvalidCharger;

    private SystemUIDialog mSaverConfirmation;

    private boolean mTempWarning;

    private SystemUIDialog mHighTempDialog;



    public PowerNotificationWarnings(Context context, PhoneStatusBar phoneStatusBar) {

        mContext = context;
@@ -103,6 +108,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        pw.print("mInvalidCharger="); pw.println(mInvalidCharger);

        pw.print("mShowing="); pw.println(SHOWING_STRINGS[mShowing]);

        pw.print("mSaverConfirmation="); pw.println(mSaverConfirmation != null ? "not null" : null);

        pw.print("mTempWarning="); pw.println(mTempWarning);

        pw.print("mHighTempDialog="); pw.println(mHighTempDialog != null ? "not null" : null);

    }



    @Override
@@ -127,7 +134,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
            showWarningNotification();

            mShowing = SHOWING_WARNING;

        } else {

            mNoMan.cancelAsUser(TAG_NOTIFICATION, R.id.notification_power, UserHandle.ALL);

            mNoMan.cancelAsUser(TAG_NOTIFICATION_BATTERY, R.id.notification_power, UserHandle.ALL);

            mShowing = SHOWING_NOTHING;

        }

    }
@@ -146,7 +153,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                        com.android.internal.R.color.system_notification_accent_color));

        SystemUI.overrideNotificationAppName(mContext, nb);

        final Notification n = nb.build();

        mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);

        mNoMan.notifyAsUser(TAG_NOTIFICATION_BATTERY, R.id.notification_power, n, UserHandle.ALL);

    }



    private void showWarningNotification() {
@@ -176,12 +183,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
            mPlaySound = false;

        }

        SystemUI.overrideNotificationAppName(mContext, nb);

        mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, nb.build(), UserHandle.ALL);

    }



    private PendingIntent pendingActivity(Intent intent) {

        return PendingIntent.getActivityAsUser(mContext,

                0, intent, 0, null, UserHandle.CURRENT);

        mNoMan.notifyAsUser(

                TAG_NOTIFICATION_BATTERY, R.id.notification_power, nb.build(), UserHandle.ALL);

    }



    private PendingIntent pendingBroadcast(String action) {
@@ -202,6 +205,54 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        return mInvalidCharger;

    }



    @Override

    public void dismissTemperatureWarning() {

        if (!mTempWarning) {

            return;

        }

        mTempWarning = false;

        mNoMan.cancelAsUser(

                TAG_NOTIFICATION_TEMPERATURE, R.id.notification_temperature, UserHandle.ALL);

    }



    @Override

    public void showTemperatureWarning() {

        if (mTempWarning) {

            return;

        }

        mTempWarning = true;

        final Notification.Builder nb = new Notification.Builder(mContext)

                .setSmallIcon(R.drawable.ic_device_thermostat_24)

                .setWhen(0)

                .setShowWhen(false)

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

                .setContentText(mContext.getString(R.string.high_temp_notif_message))

                .setPriority(Notification.PRIORITY_HIGH)

                .setVisibility(Notification.VISIBILITY_PUBLIC)

                .setContentIntent(pendingBroadcast(ACTION_CLICKED_TEMP_WARNING))

                .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_TEMP_WARNING))

                .setColor(mContext.getColor(

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

        SystemUI.overrideNotificationAppName(mContext, nb);

        final Notification n = nb.build();

        mNoMan.notifyAsUser(

                TAG_NOTIFICATION_TEMPERATURE, R.id.notification_temperature, n, UserHandle.ALL);



    }



    private void showTemperatureDialog() {

        if (mHighTempDialog != null) return;

        final SystemUIDialog d = new SystemUIDialog(mContext);

        d.setIconAttribute(android.R.attr.alertDialogIcon);

        d.setTitle(R.string.high_temp_title);

        d.setMessage(R.string.high_temp_dialog_message);

        d.setPositiveButton(com.android.internal.R.string.ok, null);

        d.setShowForAllUsers(true);

        d.setOnDismissListener(dialog -> mHighTempDialog = null);

        d.show();

        mHighTempDialog = d;

    }



    @Override

    public void updateLowBatteryWarning() {

        updateNotification();
@@ -315,6 +366,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
            filter.addAction(ACTION_SHOW_BATTERY_SETTINGS);

            filter.addAction(ACTION_START_SAVER);

            filter.addAction(ACTION_DISMISSED_WARNING);

            filter.addAction(ACTION_CLICKED_TEMP_WARNING);

            filter.addAction(ACTION_DISMISSED_TEMP_WARNING);

            mContext.registerReceiverAsUser(this, UserHandle.ALL, filter,

                    android.Manifest.permission.STATUS_BAR_SERVICE, mHandler);

        }
@@ -331,6 +384,11 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                showStartSaverConfirmation();

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

                dismissLowBatteryWarning();

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

                dismissTemperatureWarning();

                showTemperatureDialog();

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

                dismissTemperatureWarning();

            }

        }

    }