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

Commit 428d587d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add pasteAsPlainText in some documentation where it is missing." am:... 

Merge "Add pasteAsPlainText in some documentation where it is missing." am: f7ee046c am: 9317b1ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994510

Change-Id: Idbf930b39b114de282b5e4384dd9a8544e613db0
parents aed366dc 9317b1ce

core/java/android/widget/TextView.java

+6 −2
Original line number Diff line number Diff line
@@ -12521,7 +12521,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    /**

     * Called when a context menu option for the text view is selected.  Currently

     * this will be one of {@link android.R.id#selectAll}, {@link android.R.id#cut},

     * {@link android.R.id#copy}, {@link android.R.id#paste} or {@link android.R.id#shareText}.

     * {@link android.R.id#copy}, {@link android.R.id#paste},

     * {@link android.R.id#pasteAsPlainText} (starting at API level 23) or

     * {@link android.R.id#shareText}.

     *

     * @return true if the context menu item action was performed.

     */
@@ -12712,6 +12714,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * method. The default actions can also be removed from the menu using

     * {@link android.view.Menu#removeItem(int)} and passing {@link android.R.id#selectAll},

     * {@link android.R.id#cut}, {@link android.R.id#copy}, {@link android.R.id#paste},

     * {@link android.R.id#pasteAsPlainText} (starting at API level 23),

     * {@link android.R.id#replaceText} or {@link android.R.id#shareText} ids as parameters.

     *

     * <p>Returning false from
@@ -12750,7 +12753,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * {@link android.view.ActionMode.Callback#onPrepareActionMode(android.view.ActionMode,

     * android.view.Menu)} method. The default actions can also be removed from the menu using

     * {@link android.view.Menu#removeItem(int)} and passing {@link android.R.id#selectAll},

     * {@link android.R.id#paste} or {@link android.R.id#replaceText} ids as parameters.</p>

     * {@link android.R.id#paste}, {@link android.R.id#pasteAsPlainText} (starting at API

     * level 23) or {@link android.R.id#replaceText} ids as parameters.</p>

     *

     * <p>Returning false from

     * {@link android.view.ActionMode.Callback#onCreateActionMode(android.view.ActionMode,