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

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

Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev

parents d922554f 4ec3ff4f

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5031,13 +5031,13 @@ 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 getHintContentIntentLaunchesActivity();

    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 setHintContentIntentLaunchesActivity(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
−2




























Original line number
Diff line number
Diff line








@@ -5165,13 +5165,13 @@ 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 getHintContentIntentLaunchesActivity();













    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 setHintContentIntentLaunchesActivity(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
−2




























Original line number
Diff line number
Diff line








@@ -5031,13 +5031,13 @@ 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 getHintContentIntentLaunchesActivity();













    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 setHintContentIntentLaunchesActivity(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



+2
−2




























Original line number
Diff line number
Diff line








@@ -1419,7 +1419,7 @@ public class Notification implements Parcelable













             * an activity and transitions should be generated, false otherwise.















             * @return this object for method chaining















             */













            public WearableExtender setHintContentIntentLaunchesActivity(













            public WearableExtender setHintLaunchesActivity(















                    boolean hintLaunchesActivity) {















                setFlag(FLAG_HINT_LAUNCHES_ACTIVITY, hintLaunchesActivity);















                return this;









@@ -1432,7 +1432,7 @@ public class Notification implements Parcelable













             * should be generated, false otherwise. The default value is {@code false} if this was















             * never set.















             */













            public boolean getHintContentIntentLaunchesActivity() {













            public boolean getHintLaunchesActivity() {















                return (mFlags & FLAG_HINT_LAUNCHES_ACTIVITY) != 0;















            }















        }