diff options
| author | Adam Powell <adamp@google.com> | 2015-06-02 01:00:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 01:00:06 +0000 |
| commit | fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072 (patch) | |
| tree | e87f0b35eb887a21f9f8823d6d2c1956584bf17e /core/java/android/view/ViewGroup.java | |
| parent | 4982e7b4dce8afe2a5490ac6a6630039946b782f (diff) | |
| parent | e9fd6d29f49e11bdce4d4cb865c04e24fb7b55fa (diff) | |
| download | frameworks_base-fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072.zip frameworks_base-fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072.tar.gz frameworks_base-fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072.tar.bz2 | |
Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 317141c..e015c04 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -793,7 +793,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager @Override public ActionMode startActionModeForChild( View originalView, ActionMode.Callback callback, int type) { - if ((mGroupFlags & FLAG_START_ACTION_MODE_FOR_CHILD_IS_NOT_TYPED) == 0) { + if ((mGroupFlags & FLAG_START_ACTION_MODE_FOR_CHILD_IS_NOT_TYPED) == 0 + && type == ActionMode.TYPE_PRIMARY) { ActionMode mode; try { mGroupFlags |= FLAG_START_ACTION_MODE_FOR_CHILD_IS_TYPED; |