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

Commit 82ee6753 authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

Merge "FrameMetricsListener API council changes" into nyc-dev

parents 82e5288e d908c629

api/current.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -43530,7 +43530,7 @@ package android.view { 
    ctor public Window(android.content.Context);

    ctor public Window(android.content.Context);

    method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);

    method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);

    method public void addFlags(int);

    method public void addFlags(int);

    method public final void addFrameMetricsListener(android.view.Window.FrameMetricsListener, android.os.Handler);

    method public final void addOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener, android.os.Handler);

    method public void clearFlags(int);

    method public void clearFlags(int);

    method public abstract void closeAllPanels();

    method public abstract void closeAllPanels();

    method public abstract void closePanel(int);

    method public abstract void closePanel(int);
@@ -43582,7 +43582,7 @@ package android.view { 
    method public abstract boolean performContextMenuIdentifierAction(int, int);

    method public abstract boolean performContextMenuIdentifierAction(int, int);

    method public abstract boolean performPanelIdentifierAction(int, int, int);

    method public abstract boolean performPanelIdentifierAction(int, int, int);

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

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

    method public final void removeFrameMetricsListener(android.view.Window.FrameMetricsListener);

    method public final void removeOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener);

    method public boolean requestFeature(int);

    method public boolean requestFeature(int);

    method public abstract void restoreHierarchyState(android.os.Bundle);

    method public abstract void restoreHierarchyState(android.os.Bundle);

    method public abstract android.os.Bundle saveHierarchyState();

    method public abstract android.os.Bundle saveHierarchyState();
@@ -43709,8 +43709,8 @@ package android.view { 
    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);

    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);

  }

  }

















  public static abstract interface Window.FrameMetricsListener {







  public static abstract interface Window.OnFrameMetricsAvailableListener {











    method public abstract void onMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);







    method public abstract void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);











  }







  }



























  public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {







  public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {

























api/system-current.txt



+4
−4




























Original line number
Original line
Diff line number
Diff line








@@ -46477,7 +46477,7 @@ package android.view {









    ctor public Window(android.content.Context);







    ctor public Window(android.content.Context);











    method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);







    method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);











    method public void addFlags(int);







    method public void addFlags(int);











    method public final void addFrameMetricsListener(android.view.Window.FrameMetricsListener, android.os.Handler);







    method public final void addOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener, android.os.Handler);











    method public void clearFlags(int);







    method public void clearFlags(int);











    method public abstract void closeAllPanels();







    method public abstract void closeAllPanels();











    method public abstract void closePanel(int);







    method public abstract void closePanel(int);










@@ -46529,7 +46529,7 @@ package android.view {









    method public abstract boolean performContextMenuIdentifierAction(int, int);







    method public abstract boolean performContextMenuIdentifierAction(int, int);











    method public abstract boolean performPanelIdentifierAction(int, int, int);







    method public abstract boolean performPanelIdentifierAction(int, int, int);











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







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











    method public final void removeFrameMetricsListener(android.view.Window.FrameMetricsListener);







    method public final void removeOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener);











    method public boolean requestFeature(int);







    method public boolean requestFeature(int);











    method public abstract void restoreHierarchyState(android.os.Bundle);







    method public abstract void restoreHierarchyState(android.os.Bundle);











    method public abstract android.os.Bundle saveHierarchyState();







    method public abstract android.os.Bundle saveHierarchyState();










@@ -46657,8 +46657,8 @@ package android.view {









    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);







    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);











  }







  }



























  public static abstract interface Window.FrameMetricsListener {







  public static abstract interface Window.OnFrameMetricsAvailableListener {











    method public abstract void onMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);







    method public abstract void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);











  }







  }



























  public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {







  public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {

























api/test-current.txt



+4
−4




























Original line number
Original line
Diff line number
Diff line








@@ -43607,7 +43607,7 @@ package android.view {









    ctor public Window(android.content.Context);







    ctor public Window(android.content.Context);











    method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);







    method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);











    method public void addFlags(int);







    method public void addFlags(int);











    method public final void addFrameMetricsListener(android.view.Window.FrameMetricsListener, android.os.Handler);







    method public final void addOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener, android.os.Handler);











    method public void clearFlags(int);







    method public void clearFlags(int);











    method public abstract void closeAllPanels();







    method public abstract void closeAllPanels();











    method public abstract void closePanel(int);







    method public abstract void closePanel(int);










