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

Commit 931831dc authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Prevent starting an action mode from within an actionbar/mode UI."

parents 5c9609f1 9146ac70

core/java/com/android/internal/widget/ActionBarContextView.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,12 @@ public class ActionBarContextView extends ViewGroup { 
        a.recycle();

        a.recycle();

    }

    }

    

    

    @Override

    public ActionMode startActionModeForChild(View child, ActionMode.Callback callback) {

        // No starting an action mode for an existing action mode UI child! (Where would it go?)

        return null;

    }



    public void setHeight(int height) {

    public void setHeight(int height) {

        mContentHeight = height;

        mContentHeight = height;

    }

    }

core/java/com/android/internal/widget/ActionBarView.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -22,8 +22,8 @@ import com.android.internal.view.menu.ActionMenuView; 
import com.android.internal.view.menu.MenuBuilder;

import com.android.internal.view.menu.MenuBuilder;





import android.app.ActionBar;

import android.app.ActionBar;

import android.app.Activity;

import android.app.ActionBar.NavigationCallback;

import android.app.ActionBar.NavigationCallback;

import android.app.Activity;

import android.content.Context;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;
@@ -34,6 +34,7 @@ import android.graphics.drawable.Drawable; 
import android.text.TextUtils.TruncateAt;

import android.text.TextUtils.TruncateAt;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.view.ActionMode;

import android.view.Gravity;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.Menu;
@@ -187,6 +188,12 @@ public class ActionBarView extends ViewGroup { 
        }

        }

    }

    }





    @Override

    public ActionMode startActionModeForChild(View child, ActionMode.Callback callback) {

        // No starting an action mode for an action bar child! (Where would it go?)

        return null;

    }



    public void setCallback(NavigationCallback callback) {

    public void setCallback(NavigationCallback callback) {

        mCallback = callback;

        mCallback = callback;

    }

    }