diff options
| author | 2017-11-02 14:09:12 -0700 | |
|---|---|---|
| committer | 2017-12-19 14:14:17 -0800 | |
| commit | 225e0dac45df9607dfcc9aa20f4a93c7492931fb (patch) | |
| tree | c4ad46f804cdeb31b6f34374ea3c78f7adfee3ff | |
| parent | 6088f10b8968a26ab4302d812cded7f041e91285 (diff) | |
Unhide HINT_HIDDEN from slices api and rename to HINT_SHORTCUT
Test: manual, build a slice with HINT_SHORTCUT, note content doesn't appear
in slice template but can appear when displayed as shortcut
Bug: 68378574
Change-Id: I4f7d0b8dbbcb0da4efe79a709b0d9fbf24026a6e
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/slice/Slice.java | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 5df52b98f4f5..7d1311c05fb2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7030,6 +7030,7 @@ package android.app.slice { field public static final java.lang.String HINT_NO_TINT = "no_tint"; field public static final java.lang.String HINT_PARTIAL = "partial"; field public static final java.lang.String HINT_SELECTED = "selected"; + field public static final java.lang.String HINT_SHORTCUT = "shortcut"; field public static final java.lang.String HINT_SUMMARY = "summary"; field public static final java.lang.String HINT_TITLE = "title"; field public static final java.lang.String SUBTYPE_COLOR = "color"; diff --git a/core/java/android/app/slice/Slice.java b/core/java/android/app/slice/Slice.java index 1aff7e9c9eff..643fa8dc1c30 100644 --- a/core/java/android/app/slice/Slice.java +++ b/core/java/android/app/slice/Slice.java @@ -63,7 +63,7 @@ public final class Slice implements Parcelable { HINT_ACTIONS, HINT_SELECTED, HINT_NO_TINT, - HINT_HIDDEN, + HINT_SHORTCUT, HINT_TOGGLE, HINT_HORIZONTAL, HINT_PARTIAL, @@ -118,12 +118,10 @@ public final class Slice implements Parcelable { */ public static final String HINT_NO_TINT = "no_tint"; /** - * Hint to indicate that this content should not be shown in larger renderings - * of Slices. This content may be used to populate the shortcut/icon - * format of the slice. - * @hide + * Hint to indicate that this content should only be displayed if the slice is presented + * as a shortcut. */ - public static final String HINT_HIDDEN = "hidden"; + public static final String HINT_SHORTCUT = "shortcut"; /** * Hint indicating this content should be shown instead of the normal content when the slice * is in small format. |