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

Merge "Add permission hint, update permission slice structure" into pi-dev

Browse Source 
am: 92006c1764

Change-Id: I3c0a31b24fa9e37b5a5bee384578ac4ad2c4ed9f
This commit is contained in:
Mady Mellor
2018-03-29 22:22:51 +00:00
committed by android-build-merger
parent 5d65eeea4c 92006c1764
commit fc124567dd
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -7219,6 +7219,7 @@ package android.app.slice {
field public static final java.lang.String HINT_LIST_ITEM = "list_item";
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_PERMISSION_REQUEST = "permission_request";
field public static final java.lang.String HINT_SEE_MORE = "see_more";
field public static final java.lang.String HINT_SELECTED = "selected";
field public static final java.lang.String HINT_SHORTCUT = "shortcut";

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

@@ -70,6 +70,7 @@ public final class Slice implements Parcelable {
HINT_ERROR,
HINT_TTL,
HINT_LAST_UPDATED,
HINT_PERMISSION_REQUEST,
})
@Retention(RetentionPolicy.SOURCE)
public @interface SliceHint {}
@@ -183,6 +184,11 @@ public final class Slice implements Parcelable {
* Hint indicating an item representing when the content was created or last updated.
*/
public static final String HINT_LAST_UPDATED = "last_updated";
/**
* A hint to indicate that this slice represents a permission request for showing
* slices.
*/
public static final String HINT_PERMISSION_REQUEST = "permission_request";
/**
* Key to retrieve an extra added to an intent when a control is changed.
*/

20
core/java/android/app/slice/SliceProvider.java
View File

@@ -428,15 +428,17 @@ public abstract class SliceProvider extends ContentProvider {
} finally {
Handler.getMain().removeCallbacks(mAnr);
}
return new Slice.Builder(sliceUri)
.addAction(action,
new Slice.Builder(sliceUri.buildUpon().appendPath("permission").build())
.addText(getPermissionString(context, callingPackage), null,
Collections.emptyList())
.build(),
null)
.addHints(Arrays.asList(Slice.HINT_LIST_ITEM))
.build();
Slice.Builder parent = new Slice.Builder(sliceUri);
Slice.Builder childAction = new Slice.Builder(parent)
.addHints(Arrays.asList(Slice.HINT_TITLE, Slice.HINT_SHORTCUT))
.addAction(action, new Slice.Builder(parent).build(), null);
parent.addSubSlice(new Slice.Builder(sliceUri.buildUpon().appendPath("permission").build())
.addText(getPermissionString(context, callingPackage), null,
Collections.emptyList())
.addSubSlice(childAction.build(), null)
.build(), null);
return parent.addHints(Arrays.asList(Slice.HINT_PERMISSION_REQUEST)).build();
}
/**