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

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

Browse Source
This commit is contained in:
Sunny Goyal
2016-03-17 01:50:07 +00:00
committed by Android (Google) Code Review
parent 95ee171e30 2a6d9aa1cd
commit 60dbc35784
5 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -3537,7 +3537,6 @@ package android.app {
method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
method public void onProvideAssistContent(android.app.assist.AssistContent); method public void onProvideAssistContent(android.app.assist.AssistContent);
method public void onProvideAssistData(android.os.Bundle); 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 android.net.Uri onProvideReferrer();
method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
method protected void onRestart(); method protected void onRestart();
@@ -4219,7 +4218,6 @@ package android.app {
method public void onPanelClosed(int, android.view.Menu); method public void onPanelClosed(int, android.view.Menu);
method public boolean onPrepareOptionsMenu(android.view.Menu); method public boolean onPrepareOptionsMenu(android.view.Menu);
method public boolean onPreparePanel(int, android.view.View, 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 void onRestoreInstanceState(android.os.Bundle);
method public android.os.Bundle onSaveInstanceState(); method public android.os.Bundle onSaveInstanceState();
method public boolean onSearchRequested(android.view.SearchEvent); 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 boolean onMenuOpened(int, android.view.Menu);
method public abstract void onPanelClosed(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 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();
method public abstract boolean onSearchRequested(android.view.SearchEvent); method public abstract boolean onSearchRequested(android.view.SearchEvent);
method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams); method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

4
api/system-current.txt
View File

@@ -3654,7 +3654,6 @@ package android.app {
method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
method public void onProvideAssistContent(android.app.assist.AssistContent); method public void onProvideAssistContent(android.app.assist.AssistContent);
method public void onProvideAssistData(android.os.Bundle); 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 android.net.Uri onProvideReferrer();
method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
method protected void onRestart(); method protected void onRestart();
@@ -4351,7 +4350,6 @@ package android.app {
method public void onPanelClosed(int, android.view.Menu); method public void onPanelClosed(int, android.view.Menu);
method public boolean onPrepareOptionsMenu(android.view.Menu); method public boolean onPrepareOptionsMenu(android.view.Menu);
method public boolean onPreparePanel(int, android.view.View, 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 void onRestoreInstanceState(android.os.Bundle);
method public android.os.Bundle onSaveInstanceState(); method public android.os.Bundle onSaveInstanceState();
method public boolean onSearchRequested(android.view.SearchEvent); 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 boolean onMenuOpened(int, android.view.Menu);
method public abstract void onPanelClosed(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 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();
method public abstract boolean onSearchRequested(android.view.SearchEvent); method public abstract boolean onSearchRequested(android.view.SearchEvent);
method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams); method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

4
api/test-current.txt
View File

@@ -3537,7 +3537,6 @@ package android.app {
method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
method public void onProvideAssistContent(android.app.assist.AssistContent); method public void onProvideAssistContent(android.app.assist.AssistContent);
method public void onProvideAssistData(android.os.Bundle); 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 android.net.Uri onProvideReferrer();
method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
method protected void onRestart(); method protected void onRestart();
@@ -4219,7 +4218,6 @@ package android.app {
method public void onPanelClosed(int, android.view.Menu); method public void onPanelClosed(int, android.view.Menu);
method public boolean onPrepareOptionsMenu(android.view.Menu); method public boolean onPrepareOptionsMenu(android.view.Menu);
method public boolean onPreparePanel(int, android.view.View, 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 void onRestoreInstanceState(android.os.Bundle);
method public android.os.Bundle onSaveInstanceState(); method public android.os.Bundle onSaveInstanceState();
method public boolean onSearchRequested(android.view.SearchEvent); 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 boolean onMenuOpened(int, android.view.Menu);
method public abstract void onPanelClosed(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 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();
method public abstract boolean onSearchRequested(android.view.SearchEvent); method public abstract boolean onSearchRequested(android.view.SearchEvent);
method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams); method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);

4
core/java/android/view/Window.java
View File

@@ -566,8 +566,8 @@ public abstract class Window {
* @param data The data list to populate with shortcuts. * @param data The data list to populate with shortcuts.
* @param menu The current menu, which may be null. * @param menu The current menu, which may be null.
*/ */
public void onProvideKeyboardShortcuts( default public void onProvideKeyboardShortcuts(
List<KeyboardShortcutGroup> data, @Nullable Menu menu); List<KeyboardShortcutGroup> data, @Nullable Menu menu) { };
} }
/** @hide */ /** @hide */

6
core/java/com/android/internal/policy/DecorView.java
View File

@@ -2073,11 +2073,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
public void requestKeyboardShortcuts(List<KeyboardShortcutGroup> list) { public void requestKeyboardShortcuts(List<KeyboardShortcutGroup> list) {
final PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false); final PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false);
if (!mWindow.isDestroyed() && st != null && mWindow.getCallback() != null) { if (!mWindow.isDestroyed() && st != null && mWindow.getCallback() != null) {
try { mWindow.getCallback().onProvideKeyboardShortcuts(list, st.menu);
mWindow.getCallback().onProvideKeyboardShortcuts(list, st.menu);
} catch (AbstractMethodError e) {
// We run into this if the app is using supportlib.
}
} }
} }