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

Commit 4423d91d authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Add a type parameter to startActionMode() calls. 

This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
parent 993d1284

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -3450,6 +3450,7 @@ package android.app { 
    method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

    method public void onWindowFocusChanged(boolean);

    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);

    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);

    method public void openContextMenu(android.view.View);

    method public void openOptionsMenu();

    method public void overridePendingTransition(int, int);
@@ -3496,6 +3497,7 @@ package android.app { 
    method public final deprecated void showDialog(int);

    method public final deprecated boolean showDialog(int, android.os.Bundle);

    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);

    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);

    method public void startActivityForResult(android.content.Intent, int);

    method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);

    method public void startActivityFromChild(android.app.Activity, android.content.Intent, int);
@@ -4073,6 +4075,7 @@ package android.app { 
    method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

    method public void onWindowFocusChanged(boolean);

    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);

    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);

    method public void openContextMenu(android.view.View);

    method public void openOptionsMenu();

    method public void registerForContextMenu(android.view.View);
@@ -27541,6 +27544,7 @@ package android.service.dreams { 
    method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

    method public void onWindowFocusChanged(boolean);

    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);

    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);

    method public void setContentView(int);

    method public void setContentView(android.view.View);

    method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
@@ -34470,6 +34474,7 @@ package android.view { 
    method public void setZ(float);

    method public boolean showContextMenu();

    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);

    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);

    method public void startAnimation(android.view.animation.Animation);

    method public final boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);

    method public boolean startNestedScroll(int);
@@ -34925,6 +34930,7 @@ package android.view { 
    method public boolean shouldDelayChildPressedState();

    method public boolean showContextMenuForChild(android.view.View);

    method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);

    method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);

    method public void startLayoutAnimation();

    method public void startViewTransition(android.view.View);

    method public void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams);
@@ -35045,6 +35051,7 @@ package android.view { 
    method public abstract void requestTransparentRegion(android.view.View);

    method public abstract boolean showContextMenuForChild(android.view.View);

    method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);

    method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);

  }















  public class ViewPropertyAnimator {










@@ -35333,6 +35340,7 @@ package android.view {













    method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);















    method public abstract void onWindowFocusChanged(boolean);















    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);













    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);















  }





























  public final class WindowAnimationFrameStats extends android.view.FrameStats implements android.os.Parcelable {

























api/system-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -3533,6 +3533,7 @@ package android.app {













    method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);















    method public void onWindowFocusChanged(boolean);















    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);













    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);















    method public void openContextMenu(android.view.View);















    method public void openOptionsMenu();















    method public void overridePendingTransition(int, int);










@@ -3579,6 +3580,7 @@ package android.app {













    method public final deprecated void showDialog(int);















    method public final deprecated boolean showDialog(int, android.os.Bundle);















    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);













    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);















    method public void startActivityForResult(android.content.Intent, int);















    method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);















    method public void startActivityFromChild(android.app.Activity, android.content.Intent, int);










@@ -4163,6 +4165,7 @@ package android.app {













    method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);















    method public void onWindowFocusChanged(boolean);















    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);













    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);















    method public void openContextMenu(android.view.View);















    method public void openOptionsMenu();















    method public void registerForContextMenu(android.view.View);










@@ -29147,6 +29150,7 @@ package android.service.dreams {













    method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);















    method public void onWindowFocusChanged(boolean);















    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);













    method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);















    method public void setContentView(int);















    method public void setContentView(android.view.View);















    method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);










@@ -36638,6 +36642,7 @@ package android.view {













    method public void setZ(float);















    method public boolean showContextMenu();















    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);













    method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);















    method public void startAnimation(android.view.animation.Animation);















    method public final boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);















    method public boolean startNestedScroll(int);










@@ -37093,6 +37098,7 @@ package android.view {













    method public boolean shouldDelayChildPressedState();















    method public boolean showContextMenuForChild(android.view.View);















    method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);













    method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);















    method public void startLayoutAnimation();















    method public void startViewTransition(android.view.View);















    method public void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams);










