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

Commit 9149d2b1 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

Rename and simplify DropPermissionHolder 

Rename DropPermissionHolder to DropPermissions and move
all server-side implementation details into a separate class.
Rename DragEvent.getDropPermissionHolder to
requestDropPermissions and make it take the permissions
implicitly.

Change-Id: Ia83f7cb8af07ce13ba9536d24b0f9d63331d8736
parent 3a0ea625

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/textservice/ISpellCheckerSessionListener.aidl \

	core/java/com/android/internal/textservice/ITextServicesManager.aidl \

	core/java/com/android/internal/textservice/ITextServicesSessionListener.aidl \

	core/java/com/android/internal/view/IDropPermissionHolder.aidl \

	core/java/com/android/internal/view/IDropPermissions.aidl \

	core/java/com/android/internal/view/IInputContext.aidl \

	core/java/com/android/internal/view/IInputContextCallback.aidl \

	core/java/com/android/internal/view/IInputMethod.aidl \

api/current.txt

+3 −7
Original line number Diff line number Diff line
@@ -39298,11 +39298,11 @@ package android.view { 
    method public int getAction();

    method public android.content.ClipData getClipData();

    method public android.content.ClipDescription getClipDescription();

    method public android.view.DropPermissionHolder getDropPermissionHolder();

    method public java.lang.Object getLocalState();

    method public boolean getResult();

    method public float getX();

    method public float getY();

    method public android.view.DropPermissions requestDropPermissions();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int ACTION_DRAG_ENDED = 4; // 0x4

    field public static final int ACTION_DRAG_ENTERED = 5; // 0x5
@@ -39313,12 +39313,8 @@ package android.view { 
    field public static final android.os.Parcelable.Creator<android.view.DragEvent> CREATOR;

  }













  public class DropPermissionHolder implements android.os.Parcelable {













    method public int describeContents();













    method public void grant();













    method public void revoke();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.DropPermissionHolder> CREATOR;













  public final class DropPermissions {













    method public void release();















  }





























  public class FocusFinder {

























api/system-current.txt



+3
−7




























Original line number
Diff line number
Diff line








@@ -41650,11 +41650,11 @@ package android.view {













    method public int getAction();















    method public android.content.ClipData getClipData();















    method public android.content.ClipDescription getClipDescription();













    method public android.view.DropPermissionHolder getDropPermissionHolder();















    method public java.lang.Object getLocalState();















    method public boolean getResult();















    method public float getX();















    method public float getY();













    method public android.view.DropPermissions requestDropPermissions();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final int ACTION_DRAG_ENDED = 4; // 0x4















    field public static final int ACTION_DRAG_ENTERED = 5; // 0x5









@@ -41665,12 +41665,8 @@ package android.view {













    field public static final android.os.Parcelable.Creator<android.view.DragEvent> CREATOR;















  }



























  public class DropPermissionHolder implements android.os.Parcelable {













    method public int describeContents();













    method public void grant();













    method public void revoke();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.DropPermissionHolder> CREATOR;













  public final class DropPermissions {













    method public void release();















  }





























  public class FocusFinder {

























api/test-current.txt



+3
−7




























Original line number
Diff line number
Diff line








@@ -39300,11 +39300,11 @@ package android.view {













    method public int getAction();















    method public android.content.ClipData getClipData();















    method public android.content.ClipDescription getClipDescription();













    method public android.view.DropPermissionHolder getDropPermissionHolder();















    method public java.lang.Object getLocalState();















    method public boolean getResult();















    method public float getX();















    method public float getY();













    method public android.view.DropPermissions requestDropPermissions();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final int ACTION_DRAG_ENDED = 4; // 0x4















    field public static final int ACTION_DRAG_ENTERED = 5; // 0x5









@@ -39315,12 +39315,8 @@ package android.view {













    field public static final android.os.Parcelable.Creator<android.view.DragEvent> CREATOR;















  }



























  public class DropPermissionHolder implements android.os.Parcelable {













    method public int describeContents();













    method public void grant();













    method public void revoke();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.DropPermissionHolder> CREATOR;













  public final class DropPermissions {













    method public void release();















  }





























  public class FocusFinder {

























core/java/android/content/ClipData.java



+22
−0




























Original line number
Diff line number
Diff line








@@ -36,6 +36,7 @@ import java.io.FileNotFoundException;













import java.io.IOException;















import java.io.InputStreamReader;















import java.util.ArrayList;













import java.util.List;































/**















 * Representation of a clipped data on the clipboard.










@@ -914,6 +915,27 @@ public class ClipData implements Parcelable {













        }















    }





























    /** @hide */













    public void collectUris(List<Uri> out) {













        for (int i = 0; i < mItems.size(); ++i) {













            ClipData.Item item = getItemAt(i);



























            if (item.getUri() != null) {













                out.add(item.getUri());













            }



























            Intent intent = item.getIntent();













            if (intent != null) {













                if (intent.getData() != null) {













                    out.add(intent.getData());













                }













                if (intent.getClipData() != null) {













                    intent.getClipData().collectUris(out);













                }













            }













        }













    }





























    @Override















    public int describeContents() {















        return 0;