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

Commit a16741cd authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed javadoc for View.setContentCaptureSession()." into qt-dev 

am: a4630da2

Change-Id: I62e5743a0d006aa00b320aab2b7afc01d0e277b5
parents 90151368 a4630da2

core/java/android/view/View.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -9076,18 +9076,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * <pre>

     * <pre>

     *   ContentCaptureSession mainSession = rootView.getContentCaptureSession();

     *   ContentCaptureSession mainSession = rootView.getContentCaptureSession();

     *   mainSession.setContentCaptureContext(ContentCaptureContext.forLocusId(Uri.parse(myUrl));

     *   mainSession.setContentCaptureContext(ContentCaptureContext.forLocusId(Uri.parse(myUrl));

     * <pre>

     * </pre>

     *

     *

     * <p>Then if the page had an {@code IFRAME}, you would create a new session for it:

     * <p>Then if the page had an {@code IFRAME}, you would create a new session for it:

     *

     *

     * <p>For example, if your activity is associated with a web domain, you could create a session

     * {@code onCreate()} and associate it with the root view of the activity:

     *

     * <pre>

     * <pre>

     *   ContentCaptureSession iframeSession = mainSession.createContentCaptureSession(

     *   ContentCaptureSession iframeSession = mainSession.createContentCaptureSession(

     *       ContentCaptureContext.forLocusId(Uri.parse(iframeUrl)));

     *       ContentCaptureContext.forLocusId(Uri.parse(iframeUrl)));

     *   iframeView.setContentCaptureSession(iframeSession);

     *   iframeView.setContentCaptureSession(iframeSession);

     * <pre>

     * </pre>

     *

     *

     * @param contentCaptureSession a session created by

     * @param contentCaptureSession a session created by

     * {@link ContentCaptureSession#createContentCaptureSession(

     * {@link ContentCaptureSession#createContentCaptureSession(

core/java/android/view/contentcapture/ContentCaptureSession.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.ArrayList; 
import java.util.Random;

import java.util.Random;





/**

/**

 * Session used to notify the Android system about events associated with views.

 * Session used when notifying the Android system about events associated with views.

 */

 */

public abstract class ContentCaptureSession implements AutoCloseable {

public abstract class ContentCaptureSession implements AutoCloseable {

core/java/android/view/contentcapture/DataRemovalRequest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,9 @@ import java.util.List; 




/**

/**

 * Class used by apps to remove content capture data associated with {@link LocusId LocusIds}.

 * Class used by apps to remove content capture data associated with {@link LocusId LocusIds}.

 *

 * <p>An app which has tagged data with a LocusId can therefore delete them later. This is intended

 * to let apps propagate deletions of user data into the operating system.

 */

 */

public final class DataRemovalRequest implements Parcelable {

public final class DataRemovalRequest implements Parcelable {