diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 1 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 1 |
5 files changed, 5 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 7a01e1a874fc..a2c711ddd6e6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3681,7 +3681,6 @@ package android.app { method public void onLowMemory(); method public boolean onMenuItemSelected(int, android.view.MenuItem); method public boolean onMenuOpened(int, android.view.Menu); - method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onMultiWindowModeChanged(boolean, android.content.res.Configuration); method public deprecated void onMultiWindowModeChanged(boolean); method public boolean onNavigateUp(); @@ -45654,7 +45653,6 @@ package android.view { method public boolean onKeyUp(int, android.view.KeyEvent); method protected void onLayout(boolean, int, int, int, int); method protected void onMeasure(int, int); - method public void onMovedToDisplay(int, android.content.res.Configuration); method protected void onOverScrolled(int, int, boolean, boolean); method public void onPointerCaptureChange(boolean); method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent); @@ -48998,6 +48996,7 @@ package android.webkit { method public deprecated void onChildViewAdded(android.view.View, android.view.View); method public deprecated void onChildViewRemoved(android.view.View, android.view.View); method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); + method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onPause(); method public void onResume(); method public deprecated boolean overlayHorizontalScrollbar(); diff --git a/api/system-current.txt b/api/system-current.txt index 6c5931e8a739..0773252df343 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3814,7 +3814,6 @@ package android.app { method public void onLowMemory(); method public boolean onMenuItemSelected(int, android.view.MenuItem); method public boolean onMenuOpened(int, android.view.Menu); - method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onMultiWindowModeChanged(boolean, android.content.res.Configuration); method public deprecated void onMultiWindowModeChanged(boolean); method public boolean onNavigateUp(); @@ -49238,7 +49237,6 @@ package android.view { method public boolean onKeyUp(int, android.view.KeyEvent); method protected void onLayout(boolean, int, int, int, int); method protected void onMeasure(int, int); - method public void onMovedToDisplay(int, android.content.res.Configuration); method protected void onOverScrolled(int, int, boolean, boolean); method public void onPointerCaptureChange(boolean); method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent); @@ -52679,6 +52677,7 @@ package android.webkit { method public deprecated void onChildViewAdded(android.view.View, android.view.View); method public deprecated void onChildViewRemoved(android.view.View, android.view.View); method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); + method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onPause(); method public void onResume(); method public deprecated boolean overlayHorizontalScrollbar(); diff --git a/api/test-current.txt b/api/test-current.txt index c00795db237b..516d247c7b57 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3683,7 +3683,6 @@ package android.app { method public void onLowMemory(); method public boolean onMenuItemSelected(int, android.view.MenuItem); method public boolean onMenuOpened(int, android.view.Menu); - method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onMultiWindowModeChanged(boolean, android.content.res.Configuration); method public deprecated void onMultiWindowModeChanged(boolean); method public boolean onNavigateUp(); @@ -46022,7 +46021,6 @@ package android.view { method public boolean onKeyUp(int, android.view.KeyEvent); method protected void onLayout(boolean, int, int, int, int); method protected void onMeasure(int, int); - method public void onMovedToDisplay(int, android.content.res.Configuration); method protected void onOverScrolled(int, int, boolean, boolean); method public void onPointerCaptureChange(boolean); method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent); @@ -49377,6 +49375,7 @@ package android.webkit { method public deprecated void onChildViewAdded(android.view.View, android.view.View); method public deprecated void onChildViewRemoved(android.view.View, android.view.View); method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); + method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onPause(); method public void onResume(); method public deprecated boolean overlayHorizontalScrollbar(); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index cdfb52b132f1..3b4727c75026 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2130,6 +2130,7 @@ public class Activity extends ContextThemeWrapper * * @see #onConfigurationChanged(Configuration) * @see View#onMovedToDisplay(int, Configuration) + * @hide */ public void onMovedToDisplay(int displayId, Configuration config) { } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index d42c6db106fd..df32096b9651 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -16560,6 +16560,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param config Configuration of the resources on new display after move. * * @see #onConfigurationChanged(Configuration) + * @hide */ public void onMovedToDisplay(int displayId, Configuration config) { } |