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

Commit e1bba9d4 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fix current.txt

Probably a bad merge from upstream

Change-Id: Ie262b0be6cecd7084cab2b0468820e9d5b9ea670
parent d490aa42
Loading
Loading
Loading
Loading
+0 −75
Original line number Diff line number Diff line
@@ -4577,7 +4577,6 @@ package android.app {
    method public android.app.Notification.Builder addAction(android.app.Notification.Action);
    method public android.app.Notification.Builder addExtras(android.os.Bundle);
    method public android.app.Notification.Builder addPerson(java.lang.String);
    method public android.app.Notification.Builder apply(android.app.Notification.Builder.Extender);
    method public android.app.Notification build();
    method public android.app.Notification.Builder extend(android.app.Notification.Extender);
    method public android.os.Bundle getExtras();
@@ -5370,80 +5369,6 @@ package android.app.task {
}
package android.app.wearable {
  public final class WearableActionExtensions implements android.app.Notification.Action.Builder.Extender android.os.Parcelable {
    method public android.app.Notification.Action.Builder applyTo(android.app.Notification.Action.Builder);
    method public int describeContents();
    method public static android.app.wearable.WearableActionExtensions from(android.app.Notification.Action);
    method public boolean isAvailableOffline();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator CREATOR;
  }
  public static final class WearableActionExtensions.Builder {
    ctor public WearableActionExtensions.Builder();
    ctor public WearableActionExtensions.Builder(android.app.wearable.WearableActionExtensions);
    method public android.app.wearable.WearableActionExtensions build();
    method public android.app.wearable.WearableActionExtensions.Builder setAvailableOffline(boolean);
  }
  public final class WearableNotificationExtensions implements android.app.Notification.Builder.Extender android.os.Parcelable {
    method public android.app.Notification.Builder applyTo(android.app.Notification.Builder);
    method public int describeContents();
    method public static android.app.wearable.WearableNotificationExtensions from(android.app.Notification);
    method public android.app.Notification.Action getAction(int);
    method public int getActionCount();
    method public android.app.Notification.Action[] getActions();
    method public android.graphics.Bitmap getBackground();
    method public int getContentAction();
    method public int getContentIcon();
    method public int getContentIconGravity();
    method public boolean getContentIntentAvailableOffline();
    method public int getCustomContentHeight();
    method public int getCustomSizePreset();
    method public android.app.PendingIntent getDisplayIntent();
    method public int getGravity();
    method public boolean getHintHideIcon();
    method public boolean getHintShowBackgroundOnly();
    method public android.app.Notification[] getPages();
    method public boolean getStartScrollBottom();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final android.os.Parcelable.Creator CREATOR;
    field public static final int SIZE_DEFAULT = 0; // 0x0
    field public static final int SIZE_LARGE = 4; // 0x4
    field public static final int SIZE_MEDIUM = 3; // 0x3
    field public static final int SIZE_SMALL = 2; // 0x2
    field public static final int SIZE_XSMALL = 1; // 0x1
    field public static final int UNSET_ACTION_INDEX = -1; // 0xffffffff
  }
  public static final class WearableNotificationExtensions.Builder {
    ctor public WearableNotificationExtensions.Builder();
    ctor public WearableNotificationExtensions.Builder(android.app.wearable.WearableNotificationExtensions);
    method public android.app.wearable.WearableNotificationExtensions.Builder addAction(android.app.Notification.Action);
    method public android.app.wearable.WearableNotificationExtensions.Builder addActions(java.util.List<android.app.Notification.Action>);
    method public android.app.wearable.WearableNotificationExtensions.Builder addPage(android.app.Notification);
    method public android.app.wearable.WearableNotificationExtensions.Builder addPages(java.util.List<android.app.Notification>);
    method public android.app.wearable.WearableNotificationExtensions build();
    method public android.app.wearable.WearableNotificationExtensions.Builder clearActions();
    method public android.app.wearable.WearableNotificationExtensions.Builder clearPages();
    method public android.app.wearable.WearableNotificationExtensions.Builder setBackground(android.graphics.Bitmap);
    method public android.app.wearable.WearableNotificationExtensions.Builder setContentAction(int);
    method public android.app.wearable.WearableNotificationExtensions.Builder setContentIcon(int);
    method public android.app.wearable.WearableNotificationExtensions.Builder setContentIconGravity(int);
    method public android.app.wearable.WearableNotificationExtensions.Builder setContentIntentAvailableOffline(boolean);
    method public android.app.wearable.WearableNotificationExtensions.Builder setCustomContentHeight(int);
    method public android.app.wearable.WearableNotificationExtensions.Builder setCustomSizePreset(int);
    method public android.app.wearable.WearableNotificationExtensions.Builder setDisplayIntent(android.app.PendingIntent);
    method public android.app.wearable.WearableNotificationExtensions.Builder setGravity(int);
    method public android.app.wearable.WearableNotificationExtensions.Builder setHintHideIcon(boolean);
    method public android.app.wearable.WearableNotificationExtensions.Builder setHintShowBackgroundOnly(boolean);
    method public android.app.wearable.WearableNotificationExtensions.Builder setStartScrollBottom(boolean);
  }
}
package android.appwidget {
  public class AppWidgetHost {