Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb

Browse Source 
* commit '315f3865983f59e5ad9f42602f443e8c42b6e5c4':
  CustomSelectionActionModeCallback can prevent selection mode from starting.
This commit is contained in:
Gilles Debunne
2011-01-27 15:00:29 -08:00
committed by Android Git Automerger
parent 7af3a6f3dd 315f386598
commit 82ba0ecaa7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/TextView.java
View File

@@ -8204,6 +8204,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
* {@link android.R.id#selectAll}, {@link android.R.id#cut}, {@link android.R.id#copy} or * {@link android.R.id#selectAll}, {@link android.R.id#cut}, {@link android.R.id#copy} or
* {@link android.R.id#paste} ids as parameters. * {@link android.R.id#paste} ids as parameters.
* *
* Returning false from {@link ActionMode.Callback#onCreateActionMode(ActionMode, Menu)} will
* prevent the action mode from being started.
*
* Action click events should be handled by the custom implementation of * Action click events should be handled by the custom implementation of
* {@link ActionMode.Callback#onActionItemClicked(ActionMode, MenuItem)}. * {@link ActionMode.Callback#onActionItemClicked(ActionMode, MenuItem)}.
* *
@@ -8364,7 +8367,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
styledAttributes.recycle(); styledAttributes.recycle();
if (mCustomSelectionActionModeCallback != null) { if (mCustomSelectionActionModeCallback != null) {
mCustomSelectionActionModeCallback.onCreateActionMode(mode, menu); if (!mCustomSelectionActionModeCallback.onCreateActionMode(mode, menu)) {
// The custom mode can choose to cancel the action mode
return false;
}
} }
if (menu.hasVisibleItems() || mode.getCustomView() != null) { if (menu.hasVisibleItems() || mode.getCustomView() != null) {