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

Commit c6355258 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge changes from topic \'substitute-notification-app-name\' into... 

Merge "Merge changes from topic \'substitute-notification-app-name\' into nyc-dev am: 955009f9 am: 5bab149b" into nyc-mr1-dev-plus-aosp
parents 50724e66 50497cd6

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5085,6 +5085,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";

    field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";

    field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final java.lang.String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";

    field public static final java.lang.String EXTRA_SUB_TEXT = "android.subText";

    field public static final java.lang.String EXTRA_SUMMARY_TEXT = "android.summaryText";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.template";

core/java/android/app/Notification.java

+2 −4
Original line number Diff line number Diff line
@@ -976,10 +976,8 @@ public class Notification implements Parcelable 
     */

    public static final String EXTRA_CONTAINS_CUSTOM_VIEW = "android.contains.customView";



    /**

     * @SystemApi

     * @hide

     */

    /** @hide */

    @SystemApi

    public static final String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";



    private Icon mSmallIcon;

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ 
    <!-- It's like, reality, but, you know, virtual -->

    <uses-permission android:name="android.permission.ACCESS_VR_MANAGER" />



    <!-- the ability to rename notifications posted by other apps -->

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />



    <application

        android:name=".SystemUIApplication"

        android:persistent="true"

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+10 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.graphics.Rect; 
import android.media.MediaActionSound;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.Environment;

import android.os.Process;

import android.provider.MediaStore;
@@ -164,6 +165,11 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        c.drawColor(overlayColor);

        c.setBitmap(null);



        // swap "System UI" out for "Android System"

        final Bundle extras = new Bundle();

        extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,

                context.getString(com.android.internal.R.string.android_system_label));



        // Show the intermediate notification

        mTickerAddSpace = !mTickerAddSpace;

        mNotificationManager = nManager;
@@ -180,6 +186,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                .setSmallIcon(R.drawable.stat_notify_image)

                .setCategory(Notification.CATEGORY_PROGRESS)

                .setWhen(now)

                .setShowWhen(true)

                .addExtras(extras)

                .setColor(r.getColor(

                        com.android.internal.R.color.system_notification_accent_color));
@@ -190,6 +198,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
            .setContentText(r.getString(R.string.screenshot_saving_text))

            .setSmallIcon(R.drawable.stat_notify_image)

            .setWhen(now)

            .setShowWhen(true)

            .addExtras(extras)

            .setColor(r.getColor(com.android.internal.R.color.system_notification_accent_color))

            .setStyle(mNotificationStyle)

            .setPublicVersion(mPublicNotificationBuilder.build());