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

Commit 4fce6666 authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "Request Keyboard Shortcuts for SysUI Dialog via Window"

parents 13656028 75e09796

api/current.txt

+25 −0
Original line number Diff line number Diff line
@@ -3505,6 +3505,7 @@ package android.app { 
    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public void onProvideAssistContent(android.app.assist.AssistContent);

    method public void onProvideAssistData(android.os.Bundle);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public android.net.Uri onProvideReferrer();

    method public void onRequestPermissionsResult(int, java.lang.String[], int[]);

    method protected void onRestart();
@@ -4189,6 +4190,7 @@ package android.app { 
    method public void onPanelClosed(int, android.view.Menu);

    method public boolean onPrepareOptionsMenu(android.view.Menu);

    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public void onRestoreInstanceState(android.os.Bundle);

    method public android.os.Bundle onSaveInstanceState();

    method public boolean onSearchRequested(android.view.SearchEvent);
@@ -33502,6 +33504,7 @@ package android.service.dreams { 
    method public boolean onMenuOpened(int, android.view.Menu);

    method public void onPanelClosed(int, android.view.Menu);

    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);

    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);

    method public boolean onSearchRequested(android.view.SearchEvent);

    method public boolean onSearchRequested();

    method public void onWakeUp();
@@ -40390,6 +40393,27 @@ package android.view { 
    method public void startTracking(android.view.KeyEvent, java.lang.Object);

  }













  public final class KeyboardShortcutGroup implements android.os.Parcelable {













    ctor public KeyboardShortcutGroup(java.lang.CharSequence, java.util.List<android.view.KeyboardShortcutInfo>);













    ctor public KeyboardShortcutGroup(java.lang.CharSequence);













    method public void addItem(android.view.KeyboardShortcutInfo);













    method public int describeContents();













    method public java.util.List<android.view.KeyboardShortcutInfo> getItems();













    method public java.lang.CharSequence getLabel();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutGroup> CREATOR;













  }

























  public final class KeyboardShortcutInfo implements android.os.Parcelable {













    ctor public KeyboardShortcutInfo(java.lang.CharSequence, char, int);













    method public int describeContents();













    method public char getBaseCharacter();













    method public java.lang.CharSequence getLabel();













    method public int getModifiers();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutInfo> CREATOR;













  }



























  public abstract class LayoutInflater {















    ctor protected LayoutInflater(android.content.Context);















    ctor protected LayoutInflater(android.view.LayoutInflater, android.content.Context);










@@ -42391,6 +42415,7 @@ package android.view {













    method public abstract boolean onMenuOpened(int, android.view.Menu);















    method public abstract void onPanelClosed(int, android.view.Menu);















    method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public abstract void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public abstract boolean onSearchRequested();















    method public abstract boolean onSearchRequested(android.view.SearchEvent);















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

























api/system-current.txt



+25
−0




























Original line number
Diff line number
Diff line








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













    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);















    method public void onProvideAssistContent(android.app.assist.AssistContent);















    method public void onProvideAssistData(android.os.Bundle);













    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public android.net.Uri onProvideReferrer();















    method public void onRequestPermissionsResult(int, java.lang.String[], int[]);















    method protected void onRestart();










@@ -4310,6 +4311,7 @@ package android.app {













    method public void onPanelClosed(int, android.view.Menu);















    method public boolean onPrepareOptionsMenu(android.view.Menu);















    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public void onRestoreInstanceState(android.os.Bundle);















    method public android.os.Bundle onSaveInstanceState();















    method public boolean onSearchRequested(android.view.SearchEvent);










@@ -35640,6 +35642,7 @@ package android.service.dreams {













    method public boolean onMenuOpened(int, android.view.Menu);















    method public void onPanelClosed(int, android.view.Menu);















    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public boolean onSearchRequested(android.view.SearchEvent);















    method public boolean onSearchRequested();















    method public void onWakeUp();










@@ -42741,6 +42744,27 @@ package android.view {













    method public void startTracking(android.view.KeyEvent, java.lang.Object);















  }



























  public final class KeyboardShortcutGroup implements android.os.Parcelable {













    ctor public KeyboardShortcutGroup(java.lang.CharSequence, java.util.List<android.view.KeyboardShortcutInfo>);













    ctor public KeyboardShortcutGroup(java.lang.CharSequence);













    method public void addItem(android.view.KeyboardShortcutInfo);













    method public int describeContents();













    method public java.util.List<android.view.KeyboardShortcutInfo> getItems();













    method public java.lang.CharSequence getLabel();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutGroup> CREATOR;













  }

























  public final class KeyboardShortcutInfo implements android.os.Parcelable {













    ctor public KeyboardShortcutInfo(java.lang.CharSequence, char, int);













    method public int describeContents();













    method public char getBaseCharacter();













    method public java.lang.CharSequence getLabel();













    method public int getModifiers();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutInfo> CREATOR;













  }



























  public abstract class LayoutInflater {















    ctor protected LayoutInflater(android.content.Context);















    ctor protected LayoutInflater(android.view.LayoutInflater, android.content.Context);










@@ -44743,6 +44767,7 @@ package android.view {













    method public abstract boolean onMenuOpened(int, android.view.Menu);















    method public abstract void onPanelClosed(int, android.view.Menu);















    method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public abstract void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public abstract boolean onSearchRequested();















    method public abstract boolean onSearchRequested(android.view.SearchEvent);















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

























api/test-current.txt



+25
−0




























Original line number
Diff line number
Diff line








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













    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);















    method public void onProvideAssistContent(android.app.assist.AssistContent);















    method public void onProvideAssistData(android.os.Bundle);













    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public android.net.Uri onProvideReferrer();















    method public void onRequestPermissionsResult(int, java.lang.String[], int[]);















    method protected void onRestart();










@@ -4189,6 +4190,7 @@ package android.app {













    method public void onPanelClosed(int, android.view.Menu);















    method public boolean onPrepareOptionsMenu(android.view.Menu);















    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public void onRestoreInstanceState(android.os.Bundle);















    method public android.os.Bundle onSaveInstanceState();















    method public boolean onSearchRequested(android.view.SearchEvent);










@@ -33516,6 +33518,7 @@ package android.service.dreams {













    method public boolean onMenuOpened(int, android.view.Menu);















    method public void onPanelClosed(int, android.view.Menu);















    method public boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public boolean onSearchRequested(android.view.SearchEvent);















    method public boolean onSearchRequested();















    method public void onWakeUp();










@@ -40406,6 +40409,27 @@ package android.view {













    method public void startTracking(android.view.KeyEvent, java.lang.Object);















  }



























  public final class KeyboardShortcutGroup implements android.os.Parcelable {













    ctor public KeyboardShortcutGroup(java.lang.CharSequence, java.util.List<android.view.KeyboardShortcutInfo>);













    ctor public KeyboardShortcutGroup(java.lang.CharSequence);













    method public void addItem(android.view.KeyboardShortcutInfo);













    method public int describeContents();













    method public java.util.List<android.view.KeyboardShortcutInfo> getItems();













    method public java.lang.CharSequence getLabel();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutGroup> CREATOR;













  }

























  public final class KeyboardShortcutInfo implements android.os.Parcelable {













    ctor public KeyboardShortcutInfo(java.lang.CharSequence, char, int);













    method public int describeContents();













    method public char getBaseCharacter();













    method public java.lang.CharSequence getLabel();













    method public int getModifiers();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.view.KeyboardShortcutInfo> CREATOR;













  }



























  public abstract class LayoutInflater {















    ctor protected LayoutInflater(android.content.Context);















    ctor protected LayoutInflater(android.view.LayoutInflater, android.content.Context);










@@ -42407,6 +42431,7 @@ package android.view {













    method public abstract boolean onMenuOpened(int, android.view.Menu);















    method public abstract void onPanelClosed(int, android.view.Menu);















    method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);













    method public abstract void onProvideKeyboardShortcuts(java.util.List<android.view.KeyboardShortcutGroup>, android.view.Menu);















    method public abstract boolean onSearchRequested();















    method public abstract boolean onSearchRequested(android.view.SearchEvent);















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

























core/java/android/app/Activity.java



+41
−1




























Original line number
Diff line number
Diff line








@@ -62,6 +62,7 @@ import android.database.Cursor;













import android.graphics.Bitmap;















import android.graphics.Canvas;















import android.graphics.drawable.Drawable;













import android.graphics.drawable.Icon;















import android.media.AudioManager;















import android.media.session.MediaController;















import android.net.Uri;









@@ -71,6 +72,7 @@ import android.os.Handler;













import android.os.IBinder;















import android.os.Looper;















import android.os.Parcelable;













import android.os.PersistableBundle;















import android.os.RemoteException;















import android.os.StrictMode;















import android.os.UserHandle;









@@ -78,23 +80,28 @@ import android.text.Selection;













import android.text.SpannableStringBuilder;















import android.text.TextUtils;















import android.text.method.TextKeyListener;













import android.transition.Scene;













import android.transition.TransitionManager;













import android.util.ArrayMap;















import android.util.AttributeSet;















import android.util.EventLog;















import android.util.Log;















import android.util.PrintWriterPrinter;















import android.util.Slog;















import android.util.SparseArray;













import android.util.SuperNotCalledException;















import android.view.ActionMode;















import android.view.ContextMenu;















import android.view.ContextMenu.ContextMenuInfo;















import android.view.ContextThemeWrapper;















import android.view.KeyEvent;













import android.view.KeyboardShortcutGroup;













import android.view.KeyboardShortcutInfo;















import android.view.LayoutInflater;















import android.view.Menu;















import android.view.MenuInflater;















import android.view.MenuItem;















import android.view.MotionEvent;













import com.android.internal.policy.PhoneWindow;















import android.view.SearchEvent;















import android.view.View;















import android.view.View.OnCreateContextMenuListener;









@@ -103,10 +110,17 @@ import android.view.ViewGroup.LayoutParams;













import android.view.ViewManager;















import android.view.ViewRootImpl;















import android.view.Window;













import android.view.Window.WindowControllerCallback;















import android.view.WindowManager;















import android.view.WindowManagerGlobal;















import android.view.accessibility.AccessibilityEvent;















import android.widget.AdapterView;













import android.widget.Toolbar;



























import com.android.internal.app.IVoiceInteractor;













import com.android.internal.app.ToolbarActionBar;













import com.android.internal.app.WindowDecorActionBar;













import com.android.internal.policy.PhoneWindow;































import java.io.FileDescriptor;















import java.io.PrintWriter;









@@ -116,6 +130,8 @@ import java.util.ArrayList;













import java.util.HashMap;















import java.util.List;





























import static java.lang.Character.MIN_VALUE;





























/**















 * An activity is a single, focused thing that the user can do.  Almost all















 * activities interact with the user, so the Activity class takes care of










@@ -1594,6 +1610,30 @@ public class Activity extends ContextThemeWrapper













    public void onProvideAssistContent(AssistContent outContent) {















    }





























    @Override













    public void onProvideKeyboardShortcuts(List<KeyboardShortcutGroup> data, Menu menu) {













        if (menu == null) {













          return;













        }













        KeyboardShortcutGroup group = null;













        int menuSize = menu.size();













        for (int i = 0; i < menuSize; ++i) {













            final MenuItem item = menu.getItem(i);













            final CharSequence title = item.getTitle();













            final char alphaShortcut = item.getAlphabeticShortcut();













            if (title != null && alphaShortcut != MIN_VALUE) {













                if (group == null) {













                    group = new KeyboardShortcutGroup(null /* no label */);













                }













                group.addItem(new KeyboardShortcutInfo(













                    title, alphaShortcut, KeyEvent.META_CTRL_ON));













            }













        }













        if (group != null) {













            data.add(group);













        }













    }





























    /**















     * Ask to have the current assistant shown to the user.  This only works if the calling















     * activity is the current foreground activity.  It is the same as calling

































core/java/android/app/Dialog.java



+11
−3




























Original line number
Diff line number
Diff line








@@ -21,9 +21,8 @@ import android.annotation.DrawableRes;













import android.annotation.IdRes;















import android.annotation.LayoutRes;















import android.annotation.NonNull;













import android.annotation.StringRes;





























import android.annotation.Nullable;













import android.annotation.StringRes;















import android.annotation.StyleRes;















import android.content.ComponentName;















import android.content.Context;









@@ -44,11 +43,11 @@ import android.view.ContextMenu.ContextMenuInfo;













import android.view.ContextThemeWrapper;















import android.view.Gravity;















import android.view.KeyEvent;













import android.view.KeyboardShortcutGroup;















import android.view.LayoutInflater;















import android.view.Menu;















import android.view.MenuItem;















import android.view.MotionEvent;













import com.android.internal.policy.PhoneWindow;















import android.view.SearchEvent;















import android.view.View;















import android.view.View.OnCreateContextMenuListener;









@@ -60,8 +59,10 @@ import android.view.accessibility.AccessibilityEvent;





























import com.android.internal.R;















import com.android.internal.app.WindowDecorActionBar;













import com.android.internal.policy.PhoneWindow;































import java.lang.ref.WeakReference;













import java.util.List;































/**















 * Base class for Dialogs.










@@ -1080,6 +1081,13 @@ public class Dialog implements DialogInterface, Window.Callback,













        }















    }





























    /**













     * {@inheritDoc}













     */













    @Override













    public void onProvideKeyboardShortcuts(List<KeyboardShortcutGroup> data, Menu menu) {













    }





























    /**















     * @return The activity associated with this dialog, or null if there is no associated activity.















     */