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

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

Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev

parents b6a19b1c 9f08761f

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5049,12 +5049,14 @@ package android.app { 
    method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Builder);

    method public java.lang.CharSequence getCancelLabel();

    method public java.lang.CharSequence getConfirmLabel();

    method public boolean getHintDisplayActionInline();

    method public boolean getHintLaunchesActivity();

    method public java.lang.CharSequence getInProgressLabel();

    method public boolean isAvailableOffline();

    method public android.app.Notification.Action.WearableExtender setAvailableOffline(boolean);

    method public android.app.Notification.Action.WearableExtender setCancelLabel(java.lang.CharSequence);

    method public android.app.Notification.Action.WearableExtender setConfirmLabel(java.lang.CharSequence);

    method public android.app.Notification.Action.WearableExtender setHintDisplayActionInline(boolean);

    method public android.app.Notification.Action.WearableExtender setHintLaunchesActivity(boolean);

    method public android.app.Notification.Action.WearableExtender setInProgressLabel(java.lang.CharSequence);

  }

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5197,12 +5197,14 @@ package android.app { 
    method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Builder);

    method public java.lang.CharSequence getCancelLabel();

    method public java.lang.CharSequence getConfirmLabel();

    method public boolean getHintDisplayActionInline();

    method public boolean getHintLaunchesActivity();

    method public java.lang.CharSequence getInProgressLabel();

    method public boolean isAvailableOffline();

    method public android.app.Notification.Action.WearableExtender setAvailableOffline(boolean);

    method public android.app.Notification.Action.WearableExtender setCancelLabel(java.lang.CharSequence);

    method public android.app.Notification.Action.WearableExtender setConfirmLabel(java.lang.CharSequence);

    method public android.app.Notification.Action.WearableExtender setHintDisplayActionInline(boolean);

    method public android.app.Notification.Action.WearableExtender setHintLaunchesActivity(boolean);

    method public android.app.Notification.Action.WearableExtender setInProgressLabel(java.lang.CharSequence);

  }

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5050,12 +5050,14 @@ package android.app { 
    method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Builder);

    method public java.lang.CharSequence getCancelLabel();

    method public java.lang.CharSequence getConfirmLabel();

    method public boolean getHintDisplayActionInline();

    method public boolean getHintLaunchesActivity();

    method public java.lang.CharSequence getInProgressLabel();

    method public boolean isAvailableOffline();

    method public android.app.Notification.Action.WearableExtender setAvailableOffline(boolean);

    method public android.app.Notification.Action.WearableExtender setCancelLabel(java.lang.CharSequence);

    method public android.app.Notification.Action.WearableExtender setConfirmLabel(java.lang.CharSequence);

    method public android.app.Notification.Action.WearableExtender setHintDisplayActionInline(boolean);

    method public android.app.Notification.Action.WearableExtender setHintLaunchesActivity(boolean);

    method public android.app.Notification.Action.WearableExtender setInProgressLabel(java.lang.CharSequence);

  }

core/java/android/app/Notification.java

+24 −0
Original line number Diff line number Diff line
@@ -1294,6 +1294,7 @@ public class Notification implements Parcelable 
            // Flags bitwise-ored to mFlags

            private static final int FLAG_AVAILABLE_OFFLINE = 0x1;

            private static final int FLAG_HINT_LAUNCHES_ACTIVITY = 1 << 1;

            private static final int FLAG_HINT_DISPLAY_INLINE = 1 << 2;



            // Default value for flags integer

            private static final int DEFAULT_FLAGS = FLAG_AVAILABLE_OFFLINE;
@@ -1480,6 +1481,29 @@ public class Notification implements Parcelable 
            public boolean getHintLaunchesActivity() {

                return (mFlags & FLAG_HINT_LAUNCHES_ACTIVITY) != 0;

            }



            /**

             * Set a hint that this Action should be displayed inline.

             *

             * @param hintDisplayInline {@code true} if action should be displayed inline, false

             *        otherwise

             * @return this object for method chaining

             */

            public WearableExtender setHintDisplayActionInline(

                    boolean hintDisplayInline) {

                setFlag(FLAG_HINT_DISPLAY_INLINE, hintDisplayInline);

                return this;

            }



            /**

             * Get a hint that this Action should be displayed inline.

             *

             * @return {@code true} if the Action should be displayed inline, {@code false} 

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

             */

            public boolean getHintDisplayActionInline() {

                return (mFlags & FLAG_HINT_DISPLAY_INLINE) != 0;

            }

        }

    }