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

Commit 60dbc357 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Adding a default implementation for the new Window.Callback method" into nyc-dev

parents 95ee171e 2a6d9aa1

api/current.txt

+1 −3
Original line number Diff line number Diff line
@@ -3537,7 +3537,6 @@ 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();
@@ -4219,7 +4218,6 @@ 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);
@@ -43696,7 +43694,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 default 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

+1 −3
Original line number Diff line number Diff line
@@ -3654,7 +3654,6 @@ 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();
@@ -4351,7 +4350,6 @@ 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);
@@ -46452,7 +46450,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 default 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

+1 −3
Original line number Diff line number Diff line
@@ -3537,7 +3537,6 @@ 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();
@@ -4219,7 +4218,6 @@ 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);
@@ -43770,7 +43768,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 default 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/view/Window.java

+2 −2
Original line number Diff line number Diff line
@@ -566,8 +566,8 @@ public abstract class Window { 
         * @param data The data list to populate with shortcuts.

         * @param menu The current menu, which may be null.

         */

        public void onProvideKeyboardShortcuts(

                List<KeyboardShortcutGroup> data, @Nullable Menu menu);

        default public void onProvideKeyboardShortcuts(

                List<KeyboardShortcutGroup> data, @Nullable Menu menu) { };

    }



    /** @hide */

core/java/com/android/internal/policy/DecorView.java

+1 −5
Original line number Diff line number Diff line
@@ -2073,11 +2073,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    public void requestKeyboardShortcuts(List<KeyboardShortcutGroup> list) {

        final PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false);

        if (!mWindow.isDestroyed() && st != null && mWindow.getCallback() != null) {

            try {

            mWindow.getCallback().onProvideKeyboardShortcuts(list, st.menu);

            } catch (AbstractMethodError e) {

                // We run into this if the app is using supportlib.

            }

        }

    }