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

Merge "FrameMetricsListener API council changes" into nyc-dev

Browse Source 
am: 82ee675330

* commit '82ee6753305b484d778743882fb827c6b73d82c1':
  FrameMetricsListener API council changes

Change-Id: I8ea921d0f7d4658ee0b9827e9b38637c9d370922
This commit is contained in:
Andres Morales
2016-04-22 16:34:17 +00:00
committed by android-build-merger
parent 58f060d62a 82ee675330
commit 2e9c311abd
7 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -43530,7 +43530,7 @@ package android.view {
ctor public Window(android.content.Context);
method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
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 abstract void closeAllPanels();
method public abstract void closePanel(int);
@@ -43582,7 +43582,7 @@ package android.view {
method public abstract boolean performContextMenuIdentifierAction(int, int);
method public abstract boolean performPanelIdentifierAction(int, int, 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 abstract void restoreHierarchyState(android.os.Bundle);
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);
}
public static abstract interface Window.FrameMetricsListener {
method public abstract void onMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);
public static abstract interface Window.OnFrameMetricsAvailableListener {
method public abstract void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);
}
public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {

8
api/system-current.txt
View File

@@ -46477,7 +46477,7 @@ package android.view {
ctor public Window(android.content.Context);
method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
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 abstract void closeAllPanels();
method public abstract void closePanel(int);
@@ -46529,7 +46529,7 @@ package android.view {
method public abstract boolean performContextMenuIdentifierAction(int, int);
method public abstract boolean performPanelIdentifierAction(int, int, 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 abstract void restoreHierarchyState(android.os.Bundle);
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);
}
public static abstract interface Window.FrameMetricsListener {
method public abstract void onMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);
public static abstract interface Window.OnFrameMetricsAvailableListener {
method public abstract void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);
}
public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {

8
api/test-current.txt
View File

@@ -43607,7 +43607,7 @@ package android.view {
ctor public Window(android.content.Context);
method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
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 abstract void closeAllPanels();
method public abstract void closePanel(int);
@@ -43659,7 +43659,7 @@ package android.view {
method public abstract boolean performContextMenuIdentifierAction(int, int);
method public abstract boolean performPanelIdentifierAction(int, int, 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 abstract void restoreHierarchyState(android.os.Bundle);
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);
}
public static abstract interface Window.FrameMetricsListener {
method public abstract void onMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);
public static abstract interface Window.OnFrameMetricsAvailableListener {
method public abstract void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);
}
public static abstract interface Window.OnRestrictedCaptionAreaChangedListener {

3
core/java/android/view/FrameMetrics.java
View File

@@ -234,7 +234,8 @@ public final class FrameMetrics {
* Constructs a FrameMetrics object as a copy.
* <p>
* Use this method to copy out metrics reported by
* {@link Window.FrameMetricsListener#onMetricsAvailable(Window, FrameMetrics, int)}
* {@link Window.OnFrameMetricsAvailableListener#onFrameMetricsAvailable(
* Window, FrameMetrics, int)}
* </p>
* @param other the FrameMetrics object to copy.
*/

6
core/java/android/view/FrameMetricsObserver.java
View File

@@ -40,7 +40,7 @@ public class FrameMetricsObserver {
private FrameMetrics mFrameMetrics;
/* package */ Window.FrameMetricsListener mListener;
/* package */ Window.OnFrameMetricsAvailableListener mListener;
/* package */ VirtualRefBasePtr mNative;
/**
@@ -49,7 +49,7 @@ public class FrameMetricsObserver {
* @param looper the looper to use when invoking callbacks
*/
FrameMetricsObserver(@NonNull Window window, @NonNull Looper looper,
@NonNull Window.FrameMetricsListener listener) {
@NonNull Window.OnFrameMetricsAvailableListener listener) {
if (looper == null) {
throw new NullPointerException("looper cannot be null");
}
@@ -69,7 +69,7 @@ public class FrameMetricsObserver {
private void notifyDataAvailable(int dropCount) {
final Window window = mWindow.get();
if (window != null) {
mListener.onMetricsAvailable(window, mFrameMetrics, dropCount);
mListener.onFrameMetricsAvailable(window, mFrameMetrics, dropCount);
}
}
}

12
core/java/android/view/View.java
View File

@@ -5513,7 +5513,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @hide
*/
public void addFrameMetricsListener(Window window, Window.FrameMetricsListener listener,
public void addFrameMetricsListener(Window window,
Window.OnFrameMetricsAvailableListener listener,
Handler handler) {
if (mAttachInfo != null) {
if (mAttachInfo.mHardwareRenderer != null) {
@@ -5544,11 +5545,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @hide
*/
public void removeFrameMetricsListener(Window.FrameMetricsListener listener) {
public void removeFrameMetricsListener(
Window.OnFrameMetricsAvailableListener listener) {
ThreadedRenderer renderer = getHardwareRenderer();
FrameMetricsObserver fmo = findFrameMetricsObserver(listener);
if (fmo == null) {
throw new IllegalArgumentException("attempt to remove FrameMetricsListener that was never added");
throw new IllegalArgumentException(
"attempt to remove OnFrameMetricsAvailableListener that was never added");
}
if (mFrameMetricsObservers != null) {
@@ -5572,7 +5575,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
}
private FrameMetricsObserver findFrameMetricsObserver(Window.FrameMetricsListener listener) {
private FrameMetricsObserver findFrameMetricsObserver(
Window.OnFrameMetricsAvailableListener listener) {
for (int i = 0; i < mFrameMetricsObservers.size(); i++) {
FrameMetricsObserver observer = mFrameMetricsObservers.get(i);
if (observer.mListener == listener) {

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

@@ -612,7 +612,7 @@ public abstract class Window {
* Callback for clients that want frame timing information for each
* frame rendered by the Window.
*/
public interface FrameMetricsListener {
public interface OnFrameMetricsAvailableListener {
/**
* Called when information is available for the previously rendered frame.
*
@@ -631,7 +631,7 @@ public abstract class Window {
* @param dropCountSinceLastInvocation the number of reports dropped since the last time
* this callback was invoked.
*/
void onMetricsAvailable(Window window, FrameMetrics frameMetrics,
void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
int dropCountSinceLastInvocation);
}
@@ -832,7 +832,8 @@ public abstract class Window {
*
* Must be in hardware rendering mode.
*/
public final void addFrameMetricsListener(@NonNull FrameMetricsListener listener,
public final void addOnFrameMetricsAvailableListener(
@NonNull OnFrameMetricsAvailableListener listener,
Handler handler) {
final View decorView = getDecorView();
if (decorView == null) {
@@ -849,7 +850,7 @@ public abstract class Window {
/**
* Remove observer and stop listening to frame stats for this window.
*/
public final void removeFrameMetricsListener(FrameMetricsListener listener) {
public final void removeOnFrameMetricsAvailableListener(OnFrameMetricsAvailableListener listener) {
final View decorView = getDecorView();
if (decorView != null) {
getDecorView().removeFrameMetricsListener(listener);