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

Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev

Browse Source
This commit is contained in:
Adam Powell
2015-06-02 01:00:05 +00:00
committed by Android (Google) Code Review
parent 4982e7b4dc e9fd6d29f4
commit fa3f17f117
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ViewGroup.java
View File

@@ -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;