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

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

Merge "Tag foreground notis that use certain services"

parents f2da2e47 fc640011

core/java/android/app/Notification.java

+40 −0
Original line number Diff line number Diff line
@@ -360,6 +360,23 @@ public class Notification implements Parcelable 
    @Deprecated

    public RemoteViews headsUpContentView;



    private boolean mUsesStandardHeader;



    private static final ArraySet<Integer> STANDARD_LAYOUTS = new ArraySet<>();

    static {

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_base);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_base);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_picture);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_text);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_inbox);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_messaging);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_media);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_media);

        STANDARD_LAYOUTS.add(R.layout.notification_template_ambient_header);

        STANDARD_LAYOUTS.add(R.layout.notification_template_header);

        STANDARD_LAYOUTS.add(R.layout.notification_template_material_ambient);

    }



    /**

     * A large bitmap to be shown in the notification content area.

     *
@@ -2534,6 +2551,8 @@ public class Notification implements Parcelable 
        }



        parcel.writeInt(mGroupAlertBehavior);



        // mUsesStandardHeader is not written because it should be recomputed in listeners

    }



    /**
@@ -4092,6 +4111,25 @@ public class Notification implements Parcelable 
            }

        }



        /**

         * @hide

         */

        public boolean usesStandardHeader() {

            if (mN.mUsesStandardHeader) {

                return true;

            }

            if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.N) {

                if (mN.contentView == null && mN.bigContentView == null) {

                    return true;

                }

            }

            boolean contentViewUsesHeader = mN.contentView == null

                    || STANDARD_LAYOUTS.contains(mN.contentView.getLayoutId());

            boolean bigContentViewUsesHeader = mN.bigContentView == null

                    || STANDARD_LAYOUTS.contains(mN.bigContentView.getLayoutId());

            return contentViewUsesHeader && bigContentViewUsesHeader;

        }



        private void resetStandardTemplate(RemoteViews contentView) {

            resetNotificationHeader(contentView);

            resetContentMargins(contentView);
@@ -4123,6 +4161,7 @@ public class Notification implements Parcelable 
            contentView.setViewVisibility(R.id.time, View.GONE);

            contentView.setImageViewIcon(R.id.profile_badge, null);

            contentView.setViewVisibility(R.id.profile_badge, View.GONE);

            mN.mUsesStandardHeader = false;

        }



        private void resetContentMargins(RemoteViews contentView) {
@@ -4444,6 +4483,7 @@ public class Notification implements Parcelable 
                bindProfileBadge(contentView);

            }

            bindExpandButton(contentView);

            mN.mUsesStandardHeader = true;

        }



        private void bindExpandButton(RemoteViews contentView) {

core/java/android/view/NotificationHeaderView.java

+31 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view;



import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.Notification;

import android.content.Context;

import android.content.res.Resources;
@@ -25,6 +26,7 @@ import android.graphics.Canvas; 
import android.graphics.Outline;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.util.ArraySet;

import android.util.AttributeSet;

import android.widget.ImageView;

import android.widget.RemoteViews;
@@ -53,6 +55,10 @@ public class NotificationHeaderView extends ViewGroup { 
    private ImageView mExpandButton;

    private CachingIconView mIcon;

    private View mProfileBadge;

    private View mOverlayIcon;

    private View mCameraIcon;

    private View mMicIcon;

    private View mAppOps;

    private int mIconColor;

    private int mOriginalNotificationColor;

    private boolean mExpanded;
@@ -108,6 +114,10 @@ public class NotificationHeaderView extends ViewGroup { 
        mExpandButton = findViewById(com.android.internal.R.id.expand_button);

        mIcon = findViewById(com.android.internal.R.id.icon);

        mProfileBadge = findViewById(com.android.internal.R.id.profile_badge);

        mCameraIcon = findViewById(com.android.internal.R.id.camera);

        mMicIcon = findViewById(com.android.internal.R.id.mic);

        mOverlayIcon = findViewById(com.android.internal.R.id.overlay);

        mAppOps = findViewById(com.android.internal.R.id.app_ops);

    }



    @Override
@@ -198,6 +208,11 @@ public class NotificationHeaderView extends ViewGroup { 
                layoutRight = end - paddingEnd;

                end = layoutLeft = layoutRight - child.getMeasuredWidth();

            }

            if (child == mAppOps) {

                int paddingEnd = mContentEndMargin;

                layoutRight = end - paddingEnd;

                end = layoutLeft = layoutRight - child.getMeasuredWidth();

            }

            if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) {

                int ltrLeft = layoutLeft;

                layoutLeft = getWidth() - layoutRight;
@@ -289,6 +304,22 @@ public class NotificationHeaderView extends ViewGroup { 
        updateExpandButton();

    }



    /**

     * Shows or hides 'app op in use' icons based on app usage.

     */

    public void showAppOpsIcons(ArraySet<Integer> appOps) {

        if (mOverlayIcon == null || mCameraIcon == null || mMicIcon == null) {

            return;

        }



        mOverlayIcon.setVisibility(appOps.contains(AppOpsManager.OP_SYSTEM_ALERT_WINDOW)

                ? View.VISIBLE : View.GONE);

        mCameraIcon.setVisibility(appOps.contains(AppOpsManager.OP_CAMERA)

                ? View.VISIBLE : View.GONE);

        mMicIcon.setVisibility(appOps.contains(AppOpsManager.OP_RECORD_AUDIO)

                ? View.VISIBLE : View.GONE);

    }



    private void updateExpandButton() {

        int drawableId;

        int contentDescriptionId;

core/res/res/drawable/ic_alert_window_layer.xml

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

Copyright (C) 2018 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="16dp"

        android:height="16dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_camera.xml

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

Copyright (C) 2018 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="16dp"

        android:height="16dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"

        android:fillColor="#FFFFFF"/>

    <path

        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"

        android:fillColor="#FFFFFF"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_mic.xml

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

Copyright (C) 2018 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="16dp"

        android:height="16dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"

        android:fillColor="#FFFFFF"/>

</vector>
 
 No newline at end of file