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

Commit cb1f9da5 authored by Alexander Hills's avatar Alexander Hills Committed by Android (Google) Code Review
Browse files

Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev

parents b0df0859 4bcb06b9

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5245,6 +5245,7 @@ package android.app { 
    method public int getCustomSizePreset();

    method public android.app.PendingIntent getDisplayIntent();

    method public int getGravity();

    method public boolean getHintAmbientBigPicture();

    method public boolean getHintAvoidBackgroundClipping();

    method public boolean getHintContentIntentLaunchesActivity();

    method public boolean getHintHideIcon();
@@ -5261,6 +5262,7 @@ package android.app { 
    method public android.app.Notification.WearableExtender setCustomSizePreset(int);

    method public android.app.Notification.WearableExtender setDisplayIntent(android.app.PendingIntent);

    method public android.app.Notification.WearableExtender setGravity(int);

    method public android.app.Notification.WearableExtender setHintAmbientBigPicture(boolean);

    method public android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);

    method public android.app.Notification.WearableExtender setHintContentIntentLaunchesActivity(boolean);

    method public android.app.Notification.WearableExtender setHintHideIcon(boolean);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5380,6 +5380,7 @@ package android.app { 
    method public int getCustomSizePreset();

    method public android.app.PendingIntent getDisplayIntent();

    method public int getGravity();

    method public boolean getHintAmbientBigPicture();

    method public boolean getHintAvoidBackgroundClipping();

    method public boolean getHintContentIntentLaunchesActivity();

    method public boolean getHintHideIcon();
@@ -5396,6 +5397,7 @@ package android.app { 
    method public android.app.Notification.WearableExtender setCustomSizePreset(int);

    method public android.app.Notification.WearableExtender setDisplayIntent(android.app.PendingIntent);

    method public android.app.Notification.WearableExtender setGravity(int);

    method public android.app.Notification.WearableExtender setHintAmbientBigPicture(boolean);

    method public android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);

    method public android.app.Notification.WearableExtender setHintContentIntentLaunchesActivity(boolean);

    method public android.app.Notification.WearableExtender setHintHideIcon(boolean);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5245,6 +5245,7 @@ package android.app { 
    method public int getCustomSizePreset();

    method public android.app.PendingIntent getDisplayIntent();

    method public int getGravity();

    method public boolean getHintAmbientBigPicture();

    method public boolean getHintAvoidBackgroundClipping();

    method public boolean getHintContentIntentLaunchesActivity();

    method public boolean getHintHideIcon();
@@ -5261,6 +5262,7 @@ package android.app { 
    method public android.app.Notification.WearableExtender setCustomSizePreset(int);

    method public android.app.Notification.WearableExtender setDisplayIntent(android.app.PendingIntent);

    method public android.app.Notification.WearableExtender setGravity(int);

    method public android.app.Notification.WearableExtender setHintAmbientBigPicture(boolean);

    method public android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);

    method public android.app.Notification.WearableExtender setHintContentIntentLaunchesActivity(boolean);

    method public android.app.Notification.WearableExtender setHintHideIcon(boolean);

core/java/android/app/Notification.java

+24 −0
Original line number Diff line number Diff line
@@ -5461,6 +5461,7 @@ public class Notification implements Parcelable 
        private static final int FLAG_HINT_SHOW_BACKGROUND_ONLY = 1 << 2;

        private static final int FLAG_START_SCROLL_BOTTOM = 1 << 3;

        private static final int FLAG_HINT_AVOID_BACKGROUND_CLIPPING = 1 << 4;

        private static final int FLAG_BIG_PICTURE_AMBIENT = 1 << 5;

        private static final int FLAG_HINT_CONTENT_INTENT_LAUNCHES_ACTIVITY = 1 << 6;



        // Default value for flags integer
@@ -6028,6 +6029,29 @@ public class Notification implements Parcelable 
            return mHintScreenTimeout;

        }



        /**

         * Set a hint that this notification's {@link BigPictureStyle} (if present) should be

         * converted to low-bit and displayed in ambient mode, especially useful for barcodes and

         * qr codes, as well as other simple black-and-white tickets.

         * @param hintAmbientBigPicture {@code true} to enable converstion and ambient.

         * @return this object for method chaining

         */

        public WearableExtender setHintAmbientBigPicture(boolean hintAmbientBigPicture) {

            setFlag(FLAG_BIG_PICTURE_AMBIENT, hintAmbientBigPicture);

            return this;

        }



        /**

         * Get a hint that this notification's {@link BigPictureStyle} (if present) should be

         * converted to low-bit and displayed in ambient mode, especially useful for barcodes and

         * qr codes, as well as other simple black-and-white tickets.

         * @return {@code true} if it should be displayed in ambient, false otherwise

         * otherwise. The default value is {@code false} if this was never set.

         */

        public boolean getHintAmbientBigPicture() {

            return (mFlags & FLAG_BIG_PICTURE_AMBIENT) != 0;

        }



        /**

         * Set a hint that this notification's content intent will launch an {@link Activity}

         * directly, telling the platform that it can generate the appropriate transitions.