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

Commit a65d8b66 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Update manifest shortcut XML schema" into nyc-mr1-dev

parents 1f7be323 df6da040

api/current.txt

+10 −14
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ package android { 
    field public static final int contentInsetStart = 16843859; // 0x1010453

    field public static final int contentInsetStartWithNavigation = 16844066; // 0x1010522

    field public static final int contextClickable = 16844007; // 0x10104e7

    field public static final int contextDescription = 16844082; // 0x1010532

    field public static final int contextDescription = 16844078; // 0x101052e

    field public static final int contextPopupMenuStyle = 16844033; // 0x1010501

    field public static final int contextUri = 16844081; // 0x1010531

    field public static final int contextUri = 16844077; // 0x101052d

    field public static final int controlX1 = 16843772; // 0x10103fc

    field public static final int controlX2 = 16843774; // 0x10103fe

    field public static final int controlY1 = 16843773; // 0x10103fd
@@ -1041,7 +1041,7 @@ package android { 
    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844080; // 0x1010530

    field public static final int roundIcon = 16844076; // 0x101052c

    field public static final int rowCount = 16843637; // 0x1010375

    field public static final int rowDelay = 16843216; // 0x10101d0

    field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1109,20 +1109,16 @@ package android { 
    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field public static final int sharedUserId = 16842763; // 0x101000b

    field public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int shortcutCategories = 16844077; // 0x101052d

    field public static final int shortcutDisabledMessage = 16844076; // 0x101052c

    field public static final int shortcutIcon = 16844073; // 0x1010529

    field public static final int shortcutDisabledMessage = 16844075; // 0x101052b

    field public static final int shortcutId = 16844072; // 0x1010528

    field public static final int shortcutIntentAction = 16844078; // 0x101052e

    field public static final int shortcutIntentData = 16844079; // 0x101052f

    field public static final int shortcutLongLabel = 16844075; // 0x101052b

    field public static final int shortcutShortLabel = 16844074; // 0x101052a

    field public static final int shortcutLongLabel = 16844074; // 0x101052a

    field public static final int shortcutShortLabel = 16844073; // 0x1010529

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showDefault = 16843258; // 0x10101fa

    field public static final int showDividers = 16843561; // 0x1010329

    field public static final int showForAllUsers = 16844015; // 0x10104ef

    field public static final int showMetadataInPreview = 16844083; // 0x1010533

    field public static final int showMetadataInPreview = 16844079; // 0x101052f

    field public static final deprecated int showOnLockScreen = 16843721; // 0x10103c9

    field public static final int showSilent = 16843259; // 0x10101fb

    field public static final int showText = 16843949; // 0x10104ad
@@ -10099,14 +10095,14 @@ package android.content.pm { 
    method public android.content.pm.ShortcutInfo build();

    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);

    method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);

    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.String);

    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);

    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);

    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);

    method public android.content.pm.ShortcutInfo.Builder setId(java.lang.String);

    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);

    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.String);

    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);

    method public android.content.pm.ShortcutInfo.Builder setRank(int);

    method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.String);

    method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);

  }















  public class ShortcutManager {

























api/system-current.txt



+10
−14




























Original line number
Diff line number
Diff line








@@ -527,9 +527,9 @@ package android {













    field public static final int contentInsetStart = 16843859; // 0x1010453















    field public static final int contentInsetStartWithNavigation = 16844066; // 0x1010522















    field public static final int contextClickable = 16844007; // 0x10104e7













    field public static final int contextDescription = 16844082; // 0x1010532













    field public static final int contextDescription = 16844078; // 0x101052e















    field public static final int contextPopupMenuStyle = 16844033; // 0x1010501













    field public static final int contextUri = 16844081; // 0x1010531













    field public static final int contextUri = 16844077; // 0x101052d















    field public static final int controlX1 = 16843772; // 0x10103fc















    field public static final int controlX2 = 16843774; // 0x10103fe















    field public static final int controlY1 = 16843773; // 0x10103fd










@@ -1148,7 +1148,7 @@ package android {













    field public static final int rotation = 16843558; // 0x1010326















    field public static final int rotationX = 16843559; // 0x1010327















    field public static final int rotationY = 16843560; // 0x1010328













    field public static final int roundIcon = 16844080; // 0x1010530













    field public static final int roundIcon = 16844076; // 0x101052c















    field public static final int rowCount = 16843637; // 0x1010375















    field public static final int rowDelay = 16843216; // 0x10101d0















    field public static final int rowEdgeFlags = 16843329; // 0x1010241










@@ -1220,20 +1220,16 @@ package android {













    field public static final int shareInterpolator = 16843195; // 0x10101bb















    field public static final int sharedUserId = 16842763; // 0x101000b















    field public static final int sharedUserLabel = 16843361; // 0x1010261













    field public static final int shortcutCategories = 16844077; // 0x101052d













    field public static final int shortcutDisabledMessage = 16844076; // 0x101052c













    field public static final int shortcutIcon = 16844073; // 0x1010529













    field public static final int shortcutDisabledMessage = 16844075; // 0x101052b















    field public static final int shortcutId = 16844072; // 0x1010528













    field public static final int shortcutIntentAction = 16844078; // 0x101052e













    field public static final int shortcutIntentData = 16844079; // 0x101052f













    field public static final int shortcutLongLabel = 16844075; // 0x101052b













    field public static final int shortcutShortLabel = 16844074; // 0x101052a













    field public static final int shortcutLongLabel = 16844074; // 0x101052a













    field public static final int shortcutShortLabel = 16844073; // 0x1010529















    field public static final int shouldDisableView = 16843246; // 0x10101ee















    field public static final int showAsAction = 16843481; // 0x10102d9















    field public static final int showDefault = 16843258; // 0x10101fa















    field public static final int showDividers = 16843561; // 0x1010329















    field public static final int showForAllUsers = 16844015; // 0x10104ef













    field public static final int showMetadataInPreview = 16844083; // 0x1010533













    field public static final int showMetadataInPreview = 16844079; // 0x101052f















    field public static final deprecated int showOnLockScreen = 16843721; // 0x10103c9















    field public static final int showSilent = 16843259; // 0x10101fb















    field public static final int showText = 16843949; // 0x10104ad










@@ -10523,14 +10519,14 @@ package android.content.pm {













    method public android.content.pm.ShortcutInfo build();















    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);















    method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);













    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.String);













    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);















    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);















    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);















    method public android.content.pm.ShortcutInfo.Builder setId(java.lang.String);















    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);













    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.String);













    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);















    method public android.content.pm.ShortcutInfo.Builder setRank(int);













    method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.String);













    method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);















  }





























  public class ShortcutManager {

























api/test-current.txt



+10
−14




























Original line number
Diff line number
Diff line








@@ -420,9 +420,9 @@ package android {













    field public static final int contentInsetStart = 16843859; // 0x1010453















    field public static final int contentInsetStartWithNavigation = 16844066; // 0x1010522















    field public static final int contextClickable = 16844007; // 0x10104e7













    field public static final int contextDescription = 16844082; // 0x1010532













    field public static final int contextDescription = 16844078; // 0x101052e















    field public static final int contextPopupMenuStyle = 16844033; // 0x1010501













    field public static final int contextUri = 16844081; // 0x1010531













    field public static final int contextUri = 16844077; // 0x101052d















    field public static final int controlX1 = 16843772; // 0x10103fc















    field public static final int controlX2 = 16843774; // 0x10103fe















    field public static final int controlY1 = 16843773; // 0x10103fd










@@ -1041,7 +1041,7 @@ package android {













    field public static final int rotation = 16843558; // 0x1010326















    field public static final int rotationX = 16843559; // 0x1010327















    field public static final int rotationY = 16843560; // 0x1010328













    field public static final int roundIcon = 16844080; // 0x1010530













    field public static final int roundIcon = 16844076; // 0x101052c















    field public static final int rowCount = 16843637; // 0x1010375















    field public static final int rowDelay = 16843216; // 0x10101d0















    field public static final int rowEdgeFlags = 16843329; // 0x1010241










@@ -1109,20 +1109,16 @@ package android {













    field public static final int shareInterpolator = 16843195; // 0x10101bb















    field public static final int sharedUserId = 16842763; // 0x101000b















    field public static final int sharedUserLabel = 16843361; // 0x1010261













    field public static final int shortcutCategories = 16844077; // 0x101052d













    field public static final int shortcutDisabledMessage = 16844076; // 0x101052c













    field public static final int shortcutIcon = 16844073; // 0x1010529













    field public static final int shortcutDisabledMessage = 16844075; // 0x101052b















    field public static final int shortcutId = 16844072; // 0x1010528













    field public static final int shortcutIntentAction = 16844078; // 0x101052e













    field public static final int shortcutIntentData = 16844079; // 0x101052f













    field public static final int shortcutLongLabel = 16844075; // 0x101052b













    field public static final int shortcutShortLabel = 16844074; // 0x101052a













    field public static final int shortcutLongLabel = 16844074; // 0x101052a













    field public static final int shortcutShortLabel = 16844073; // 0x1010529















    field public static final int shouldDisableView = 16843246; // 0x10101ee















    field public static final int showAsAction = 16843481; // 0x10102d9















    field public static final int showDefault = 16843258; // 0x10101fa















    field public static final int showDividers = 16843561; // 0x1010329















    field public static final int showForAllUsers = 16844015; // 0x10104ef













    field public static final int showMetadataInPreview = 16844083; // 0x1010533













    field public static final int showMetadataInPreview = 16844079; // 0x101052f















    field public static final deprecated int showOnLockScreen = 16843721; // 0x10103c9















    field public static final int showSilent = 16843259; // 0x10101fb















    field public static final int showText = 16843949; // 0x10104ad










@@ -10112,14 +10108,14 @@ package android.content.pm {













    method public android.content.pm.ShortcutInfo build();















    method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);















    method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);













    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.String);













    method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);















    method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);















    method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);















    method public android.content.pm.ShortcutInfo.Builder setId(java.lang.String);















    method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);













    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.String);













    method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);















    method public android.content.pm.ShortcutInfo.Builder setRank(int);













    method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.String);













    method public android.content.pm.ShortcutInfo.Builder setShortLabel(java.lang.CharSequence);















  }





























  public class ShortcutManager {

























core/java/android/content/pm/ShortcutInfo.java



+52
−11




























Original line number
Diff line number
Diff line








@@ -30,6 +30,7 @@ import android.os.Parcel;













import android.os.Parcelable;















import android.os.PersistableBundle;















import android.os.UserHandle;













import android.text.TextUtils;















import android.util.ArraySet;















import android.util.Log;


























@@ -245,7 +246,7 @@ public final class ShortcutInfo implements Parcelable {













        mTextResId = b.mTextResId;















        mDisabledMessage = b.mDisabledMessage;















        mDisabledMessageResId = b.mDisabledMessageResId;













        mCategories = clone(b.mCategories);













        mCategories = cloneCategories(b.mCategories);















        mIntent = b.mIntent;















        if (mIntent != null) {















            final Bundle intentExtras = mIntent.getExtras();









@@ -259,8 +260,17 @@ public final class ShortcutInfo implements Parcelable {













        updateTimestamp();















    }





























    private <T> ArraySet<T> clone(Set<T> source) {













        return (source == null) ? null : new ArraySet<>(source);













    private ArraySet<String> cloneCategories(Set<String> source) {













        if (source == null) {













            return null;













        }













        final ArraySet<String> ret = new ArraySet<>(source.size());













        for (CharSequence s : source) {













            if (!TextUtils.isEmpty(s)) {













                ret.add(s.toString().intern());













            }













        }













        return ret;















    }































    /**










@@ -304,7 +314,7 @@ public final class ShortcutInfo implements Parcelable {













            mTextResId = source.mTextResId;















            mDisabledMessage = source.mDisabledMessage;















            mDisabledMessageResId = source.mDisabledMessageResId;













            mCategories = clone(source.mCategories);













            mCategories = cloneCategories(source.mCategories);















            if ((cloneFlags & CLONE_REMOVE_INTENT) == 0) {















                mIntent = source.mIntent;















                mIntentPersistableExtras = source.mIntentPersistableExtras;










@@ -614,7 +624,7 @@ public final class ShortcutInfo implements Parcelable {













            mDisabledMessageResName = null;















        }















        if (source.mCategories != null) {













            mCategories = clone(source.mCategories);













            mCategories = cloneCategories(source.mCategories);















        }















        if (source.mIntent != null) {















            mIntent = source.mIntent;










@@ -752,7 +762,7 @@ public final class ShortcutInfo implements Parcelable {













         * an icon.  The recommend max length is 10 characters.















         */















        @NonNull













        public Builder setShortLabel(@NonNull String shortLabel) {













        public Builder setShortLabel(@NonNull CharSequence shortLabel) {















            Preconditions.checkState(mTitleResId == 0, "shortLabelResId already set");















            mTitle = Preconditions.checkStringNotEmpty(shortLabel, "shortLabel");















            return this;









@@ -776,14 +786,14 @@ public final class ShortcutInfo implements Parcelable {













         * The recommend max length is 25 characters.















         */















        @NonNull













        public Builder setLongLabel(@NonNull String longLabel) {













        public Builder setLongLabel(@NonNull CharSequence longLabel) {















            Preconditions.checkState(mTextResId == 0, "longLabelResId already set");















            mText = Preconditions.checkStringNotEmpty(longLabel, "longLabel");















            return this;















        }































        /** @hide -- old signature, the internal code still uses it. */













        public Builder setTitle(@NonNull String value) {













        public Builder setTitle(@NonNull CharSequence value) {















            return setShortLabel(value);















        }

























@@ -793,7 +803,7 @@ public final class ShortcutInfo implements Parcelable {













        }































        /** @hide -- old signature, the internal code still uses it. */













        public Builder setText(@NonNull String value) {













        public Builder setText(@NonNull CharSequence value) {















            return setLongLabel(value);















        }

























@@ -813,7 +823,7 @@ public final class ShortcutInfo implements Parcelable {













        }































        @NonNull













        public Builder setDisabledMessage(@NonNull String disabledMessage) {













        public Builder setDisabledMessage(@NonNull CharSequence disabledMessage) {















            Preconditions.checkState(















                    mDisabledMessageResId == 0, "disabledMessageResId already set");















            mDisabledMessage =










@@ -1355,6 +1365,37 @@ public final class ShortcutInfo implements Parcelable {













        mIconResName = iconResName;















    }





























    /**













     * Replaces the intent













     *













     * @throws IllegalArgumentException when extra is not compatible with {@link PersistableBundle}.













     *













     * @hide













     */













    public void setIntent(Intent intent) throws IllegalArgumentException {













        Preconditions.checkNotNull(intent);



























        final Bundle intentExtras = intent.getExtras();



























        mIntent = intent;



























        if (intentExtras != null) {













            intent.replaceExtras((Bundle) null);













            mIntentPersistableExtras = new PersistableBundle(intentExtras);













        } else {













            mIntentPersistableExtras = null;













        }













    }



























    /**













     * Replaces the categories.













     *













     * @hide













     */













    public void setCategories(Set<String> categories) {













        mCategories = cloneCategories(categories);













    }





























    private ShortcutInfo(Parcel source) {















        final ClassLoader cl = getClass().getClassLoader();


























@@ -1591,7 +1632,7 @@ public final class ShortcutInfo implements Parcelable {













        mDisabledMessage = disabledMessage;















        mDisabledMessageResId = disabledMessageResId;















        mDisabledMessageResName = disabledMessageResName;













        mCategories = clone(categories);













        mCategories = cloneCategories(categories);















        mIntent = intent;















        mIntentPersistableExtras = intentPersistableExtras;















        mRank = rank;

































core/res/res/values/attrs.xml



+5
−4




























Original line number
Diff line number
Diff line








@@ -8251,12 +8251,13 @@ i













    <declare-styleable name="Shortcut">















        <attr name="shortcutId" format="string" />















        <attr name="enabled" />













        <attr name="shortcutIcon" format="reference" />













        <attr name="icon" />















        <attr name="shortcutShortLabel" format="reference" />















        <attr name="shortcutLongLabel" format="reference" />















        <attr name="shortcutDisabledMessage" format="reference" />













        <attr name="shortcutCategories" format="string" />













        <attr name="shortcutIntentAction" format="string" />













        <attr name="shortcutIntentData" format="string" />













    </declare-styleable>



























    <declare-styleable name="ShortcutCategories">













        <attr name="name" />















    </declare-styleable>















</resources>