@@ -37213,6 +37219,7 @@ package android.view {













    method public abstract void requestTransparentRegion(android.view.View);















    method public abstract boolean showContextMenuForChild(android.view.View);















    method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);













    method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);















  }





























  public class ViewPropertyAnimator {










@@ -37502,6 +37509,7 @@ package android.view {













    method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);















    method public abstract void onWindowFocusChanged(boolean);















    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);













    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);















  }





























  public final class WindowAnimationFrameStats extends android.view.FrameStats implements android.os.Parcelable {

























core/java/android/app/Activity.java



+38
−6




























Original line number
Diff line number
Diff line








@@ -787,6 +787,7 @@ public class Activity extends ContextThemeWrapper













    private boolean mChangeCanvasToTranslucent;































    private boolean mTitleReady = false;













    private int mActionModeTypeStarting = ActionMode.TYPE_PRIMARY;































    private int mDefaultKeyMode = DEFAULT_KEYS_DISABLE;















    private SpannableStringBuilder mDefaultKeySsb = null;










@@ -5681,10 +5682,10 @@ public class Activity extends ContextThemeWrapper













    }































    /**













     * Start an action mode.













     * Start an action mode of the default type {@link ActionMode#TYPE_PRIMARY}.















     *













     * @param callback Callback that will manage lifecycle events for this context mode













     * @return The ContextMode that was started, or null if it was canceled













     * @param callback Callback that will manage lifecycle events for this action mode













     * @return The ActionMode that was started, or null if it was canceled















     *















     * @see ActionMode















     */









@@ -5693,6 +5694,20 @@ public class Activity extends ContextThemeWrapper













        return mWindow.getDecorView().startActionMode(callback);















    }





























    /**













     * Start an action mode of the given type.













     *













     * @param callback Callback that will manage lifecycle events for this action mode













     * @param type One of {@link ActionMode#TYPE_PRIMARY} or {@link ActionMode#TYPE_FLOATING}.













     * @return The ActionMode that was started, or null if it was canceled













     *













     * @see ActionMode













     */













    @Nullable













    public ActionMode startActionMode(ActionMode.Callback callback, int type) {













        return mWindow.getDecorView().startActionMode(callback, type);













    }





























    /**















     * Give the Activity a chance to control the UI for an action mode requested















     * by the system.









@@ -5707,13 +5722,30 @@ public class Activity extends ContextThemeWrapper













    @Nullable















    @Override















    public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {













        // Only Primary ActionModes are represented in the ActionBar.













        if (mActionModeTypeStarting == ActionMode.TYPE_PRIMARY) {















            initWindowDecorActionBar();















            if (mActionBar != null) {















                return mActionBar.startActionMode(callback);















            }













        }















        return null;















    }





























    /**













     * {@inheritDoc}













     */













    @Nullable













    @Override













    public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) {













        try {













            mActionModeTypeStarting = type;













            return onWindowStartingActionMode(callback);













        } finally {













            mActionModeTypeStarting = ActionMode.TYPE_PRIMARY;













        }













    }





























    /**















     * Notifies the Activity that an action mode has been started.















     * Activity subclasses overriding this method should call the superclass implementation.

































core/java/android/app/Dialog.java



+22
−3




























Original line number
Diff line number
Diff line








@@ -121,6 +121,8 @@ public class Dialog implements DialogInterface, Window.Callback,





























    private ActionMode mActionMode;





























    private int mActionModeTypeStarting = ActionMode.TYPE_PRIMARY;





























    private final Runnable mDismissAction = new Runnable() {















        public void run() {















            dismissDialog();










@@ -998,13 +1000,30 @@ public class Dialog implements DialogInterface, Window.Callback,













        }















    }





























    /**













     * {@inheritDoc}













     */













    @Override















    public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {













        if (mActionBar != null) {













        if (mActionBar != null && mActionModeTypeStarting == ActionMode.TYPE_PRIMARY) {















            return mActionBar.startActionMode(callback);















        }















        return null;















    }





























    /**













     * {@inheritDoc}













     */













    @Override













    public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) {













        try {













            mActionModeTypeStarting = type;













            return onWindowStartingActionMode(callback);













        } finally {













            mActionModeTypeStarting = ActionMode.TYPE_PRIMARY;













        }













    }





























    /**















     * {@inheritDoc}















     *

































core/java/android/app/SearchDialog.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -639,6 +639,12 @@ public class SearchDialog extends Dialog {













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















            return null;















        }



























        @Override













        public ActionMode startActionModeForChild(













                View child, ActionMode.Callback callback, int type) {













            return null;













        }















    }































    private boolean isEmpty(AutoCompleteTextView actv) {