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

Commit 0ee7fecd authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by android-build-merger
Browse files

Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640c 

am: 45b1e144

* commit '45b1e144':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Ica830b89e1bf54de72c8ca46747c96ea3e18972d
parents 035b1d1c 45b1e144

Android.mk

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

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

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

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

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

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

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

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

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

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

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

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

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

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

api/current.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -3580,7 +3580,7 @@ package android.app { 
    method public boolean releaseInstance();

    method public boolean releaseInstance();

    method public final deprecated void removeDialog(int);

    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public void reportFullyDrawn();

    method public android.view.DropPermissions requestDropPermissions(android.view.DragEvent);

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

    method public final void requestKeyboardShortcutsHelper();

    method public final void requestPermissions(java.lang.String[], int);

    method public final void requestPermissions(java.lang.String[], int);

    method public boolean requestVisibleBehind(boolean);

    method public boolean requestVisibleBehind(boolean);
@@ -40973,6 +40973,10 @@ package android.view { 
    field public static final android.os.Parcelable.Creator<android.view.Display.Mode> CREATOR;

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

  }

  }




















  public final class DragAndDropPermissions {














    method public void release();














  }
























  public class DragEvent implements android.os.Parcelable {







  public class DragEvent implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public int getAction();







    method public int getAction();









@@ -40992,10 +40996,6 @@ package android.view {









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







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











  }







  }



























  public final class DropPermissions {














    method public void release();














  }



























  public class FocusFinder {







  public class FocusFinder {











    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);







    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);











    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);







    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);

























api/system-current.txt



+5
−5




























Original line number
Original line
Diff line number
Diff line








@@ -3699,7 +3699,7 @@ package android.app {









    method public boolean releaseInstance();







    method public boolean releaseInstance();











    method public final deprecated void removeDialog(int);







    method public final deprecated void removeDialog(int);











    method public void reportFullyDrawn();







    method public void reportFullyDrawn();











    method public android.view.DropPermissions requestDropPermissions(android.view.DragEvent);







    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);











    method public final void requestKeyboardShortcutsHelper();







    method public final void requestKeyboardShortcutsHelper();











    method public final void requestPermissions(java.lang.String[], int);







    method public final void requestPermissions(java.lang.String[], int);











    method public boolean requestVisibleBehind(boolean);







    method public boolean requestVisibleBehind(boolean);










@@ -43924,6 +43924,10 @@ package android.view {









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







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











  }







  }






























  public final class DragAndDropPermissions {














    method public void release();














  }
























  public class DragEvent implements android.os.Parcelable {







  public class DragEvent implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public int getAction();







    method public int getAction();









@@ -43943,10 +43947,6 @@ package android.view {









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







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











  }







  }



























  public final class DropPermissions {














    method public void release();














  }



























  public class FocusFinder {







  public class FocusFinder {











    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);







    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);











    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);







    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);

























api/test-current.txt



+5
−5




























Original line number
Original line
Diff line number
Diff line








@@ -3580,7 +3580,7 @@ package android.app {









    method public boolean releaseInstance();







    method public boolean releaseInstance();











    method public final deprecated void removeDialog(int);







    method public final deprecated void removeDialog(int);











    method public void reportFullyDrawn();







    method public void reportFullyDrawn();











    method public android.view.DropPermissions requestDropPermissions(android.view.DragEvent);







    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);











    method public final void requestKeyboardShortcutsHelper();







    method public final void requestKeyboardShortcutsHelper();











    method public final void requestPermissions(java.lang.String[], int);







    method public final void requestPermissions(java.lang.String[], int);











    method public boolean requestVisibleBehind(boolean);







    method public boolean requestVisibleBehind(boolean);










@@ -41050,6 +41050,10 @@ package android.view {









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







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











  }







  }






























  public final class DragAndDropPermissions {














    method public void release();














  }
























  public class DragEvent implements android.os.Parcelable {







  public class DragEvent implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public int getAction();







    method public int getAction();









@@ -41069,10 +41073,6 @@ package android.view {









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







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











  }







  }



























  public final class DropPermissions {














    method public void release();














  }



























  public class FocusFinder {







  public class FocusFinder {











    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);







    method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);











    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);







    method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);

























core/java/android/app/Activity.java



+9
−9




























Original line number
Original line
Diff line number
Diff line








@@ -85,8 +85,8 @@ import android.view.ActionMode;









import android.view.ContextMenu;







import android.view.ContextMenu;











import android.view.ContextMenu.ContextMenuInfo;







import android.view.ContextMenu.ContextMenuInfo;











import android.view.ContextThemeWrapper;







import android.view.ContextThemeWrapper;














import android.view.DragAndDropPermissions;











import android.view.DragEvent;







import android.view.DragEvent;











import android.view.DropPermissions;














import android.view.InputDevice;







import android.view.InputDevice;











import android.view.KeyCharacterMap;







import android.view.KeyCharacterMap;











import android.view.KeyEvent;







import android.view.KeyEvent;










@@ -6505,16 +6505,16 @@ public class Activity extends ContextThemeWrapper









    }







    }































    /**







    /**











     * Create {@link DropPermissions} object bound to this activity and controlling the access







     * Create {@link DragAndDropPermissions} object bound to this activity and controlling the











     * permissions for content URIs associated with the {@link DragEvent}.







     * access permissions for content URIs associated with the {@link DragEvent}.











     * @param event Drag event







     * @param event Drag event











     * @return The DropPermissions object used to control access to the content URIs. Null if







     * @return The {@link DragAndDropPermissions} object used to control access to the content URIs.











     * no content URIs are associated with the event or if permissions could not be granted.







     * Null if no content URIs are associated with the event or if permissions could not be granted.











     */







     */











    public DropPermissions requestDropPermissions(DragEvent event) {







    public DragAndDropPermissions requestDragAndDropPermissions(DragEvent event) {











        DropPermissions dropPermissions = DropPermissions.obtain(event);







        DragAndDropPermissions dragAndDropPermissions = DragAndDropPermissions.obtain(event);











        if (dropPermissions != null && dropPermissions.take(getActivityToken())) {







        if (dragAndDropPermissions != null && dragAndDropPermissions.take(getActivityToken())) {











            return dropPermissions;







            return dragAndDropPermissions;











        }







        }











        return null;







        return null;











    }







    }