diff options
Diffstat (limited to 'docs/html')
20 files changed, 53 insertions, 43 deletions
diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd index 8e4297f8ce1b..9280818377d9 100644 --- a/docs/html/guide/topics/ui/drag-drop.jd +++ b/docs/html/guide/topics/ui/drag-drop.jd @@ -157,19 +157,22 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm </p> <p> Your application tells the system to start a drag by calling the - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()} method. This tells the system to start sending drag events. The method also sends the data that you are dragging. </p> <p> You can call - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()} for any attached View in the current layout. The system only uses the View object to get access to global settings in your layout. </p> <p> Once your application calls - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()}, + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()}, the rest of the process uses events that the system sends to the View objects in your current layout. </p> @@ -183,11 +186,13 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm </dt> <dd> In response to the user's gesture to begin a drag, your application calls - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} - to tell the system to start a drag. The arguments - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} - provide the data to be dragged, metadata for this data, and a callback for drawing the - drag shadow. + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()} + to tell the system to start a drag. The + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()} + arguments provide the data to be dragged, metadata for this data, and a callback for drawing + the drag shadow. <p> The system first responds by calling back to your application to get a drag shadow. It then displays the drag shadow on the device. @@ -199,12 +204,13 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm including a possible drop event, a drag event listener must return <code>true</code>. This registers the listener with the system. Only registered listeners continue to receive drag events. At this point, listeners can also change the appearance of their - View object to show that the listener can accept a drop event. + View object to show that the listener can accept the dragged data. </p> <p> If the drag event listener returns <code>false</code>, then it will not receive drag - events for the current operation until the system sends a drag event with action type - {@link android.view.DragEvent#ACTION_DRAG_ENDED}. By sending <code>false</code>, the + events for the current operation, including the drag event with action type + {@link android.view.DragEvent#ACTION_DRAG_ENDED} that will conclude the + operation. By sending <code>false</code>, the listener tells the system that it is not interested in the drag operation and does not want to accept the dragged data. </p> @@ -230,7 +236,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm object's listener a drag event with action type {@link android.view.DragEvent#ACTION_DROP}. The drag event contains the data that was passed to the system in the call to - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()} that started the operation. The listener is expected to return boolean <code>true</code> to the system if code for accepting the drop succeeds. <p> @@ -297,7 +304,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <p> The {@link android.view.DragEvent} object also contains the data that your application provided to the system in the call to - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()}. + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()}. Some of the data is valid only for certain action types. The data that is valid for each action type is summarized in <a href="#table2">table 2</a>. It is also described in detail with the event for which it is valid in the section @@ -316,8 +324,9 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <td> A View object's drag event listener receives this event action type just after the application calls -{@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} and - gets a drag shadow. + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()} + and gets a drag shadow. <p> If the listener wants to continue receiving drag events for this operation, it must return boolean <code>true</code> to the system. @@ -345,8 +354,7 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <td>{@link android.view.DragEvent#ACTION_DRAG_EXITED}</td> <td> A View object's drag event listener receives this event action type after it receives a - {@link android.view.DragEvent#ACTION_DRAG_ENTERED} and at least one - {@link android.view.DragEvent#ACTION_DRAG_LOCATION} event, and after the user has moved + {@link android.view.DragEvent#ACTION_DRAG_ENTERED} event, and after the user has moved the drag shadow outside the bounding box of the View or into a descendant view that can accept the data. </td> @@ -355,7 +363,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <td>{@link android.view.DragEvent#ACTION_DROP}</td> <td> A View object's drag event listener receives this event action type when the user - releases the drag shadow over the View object. This action type is only sent to a View + releases the drag shadow over the View object and not over its descendant view that can + accept the drag data. This action type is only sent to a View object's listener if the listener returned boolean <code>true</code> in response to the {@link android.view.DragEvent#ACTION_DRAG_STARTED} drag event. This action type is not sent if the user releases the drag shadow on a View whose listener is not registered, @@ -408,8 +417,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <td>{@link android.view.DragEvent#ACTION_DRAG_ENTERED}</td> <td style="text-align: center;">X</td> <td style="text-align: center;">X</td> - <td style="text-align: center;">X</td> - <td style="text-align: center;">X</td> + <td style="text-align: center;"> </td> + <td style="text-align: center;"> </td> <td style="text-align: center;"> </td> <td style="text-align: center;"> </td> </tr> @@ -442,7 +451,7 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm </tr> <tr> <td>{@link android.view.DragEvent#ACTION_DRAG_ENDED}</td> - <td style="text-align: center;">X</td> + <td style="text-align: center;"> </td> <td style="text-align: center;">X</td> <td style="text-align: center;"> </td> <td style="text-align: center;"> </td> @@ -472,9 +481,11 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm The image is called a drag shadow. You create it with methods you declare for a {@link android.view.View.DragShadowBuilder} object, and then pass it to the system when you start a drag using - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()}. + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()}. As part of its response to - {@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()}, + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()}, the system invokes the callback methods you've defined in {@link android.view.View.DragShadowBuilder} to obtain a drag shadow. </p> @@ -516,7 +527,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm </dt> <dd> The system calls this method immediately after you call -{@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()}. Use it + {@link android.view.View#startDragAndDrop(ClipData,View.DragShadowBuilder,Object,int) + startDragAndDrop()}. Use it to send to the system the dimensions and touch point of the drag shadow. The method has two arguments: <dl> @@ -616,10 +628,10 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { // Starts the drag - v.startDrag(dragData, // the data to be dragged - myShadow, // the drag shadow builder - null, // no need to use local data - 0 // flags (not currently used, set to 0) + v.startDragAndDrop(dragData, // the data to be dragged + myShadow, // the drag shadow builder + null, // no need to use local data + 0 // flags (not currently used, set to 0) ); } @@ -722,8 +734,7 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { <p> Note that for an {@link android.view.DragEvent#ACTION_DRAG_STARTED} event, these the following {@link android.view.DragEvent} methods are not valid: - {@link android.view.DragEvent#getClipData()}, {@link android.view.DragEvent#getX()}, - {@link android.view.DragEvent#getY()}, and {@link android.view.DragEvent#getResult()}. + {@link android.view.DragEvent#getClipData()} and {@link android.view.DragEvent#getResult()}. </p> <h3 id="HandleDuring">Handling events during the drag</h3> <p> @@ -751,7 +762,9 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { {@link android.view.DragEvent#ACTION_DRAG_LOCATION}: Once the listener receives an {@link android.view.DragEvent#ACTION_DRAG_ENTERED} event, and before it receives an A{@link android.view.DragEvent#ACTION_DRAG_EXITED} event, it receives a new - {@link android.view.DragEvent#ACTION_DRAG_LOCATION} event every time the touch point moves. + {@link android.view.DragEvent#ACTION_DRAG_LOCATION} event immediately after the + {@link android.view.DragEvent#ACTION_DRAG_ENTERED} event, and then every time the touch + point moves. The {@link android.view.DragEvent#getX()} and {@link android.view.DragEvent#getY()} methods return the X and Y coordinates of the touch point. </li> @@ -769,9 +782,9 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { </p> <ul> <li> - In response to {@link android.view.DragEvent#ACTION_DRAG_ENTERED} or - {@link android.view.DragEvent#ACTION_DRAG_LOCATION}, the listener can change the appearance - of the View to indicate that it is about to receive a drop. + In response to {@link android.view.DragEvent#ACTION_DRAG_ENTERED}, the listener can change + the appearance + of the View to indicate that it is ready to receive a drop. </li> <li> An event with the action type {@link android.view.DragEvent#ACTION_DRAG_LOCATION} contains @@ -784,14 +797,14 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { <li> In response to {@link android.view.DragEvent#ACTION_DRAG_EXITED}, the listener should reset any appearance changes it applied in response to - {@link android.view.DragEvent#ACTION_DRAG_ENTERED} or - {@link android.view.DragEvent#ACTION_DRAG_LOCATION}. This indicates to the user that + {@link android.view.DragEvent#ACTION_DRAG_ENTERED}. This indicates to the user that the View is no longer an imminent drop target. </li> </ul> <h3 id="HandleDrop">Responding to a drop</h3> <p> - When the user releases the drag shadow on a View in the application, and that View previously + When the user releases the drag shadow on a View in the application, but not on its descendant + view that can accept the data, and that View previously reported that it could accept the content being dragged, the system dispatches a drag event to that View with the action type {@link android.view.DragEvent#ACTION_DROP}. The listener should do the following: @@ -800,8 +813,8 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { <li> Call {@link android.view.DragEvent#getClipData()} to get the {@link android.content.ClipData} object that was originally supplied in the call - to -{@link android.view.View#startDrag(ClipData, View.DragShadowBuilder, Object, int) startDrag()} + to {@link android.view.View#startDragAndDrop(ClipData, View.DragShadowBuilder, Object, int) + startDragAndDrop()} and store it. If the drag and drop operation does not represent data movement, this may not be necessary. </li> @@ -856,9 +869,6 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { including any case in which the system did not send out a {@link android.view.DragEvent#ACTION_DROP} event. </li> - <li> - The listener should return boolean <code>true</code> to the system. - </li> </ol> <p> </p> diff --git a/docs/html/reference/images/graphics/colorspace_aces.png b/docs/html/reference/images/graphics/colorspace_aces.png Binary files differnew file mode 100644 index 000000000000..efafe5c851e7 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_aces.png diff --git a/docs/html/reference/images/graphics/colorspace_acescg.png b/docs/html/reference/images/graphics/colorspace_acescg.png Binary files differnew file mode 100644 index 000000000000..55f6ab58c42f --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_acescg.png diff --git a/docs/html/reference/images/graphics/colorspace_adobe_rgb.png b/docs/html/reference/images/graphics/colorspace_adobe_rgb.png Binary files differnew file mode 100644 index 000000000000..cb7d60258cb4 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_adobe_rgb.png diff --git a/docs/html/reference/images/graphics/colorspace_bt2020.png b/docs/html/reference/images/graphics/colorspace_bt2020.png Binary files differnew file mode 100644 index 000000000000..34a3853c1cc5 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_bt2020.png diff --git a/docs/html/reference/images/graphics/colorspace_bt709.png b/docs/html/reference/images/graphics/colorspace_bt709.png Binary files differnew file mode 100644 index 000000000000..ba637f525c43 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_bt709.png diff --git a/docs/html/reference/images/graphics/colorspace_clipped.png b/docs/html/reference/images/graphics/colorspace_clipped.png Binary files differnew file mode 100644 index 000000000000..28204e6e3a88 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_clipped.png diff --git a/docs/html/reference/images/graphics/colorspace_comparison.png b/docs/html/reference/images/graphics/colorspace_comparison.png Binary files differnew file mode 100644 index 000000000000..b1b015c73e74 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_comparison.png diff --git a/docs/html/reference/images/graphics/colorspace_comparison2.png b/docs/html/reference/images/graphics/colorspace_comparison2.png Binary files differnew file mode 100644 index 000000000000..b263aa1f5d2e --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_comparison2.png diff --git a/docs/html/reference/images/graphics/colorspace_dci_p3.png b/docs/html/reference/images/graphics/colorspace_dci_p3.png Binary files differnew file mode 100644 index 000000000000..19144e768fa6 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_dci_p3.png diff --git a/docs/html/reference/images/graphics/colorspace_display_p3.png b/docs/html/reference/images/graphics/colorspace_display_p3.png Binary files differnew file mode 100644 index 000000000000..a86c60ab9ae6 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_display_p3.png diff --git a/docs/html/reference/images/graphics/colorspace_ntsc_1953.png b/docs/html/reference/images/graphics/colorspace_ntsc_1953.png Binary files differnew file mode 100644 index 000000000000..bce93da60bda --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_ntsc_1953.png diff --git a/docs/html/reference/images/graphics/colorspace_points.png b/docs/html/reference/images/graphics/colorspace_points.png Binary files differnew file mode 100644 index 000000000000..84d1e77377a2 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_points.png diff --git a/docs/html/reference/images/graphics/colorspace_pro_photo_rgb.png b/docs/html/reference/images/graphics/colorspace_pro_photo_rgb.png Binary files differnew file mode 100644 index 000000000000..74c95be64de5 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_pro_photo_rgb.png diff --git a/docs/html/reference/images/graphics/colorspace_renderer.png b/docs/html/reference/images/graphics/colorspace_renderer.png Binary files differnew file mode 100644 index 000000000000..acf30c3e1716 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_renderer.png diff --git a/docs/html/reference/images/graphics/colorspace_scrgb.png b/docs/html/reference/images/graphics/colorspace_scrgb.png Binary files differnew file mode 100644 index 000000000000..2351b8e35fb7 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_scrgb.png diff --git a/docs/html/reference/images/graphics/colorspace_smpte_c.png b/docs/html/reference/images/graphics/colorspace_smpte_c.png Binary files differnew file mode 100644 index 000000000000..360bb73c78c0 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_smpte_c.png diff --git a/docs/html/reference/images/graphics/colorspace_srgb.png b/docs/html/reference/images/graphics/colorspace_srgb.png Binary files differnew file mode 100644 index 000000000000..ba637f525c43 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_srgb.png diff --git a/docs/html/reference/images/graphics/colorspace_ucs.png b/docs/html/reference/images/graphics/colorspace_ucs.png Binary files differnew file mode 100644 index 000000000000..3e0f0c6f0cc4 --- /dev/null +++ b/docs/html/reference/images/graphics/colorspace_ucs.png diff --git a/docs/html/topic/libraries/testing-support-library/index.jd b/docs/html/topic/libraries/testing-support-library/index.jd index 941f5c3024d0..3d3c0911fb9e 100644 --- a/docs/html/topic/libraries/testing-support-library/index.jd +++ b/docs/html/topic/libraries/testing-support-library/index.jd @@ -202,7 +202,7 @@ public class CalculatorInstrumentationTest <li><a href="{@docRoot}reference/android/support/test/filters/SdkSuppress.html">{@code @SdkSupress}</a>: Suppresses the test from running on a lower Android API level than the given level. For example, to suppress tests on all API levels lower than 18 from running, use the annotation - {@code @SDKSupress(minSdkVersion=18)}. + {@code @SdkSuppress(minSdkVersion=18)}. </li> <li>{@link android.test.suitebuilder.annotation.SmallTest @SmallTest}, |
