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

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

Browse Source 
* commit 'fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072':
  Don't take the compatibility path for non-primary ActionModes
This commit is contained in:
Adam Powell
2015-06-02 01:13:34 +00:00
committed by Android Git Automerger
parent fcec13f095 fa3f17f117
commit 3e03326719
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 @Override
public ActionMode startActionModeForChild( public ActionMode startActionModeForChild(
View originalView, ActionMode.Callback callback, int type) { 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; ActionMode mode;
try { try {
mGroupFlags |= FLAG_START_ACTION_MODE_FOR_CHILD_IS_TYPED; mGroupFlags |= FLAG_START_ACTION_MODE_FOR_CHILD_IS_TYPED;