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

Commit 6d76430b authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'cm-14.0' of git://github.com/CyanogenMod/android_frameworks_base into HEAD 

Change-Id: I087c23ffefec05e8604cb306739d16effe9d677d
parents 15a87ff0 fc24ab3b

core/java/android/app/NotificationManager.java

+11 −5
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class NotificationManager 


    /** @hide */

    @IntDef({VISIBILITY_NO_OVERRIDE, IMPORTANCE_UNSPECIFIED, IMPORTANCE_NONE,

            IMPORTANCE_MIN, IMPORTANCE_LOW, IMPORTANCE_DEFAULT, IMPORTANCE_HIGH,

            IMPORTANCE_MIN, IMPORTANCE_VERY_LOW, IMPORTANCE_LOW, IMPORTANCE_DEFAULT, IMPORTANCE_HIGH,

            IMPORTANCE_MAX})

    @Retention(RetentionPolicy.SOURCE)

    public @interface Importance {}
@@ -208,27 +208,33 @@ public class NotificationManager 
     */

    public static final int IMPORTANCE_MIN = 1;



    /**

     * Very low notification importance: shows on the status bar, but never

     * on the lock screen and is not intrusive.

     */

    public static final int IMPORTANCE_VERY_LOW = 2;



    /**

     * Low notification importance: shows everywhere, but is not intrusive.

     */

    public static final int IMPORTANCE_LOW = 2;

    public static final int IMPORTANCE_LOW = 3;



    /**

     * Default notification importance: shows everywhere, allowed to makes noise,

     * but does not visually intrude.

     */

    public static final int IMPORTANCE_DEFAULT = 3;

    public static final int IMPORTANCE_DEFAULT = 4;



    /**

     * Higher notification importance: shows everywhere, allowed to makes noise and peek.

     */

    public static final int IMPORTANCE_HIGH = 4;

    public static final int IMPORTANCE_HIGH = 5;



    /**

     * Highest notification importance: shows everywhere, allowed to makes noise, peek, and

     * use full screen intents.

     */

    public static final int IMPORTANCE_MAX = 5;

    public static final int IMPORTANCE_MAX = 6;



    private static INotificationManager sService;

core/java/android/service/notification/NotificationListenerService.java

+10 −1
Original line number Diff line number Diff line
@@ -1038,6 +1038,13 @@ public abstract class NotificationListenerService extends Service { 
         */

        public static final int IMPORTANCE_MIN = NotificationManager.IMPORTANCE_MIN;



        /**

         * Very low notification importance: not on lock screen and not intrusive.

         *

         * @hide

         */

        public static final int IMPORTANCE_VERY_LOW = NotificationManager.IMPORTANCE_VERY_LOW;



        /**

         * Low notification importance: shows everywhere, but is not intrusive.

         *
@@ -1169,7 +1176,7 @@ public abstract class NotificationListenerService extends Service { 
                CharSequence explanation, String overrideGroupKey) {

            mKey = key;

            mRank = rank;

            mIsAmbient = importance < IMPORTANCE_LOW;

            mIsAmbient = importance < IMPORTANCE_VERY_LOW;

            mMatchesInterruptionFilter = matchesInterruptionFilter;

            mVisibilityOverride = visibilityOverride;

            mSuppressedVisualEffects = suppressedVisualEffects;
@@ -1189,6 +1196,8 @@ public abstract class NotificationListenerService extends Service { 
                    return "NONE";

                case IMPORTANCE_MIN:

                    return "MIN";

                case IMPORTANCE_VERY_LOW:

                    return "VERY_LOW";

                case IMPORTANCE_LOW:

                    return "LOW";

                case IMPORTANCE_DEFAULT:

packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml

0 → 100644
+28 −0
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.

-->

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

        android:width="20dp"

        android:height="17dp"

        android:viewportWidth="56.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M44,4V44h8V4h-8z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml

0 → 100644
+31 −0
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.

-->

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

        android:width="20dp"

        android:height="17dp"

        android:viewportWidth="56.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M44,4V44h8V4h-8z"/>

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M44,34V44h8V34h-8z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml

0 → 100644
+31 −0
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.

-->

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

        android:width="20dp"

        android:height="17dp"

        android:viewportWidth="56.0"

        android:viewportHeight="48.0">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M44,4V44h8V4h-8z"/>

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M44,24V44h8V24h-8z"/>

</vector>