Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add subtype for layout direction to Slice" into pi-dev

Browse Source 
am: 703f31db63

Change-Id: I2a9728249f2fac47593075dbe08d54988df82634
This commit is contained in:
Mady Mellor
2018-03-31 05:03:39 +00:00
committed by android-build-merger
parent 5708929c0c 703f31db63
commit dbbffe3948
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -7226,6 +7226,7 @@ package android.app.slice {
field public static final java.lang.String HINT_TTL = "ttl";
field public static final java.lang.String SUBTYPE_COLOR = "color";
field public static final java.lang.String SUBTYPE_CONTENT_DESCRIPTION = "content_description";
field public static final java.lang.String SUBTYPE_LAYOUT_DIRECTION = "layout_direction";
field public static final java.lang.String SUBTYPE_MAX = "max";
field public static final java.lang.String SUBTYPE_MESSAGE = "message";
field public static final java.lang.String SUBTYPE_MILLIS = "millis";

7
core/java/android/app/slice/Slice.java
View File

@@ -87,6 +87,7 @@ public final class Slice implements Parcelable {
SUBTYPE_SOURCE,
SUBTYPE_TOGGLE,
SUBTYPE_VALUE,
SUBTYPE_LAYOUT_DIRECTION,
})
@Retention(RetentionPolicy.SOURCE)
public @interface SliceSubtype {}
@@ -189,6 +190,12 @@ public final class Slice implements Parcelable {
* slices.
*/
public static final String HINT_PERMISSION_REQUEST = "permission_request";
/**
* Subtype to indicate that this item indicates the layout direction for content
* in the slice.
* Expected to be an item of format {@link SliceItem#FORMAT_INT}.
*/
public static final String SUBTYPE_LAYOUT_DIRECTION = "layout_direction";
/**
* Key to retrieve an extra added to an intent when a control is changed.
*/