summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/ui/drag-drop.jd27
-rw-r--r--docs/html/samples/new/index.jd130
-rw-r--r--docs/html/topic/libraries/support-library/revisions.jd2
3 files changed, 57 insertions, 102 deletions
diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd
index 8871c87f4f25..8e4297f8ce1b 100644
--- a/docs/html/guide/topics/ui/drag-drop.jd
+++ b/docs/html/guide/topics/ui/drag-drop.jd
@@ -152,7 +152,7 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm
drag event listeners or callback methods of each View in the layout. The listeners or callback
methods can use the metadata to decide if they want to accept the data when it is dropped.
If the user drops the data over a View object, and that View object's listener or callback
- method has previously told the system that it wants to accept the drop, then the system sends
+ method has previously told the system that it wants to accept the data, then the system sends
the data to the listener or callback method in a drag event.
</p>
<p>
@@ -226,7 +226,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm
</dt>
<dd>
The user releases the drag shadow within the bounding box of a View that can accept the
- data. The system sends the View object's listener a drag event with action type
+ data, but not within its descendant view that can accept the data. The system sends the View
+ 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()}
@@ -317,6 +318,10 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm
application calls
{@link android.view.View#startDrag(ClipData,View.DragShadowBuilder,Object,int) startDrag()} 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.
+ </p>
</td>
</tr>
<tr>
@@ -324,9 +329,7 @@ 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 when the drag shadow
has just entered the bounding box of the View. This is the first event action type the
- listener receives when the drag shadow enters the bounding box. If the listener wants to
- continue receiving drag events for this operation, it must return boolean
- <code>true</code> to the system.
+ listener receives when the drag shadow enters the bounding box.
</td>
</tr>
<tr>
@@ -334,7 +337,8 @@ 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 after it receives a
{@link android.view.DragEvent#ACTION_DRAG_ENTERED} event while the drag shadow is
- still within the bounding box of the View.
+ still within the bounding box of the View and not within a descendant view that can
+ accept the data.
</td>
</tr>
<tr>
@@ -343,7 +347,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm
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
- the drag shadow outside the bounding box of the View.
+ the drag shadow outside the bounding box of the View or into a descendant view that can
+ accept the data.
</td>
</tr>
<tr>
@@ -395,7 +400,7 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm
<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;">&nbsp;</td>
+ <td style="text-align: center;">X</td>
<td style="text-align: center;">&nbsp;</td>
<td style="text-align: center;">&nbsp;</td>
</tr>
@@ -711,8 +716,7 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() {
If the listener can accept a drop, it should return <code>true</code>. This tells
the system to continue to send drag events to the listener.
If it can't accept a drop, it should return <code>false</code>, and the system
- will stop sending drag events until it sends out
- {@link android.view.DragEvent#ACTION_DRAG_ENDED}.
+ will stop sending drag events for the current drag operation.
</li>
</ol>
<p>
@@ -754,7 +758,8 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() {
<li>
{@link android.view.DragEvent#ACTION_DRAG_EXITED}: This event is sent to a listener that
previously received {@link android.view.DragEvent#ACTION_DRAG_ENTERED}, after
- the drag shadow is no longer within the bounding box of the listener's View.
+ the drag shadow is no longer within the bounding box of the listener's View or it's within
+ the bounding box of a descendant view that can accept the data.
</li>
</ul>
<p>
diff --git a/docs/html/samples/new/index.jd b/docs/html/samples/new/index.jd
index a7ffa8c45fe8..4d6262edb501 100644
--- a/docs/html/samples/new/index.jd
+++ b/docs/html/samples/new/index.jd
@@ -5,7 +5,7 @@ page.image=images/cards/samples-new_2x.png
<p>The following code samples were recently published. You can
download them in the Android SDK Manager under the <b>Samples for SDK</b>
-component for Android 6.0 (API 23).</p>
+component for Android 7.1 (API 25).</p>
<p class="note">
<strong>Note:</strong> The downloadable projects are designed
@@ -14,115 +14,67 @@ component for Android 6.0 (API 23).</p>
<!-- NOTE TO EDITORS: add most recent samples first -->
-<h3 id="ActiveNotification">
- <a href="{@docRoot}samples/ActiveNotifications/index.html">Active
- Notification</a>
-</h3>
-<p>
- This sample demonstrates how to use the {@link
- android.app.NotificationManager} to tell you how many notifications your app
- is currently showing.
-</p>
-
-<h3 id="AutomaticBackup">
- <a href="{@docRoot}samples/AutoBackupForApps/index.html">Auto Backup for
- Apps</a>
-</h3>
-
-<p>
- Android 6.0 (API level 23) introduces automatic backup for app settings. This
- sample demonstrates how to add filtering rules to an app to manage settings
- backup.
-</p>
+<h3 id="app-shortcuts">App shortcuts sample</h3>
-<h3 id="Camera2Raw">
- <a href="{@docRoot}samples/Camera2Raw/index.html">Camera 2 Raw</a>
-</h3>
+<!-- TBA
+<img src="sample-img.png" style="float: left; padding-right: 0.5em"
+ width="xxx"/>
+-->
<p>
- This sample demonstrates how to use the
- <a href="{@docRoot}reference/android/hardware/camera2/package-summary.html">
- <code>Camera2</code></a> API to capture RAW camera buffers and save them as
- DNG files.
-</p>
-
-<h3 id="ConfirmCredential">
- <a href="{@docRoot}samples/ConfirmCredential/index.html">Confirm
- Credential</a>
-</h3>
-
-<p>
- This sample demonstrates how to use device credentials as an authentication method in your app.
+ This sample demonstrates how to use the <a href=
+ "/preview/app-shortcuts.html">app shortcuts API</a> introduced in Android 7.1
+ (API level 25). This API allows an application to define a set of intents
+ which are displayed when a user long-presses on the app's launcher icon.
+ Examples are given for registering links both statically in XML, as well as
+ dynamically at runtime.
</p>
-<h3 id="DeviceOwner">
- <a href="{@docRoot}samples/DeviceOwner/index.html">Device Owner</a>
-</h3>
-
<p>
- This sample demonstrates how to use the device owner features to manage and
- configure a device.
+ <a href="/samples/AppShortcuts/index.html">App shortcuts sample</a>
</p>
-<h3 id="DirectShare">
- <a href="{@docRoot}samples/DirectShare/index.html">Direct Share</a>
-</h3>
-
-<p>
- This sample demonstrates how to provide the
- <a href="{@docRoot}about/versions/marshmallow/android-6.0.html#direct-share">Direct
- Share</a> feature. The app shows some options directly in the list of share
- intent candidates.
-</p>
+<h3 id="img-kbd-app">Image keyboard app sample</h3>
-<h3 id="FingerprintDialog">
- <a href="{@docRoot}samples/FingerprintDialog/index.html">Fingerprint
- Dialog</a>
-</h3>
+<!-- TBA
+<img src="sample-img.png" style="float: left; padding-right: 0.5em"
+ width="xxx"/>
+-->
<p>
- This sample demonstrates how to recognize registered fingerprints to
- authenticate your app's user.
+ This sample demonstrates how to implement the <a href=
+ "/reference/android/view/inputmethod/InputConnection.html#commitContent(android.view.inputmethod.InputContentInfo,%20int,%20android.os.Bundle)">
+ Commit Content API</a>, using the <a href=
+ "/topic/libraries/support-library/index.html">Android Support Library</a>.
+ This API provides a universal way for IMEs to send images and other rich
+ content directly to a text editor in an app, allowing users to compose
+ content using custom emojis, stickers, or other rich content provided by
+ other applications.
</p>
-<h3 id="MidiScope">
- <a href="{@docRoot}samples/MidiScope/index.html">MidiScope</a>
-</h3>
-
<p>
- This sample demonstrates how to use the <a href=
- "{@docRoot}reference/android/media/midi/package-summary.html">MIDI API</a> to
- receive and process MIDI signals coming from an attached input device.
+ <a href="/samples/CommitContentSampleApp/index.html">Image keyboard app sample</a>
</p>
-<h3 id="MidiSynth">
- <a href="{@docRoot}samples/MidiSynth/index.html">MidiSynth</a>
-</h3>
+<h3 id="img-kbd-ime">Image keyboard IME sample</h3>
-<p>
- This sample demonstrates how to use the <a href=
- "{@docRoot}reference/android/media/midi/package-summary.html">MIDI API</a> to
- receive and play MIDI messages coming from an attached input device.
-</p>
-
-<h3 id="NfcProvisioning">
- <a href="{@docRoot}samples/NfcProvisioning/index.html">NFC Provisioning</a>
-</h3>
+<!-- TBA
+<img src="sample-img.png" style="float: left; padding-right: 0.5em"
+ width="xxx"/>
+-->
<p>
- This sample demonstrates how to use NFC to provision other devices with a
- specific device owner.
+ This sample demonstrates how to write a <a href=
+ "/preview/image-keyboard.html">custom image keyboard</a> using the <a href=
+ "/reference/android/view/inputmethod/InputConnection.html#commitContent(android.view.inputmethod.InputContentInfo,%20int,%20android.os.Bundle)">
+ Commit Content API</a> and the <a href=
+ "/topic/libraries/support-library/index.html">Android Support Library</a>.
+ This keyboard will be displayed inside compatible apps (also using the Commit
+ Content API), allowing users to insert emojis, stickers, or other rich
+ content into text editors.
</p>
-<h3 id="RuntimePermissions">
- <a href=
- "{@docRoot}samples/RuntimePermissions/index.html">RuntimePermissions</a>
-</h3>
-
<p>
- This sample shows runtime permissions available in Android 6.0 (API level 23)
- and higher. Display the log on screen to follow the execution. If executed on
- an Android 6.0 device, the app displays an additional option to access
- contacts using an 6.0-only optional permission.
+ <a href="/samples/CommitContentSampleIME/index.html">Image keyboard IME sample</a>
</p>
diff --git a/docs/html/topic/libraries/support-library/revisions.jd b/docs/html/topic/libraries/support-library/revisions.jd
index db99ec8b4d31..9a24d1540e9b 100644
--- a/docs/html/topic/libraries/support-library/revisions.jd
+++ b/docs/html/topic/libraries/support-library/revisions.jd
@@ -2974,8 +2974,6 @@ if (animator instanceof SimpleItemAnimator) {
<ul>
<li>Added {@link android.support.v7.widget.GridLayout} to provide support for the
{@link android.widget.GridLayout} layout object.</li>
- <li>Added {@link android.support.v7.widget.Space} which can be used to create blank areas
- within a {@link android.support.v7.widget.GridLayout} layout object.</li>
</ul>
</dl>
</div>