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

Commit 218f952f authored by Alexander Roederer's avatar Alexander Roederer Committed by Automerger Merge Worker
Browse files

Merge "Updates documentation on Action Button Icons" into tm-dev am:... 

Merge "Updates documentation on Action Button Icons" into tm-dev am: 3d790a16 am: 19acfbe9 am: 0befb721

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17928040



Change-Id: Ib863b28a8435ea23515617afc35576ac33e9b919
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ecf49283 0befb721

core/java/android/app/Notification.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -1901,6 +1901,11 @@ public class Notification implements Parcelable 
















            /**







            /**











             * Construct a new builder for {@link Action} object.







             * Construct a new builder for {@link Action} object.














             * <p>As of Android {@link android.os.Build.VERSION_CODES#N},














             * action button icons will not be displayed on action buttons, but are still required














             * and are available to














             * {@link android.service.notification.NotificationListenerService notification listeners},














             * which may display them in other contexts, for example on a wearable device.











             * @param icon icon to show for this action







             * @param icon icon to show for this action











             * @param title the title of the action







             * @param title the title of the action











             * @param intent the {@link PendingIntent} to fire when users trigger this action







             * @param intent the {@link PendingIntent} to fire when users trigger this action









@@ -1923,6 +1928,12 @@ public class Notification implements Parcelable









             * both are displayed or required, depends on where and how the action is used, and the







             * both are displayed or required, depends on where and how the action is used, and the











             * {@link Style} applied to the Notification.







             * {@link Style} applied to the Notification.











             *







             *














             * <p>As of Android {@link android.os.Build.VERSION_CODES#N}, action button icons














             * will not be displayed on action buttons, but are still required and are available














             * to {@link android.service.notification.NotificationListenerService notification














             * listeners}, which may display them in other contexts, for example on a wearable














             * device.














             *











             * <p>When the {@code title} is a {@link android.text.Spanned}, any colors set by a







             * <p>When the {@code title} is a {@link android.text.Spanned}, any colors set by a











             * {@link ForegroundColorSpan} or {@link TextAppearanceSpan} may be removed or displayed







             * {@link ForegroundColorSpan} or {@link TextAppearanceSpan} may be removed or displayed











             * with an altered in luminance to ensure proper contrast within the Notification.







             * with an altered in luminance to ensure proper contrast within the Notification.










@@ -4918,6 +4929,12 @@ public class Notification implements Parcelable









         * while processing broadcast receivers or services in response to notification action







         * while processing broadcast receivers or services in response to notification action











         * clicks. To launch an activity in those cases, provide a {@link PendingIntent} to the







         * clicks. To launch an activity in those cases, provide a {@link PendingIntent} to the











         * activity itself.







         * activity itself.














         * <p>














         * As of Android {@link android.os.Build.VERSION_CODES#N},














         * action button icons will not be displayed on action buttons, but are still required














         * and are available to














         * {@link android.service.notification.NotificationListenerService notification listeners},














         * which may display them in other contexts, for example on a wearable device.











         *







         *











         * @param icon Resource ID of a drawable that represents the action.







         * @param icon Resource ID of a drawable that represents the action.











         * @param title Text describing the action.







         * @param title Text describing the action.