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

Commit a63c3863 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Hide onMovedToDisplay callback" into oc-dev 

am: bfe5aa23

Change-Id: I457340e86ffcfb9256960c554d8041a208d7cdad
parents af77018f bfe5aa23

api/current.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -3682,7 +3682,6 @@ package android.app { 
    method public void onLowMemory();

    method public void onLowMemory();

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

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

    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 void onMultiWindowModeChanged(boolean, android.content.res.Configuration);

    method public deprecated void onMultiWindowModeChanged(boolean);

    method public deprecated void onMultiWindowModeChanged(boolean);

    method public boolean onNavigateUp();

    method public boolean onNavigateUp();
@@ -45610,7 +45609,6 @@ package android.view { 
    method public boolean onKeyUp(int, android.view.KeyEvent);

    method public boolean onKeyUp(int, android.view.KeyEvent);

    method protected void onLayout(boolean, int, int, int, int);

    method protected void onLayout(boolean, int, int, int, int);

    method protected void onMeasure(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 protected void onOverScrolled(int, int, boolean, boolean);

    method public void onPointerCaptureChange(boolean);

    method public void onPointerCaptureChange(boolean);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
@@ -48955,6 +48953,7 @@ package android.webkit { 
    method public deprecated void onChildViewAdded(android.view.View, android.view.View);

    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 onChildViewRemoved(android.view.View, android.view.View);

    method public deprecated void onGlobalFocusChanged(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 onPause();

    method public void onResume();

    method public void onResume();

    method public deprecated boolean overlayHorizontalScrollbar();

    method public deprecated boolean overlayHorizontalScrollbar();

api/system-current.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -3815,7 +3815,6 @@ package android.app { 
    method public void onLowMemory();

    method public void onLowMemory();

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

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

    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 void onMultiWindowModeChanged(boolean, android.content.res.Configuration);

    method public deprecated void onMultiWindowModeChanged(boolean);

    method public deprecated void onMultiWindowModeChanged(boolean);

    method public boolean onNavigateUp();

    method public boolean onNavigateUp();
@@ -49194,7 +49193,6 @@ package android.view { 
    method public boolean onKeyUp(int, android.view.KeyEvent);

    method public boolean onKeyUp(int, android.view.KeyEvent);

    method protected void onLayout(boolean, int, int, int, int);

    method protected void onLayout(boolean, int, int, int, int);

    method protected void onMeasure(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 protected void onOverScrolled(int, int, boolean, boolean);

    method public void onPointerCaptureChange(boolean);

    method public void onPointerCaptureChange(boolean);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
@@ -52636,6 +52634,7 @@ package android.webkit { 
    method public deprecated void onChildViewAdded(android.view.View, android.view.View);

    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 onChildViewRemoved(android.view.View, android.view.View);

    method public deprecated void onGlobalFocusChanged(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 onPause();

    method public void onResume();

    method public void onResume();

    method public deprecated boolean overlayHorizontalScrollbar();

    method public deprecated boolean overlayHorizontalScrollbar();

api/test-current.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -3684,7 +3684,6 @@ package android.app { 
    method public void onLowMemory();

    method public void onLowMemory();

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

    method public boolean onMenuItemSelected(int, android.view.MenuItem);

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

    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 void onMultiWindowModeChanged(boolean, android.content.res.Configuration);

    method public deprecated void onMultiWindowModeChanged(boolean);

    method public deprecated void onMultiWindowModeChanged(boolean);

    method public boolean onNavigateUp();

    method public boolean onNavigateUp();
@@ -45994,7 +45993,6 @@ package android.view { 
    method public boolean onKeyUp(int, android.view.KeyEvent);

    method public boolean onKeyUp(int, android.view.KeyEvent);

    method protected void onLayout(boolean, int, int, int, int);

    method protected void onLayout(boolean, int, int, int, int);

    method protected void onMeasure(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 protected void onOverScrolled(int, int, boolean, boolean);

    method public void onPointerCaptureChange(boolean);

    method public void onPointerCaptureChange(boolean);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
@@ -49350,6 +49348,7 @@ package android.webkit { 
    method public deprecated void onChildViewAdded(android.view.View, android.view.View);

    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 onChildViewRemoved(android.view.View, android.view.View);

    method public deprecated void onGlobalFocusChanged(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 onPause();

    method public void onResume();

    method public void onResume();

    method public deprecated boolean overlayHorizontalScrollbar();

    method public deprecated boolean overlayHorizontalScrollbar();

core/java/android/app/Activity.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -2172,6 +2172,7 @@ public class Activity extends ContextThemeWrapper 
     *

     *

     * @see #onConfigurationChanged(Configuration)

     * @see #onConfigurationChanged(Configuration)

     * @see View#onMovedToDisplay(int, Configuration)

     * @see View#onMovedToDisplay(int, Configuration)

     * @hide

     */

     */

    public void onMovedToDisplay(int displayId, Configuration config) {

    public void onMovedToDisplay(int displayId, Configuration config) {

    }

    }

core/java/android/view/View.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -16577,6 +16577,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @param config Configuration of the resources on new display after move.

     * @param config Configuration of the resources on new display after move.

     *

     *

     * @see #onConfigurationChanged(Configuration)

     * @see #onConfigurationChanged(Configuration)

     * @hide

     */

     */

    public void onMovedToDisplay(int displayId, Configuration config) {

    public void onMovedToDisplay(int displayId, Configuration config) {

    }

    }