@@ -43659,7 +43659,7 @@ package android.view {









    method public abstract boolean performContextMenuIdentifierAction(int, int);







    method public abstract boolean performContextMenuIdentifierAction(int, int);











    method public abstract boolean performPanelIdentifierAction(int, int, int);







    method public abstract boolean performPanelIdentifierAction(int, int, int);











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







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











    method public final void removeFrameMetricsListener(android.view.Window.FrameMetricsListener);







    method public final void removeOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener);











    method public boolean requestFeature(int);







    method public boolean requestFeature(int);











    method public abstract void restoreHierarchyState(android.os.Bundle);







    method public abstract void restoreHierarchyState(android.os.Bundle);











    method public abstract android.os.Bundle saveHierarchyState();







    method public abstract android.os.Bundle saveHierarchyState();










@@ -43786,8 +43786,8 @@ package android.view {









    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);







    method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);











  }







  }



























  public static abstract interface Window.FrameMetricsListener {







  public static abstract interface Window.OnFrameMetricsAvailableListener {











    method public abstract void onMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);







    method public abstract void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);











  }







  }



























  public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {







  public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {

























core/java/android/view/FrameMetrics.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -234,7 +234,8 @@ public final class FrameMetrics {









     * Constructs a FrameMetrics object as a copy.







     * Constructs a FrameMetrics object as a copy.











     * <p>







     * <p>











     * Use this method to copy out metrics reported by







     * Use this method to copy out metrics reported by











     * {@link Window.FrameMetricsListener#onMetricsAvailable(Window, FrameMetrics, int)}







     * {@link Window.OnFrameMetricsAvailableListener#onFrameMetricsAvailable(














     * Window, FrameMetrics, int)}











     * </p>







     * </p>











     * @param other the FrameMetrics object to copy.







     * @param other the FrameMetrics object to copy.











     */







     */

































core/java/android/view/FrameMetricsObserver.java



+3
−3




























Original line number
Original line
Diff line number
Diff line








@@ -40,7 +40,7 @@ public class FrameMetricsObserver {





























    private FrameMetrics mFrameMetrics;







    private FrameMetrics mFrameMetrics;































    /* package */ Window.FrameMetricsListener mListener;







    /* package */ Window.OnFrameMetricsAvailableListener mListener;











    /* package */ VirtualRefBasePtr mNative;







    /* package */ VirtualRefBasePtr mNative;































    /**







    /**









@@ -49,7 +49,7 @@ public class FrameMetricsObserver {









     * @param looper the looper to use when invoking callbacks







     * @param looper the looper to use when invoking callbacks











     */







     */











    FrameMetricsObserver(@NonNull Window window, @NonNull Looper looper,







    FrameMetricsObserver(@NonNull Window window, @NonNull Looper looper,











            @NonNull Window.FrameMetricsListener listener) {







            @NonNull Window.OnFrameMetricsAvailableListener listener) {











        if (looper == null) {







        if (looper == null) {











            throw new NullPointerException("looper cannot be null");







            throw new NullPointerException("looper cannot be null");











        }







        }









@@ -69,7 +69,7 @@ public class FrameMetricsObserver {









    private void notifyDataAvailable(int dropCount) {







    private void notifyDataAvailable(int dropCount) {











        final Window window = mWindow.get();







        final Window window = mWindow.get();











        if (window != null) {







        if (window != null) {











            mListener.onMetricsAvailable(window, mFrameMetrics, dropCount);







            mListener.onFrameMetricsAvailable(window, mFrameMetrics, dropCount);











        }







        }











    }







    }











}






}