commit 80e6b59ef2a7beb154978a9821a0cab232152d95
author Andres Morales <anmorales@google.com> Wed Apr 20 16:44:48 2016 -0700
committer Andres Morales <anmorales@google.com> Wed Apr 20 17:09:13 2016 -0700
tree 7cd2d9cb4932769e438b685a93d7941756562ca6
parent 121436e4f3b25201b2ad1c0280463d2746a5c69e

FrameMetricsListener API council changes

Bug: 28296251
Change-Id: Ie50aa37fe34aa283e0ba209a7b78b460134ce51d

tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java

diff --git a/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java b/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
index 860c394..651bfbc 100644
--- a/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
+++ b/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
@@ -41,7 +41,7 @@
 public class FrameMetricsListenerTest extends ActivityInstrumentationTestCase2<MockActivity> {
 
     private Instrumentation mInstrumentation;
-    private Window.FrameMetricsListener mFrameMetricsListener;
+    private Window.OnFrameMetricsAvailableListener mFrameMetricsListener;
     private Activity mActivity;
 
     public FrameMetricsListenerTest() {
@@ -71,10 +71,11 @@
         final ArrayList<FrameMetrics> data = new ArrayList<>();
         final Handler handler = new Handler(Looper.getMainLooper());
         final Window myWindow = mActivity.getWindow();
-        final Window.FrameMetricsListener listener =
-            new Window.FrameMetricsListener() {
+        final Window.OnFrameMetricsAvailableListener listener =
+            new Window.OnFrameMetricsAvailableListener() {
                @Override
-               public void onMetricsAvailable(Window window, FrameMetrics frameMetrics, int dropCount) {
+               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+                       int dropCount) {
                    assertEquals(myWindow, window);
                    assertEquals(0, dropCount);
                    data.add(new FrameMetrics(frameMetrics));
@@ -83,7 +84,7 @@
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mActivity.getWindow().addFrameMetricsListener(listener, handler);
+                mActivity.getWindow().addOnFrameMetricsAvailableListener(listener, handler);
             }
         });
 
@@ -107,7 +108,7 @@
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mActivity.getWindow().removeFrameMetricsListener(listener);
+                mActivity.getWindow().removeOnFrameMetricsAvailableListener(listener);
                 data.clear();
             }
         });
@@ -132,20 +133,22 @@
         final Handler handler = new Handler(Looper.getMainLooper());
         final Window myWindow = mActivity.getWindow();
 
-        final Window.FrameMetricsListener frameMetricsListener1 =
-            new Window.FrameMetricsListener() {
+        final Window.OnFrameMetricsAvailableListener frameMetricsListener1 =
+            new Window.OnFrameMetricsAvailableListener() {
                @Override
-               public void onMetricsAvailable(Window window, FrameMetrics frameMetrics, int dropCount) {
+               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+                       int dropCount) {
                    assertEquals(myWindow, window);
                    assertEquals(0, dropCount);
                    data1.add(new FrameMetrics(frameMetrics));
                }
             };
         final ArrayList<FrameMetrics> data2 = new ArrayList<>();
-        final Window.FrameMetricsListener frameMetricsListener2 =
-            new Window.FrameMetricsListener() {
+        final Window.OnFrameMetricsAvailableListener frameMetricsListener2 =
+            new Window.OnFrameMetricsAvailableListener() {
                @Override
-               public void onMetricsAvailable(Window window, FrameMetrics frameMetrics, int dropCount) {
+               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+                       int dropCount) {
                    assertEquals(myWindow, window);
                    assertEquals(0, dropCount);
                    data2.add(new FrameMetrics(frameMetrics));
@@ -154,8 +157,10 @@
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mActivity.getWindow().addFrameMetricsListener(frameMetricsListener1, handler);
-                mActivity.getWindow().addFrameMetricsListener(frameMetricsListener2, handler);
+                mActivity.getWindow().addOnFrameMetricsAvailableListener(
+                        frameMetricsListener1, handler);
+                mActivity.getWindow().addOnFrameMetricsAvailableListener(
+                        frameMetricsListener2, handler);
             }
         });
 
@@ -179,8 +184,8 @@
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mActivity.getWindow().removeFrameMetricsListener(frameMetricsListener1);
-                mActivity.getWindow().removeFrameMetricsListener(frameMetricsListener2);
+                mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener1);
+                mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener2);
             }
         });
     }
@@ -196,10 +201,11 @@
         final HandlerThread thread = new HandlerThread("Listener");
         thread.start();
         final Handler handler = new Handler(thread.getLooper());
-        final Window.FrameMetricsListener frameMetricsListener =
-            new Window.FrameMetricsListener() {
+        final Window.OnFrameMetricsAvailableListener frameMetricsListener =
+            new Window.OnFrameMetricsAvailableListener() {
                @Override
-               public void onMetricsAvailable(Window window, FrameMetrics frameMetrics, int dropCount) {
+               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+                       int dropCount) {
                     try {
                         Thread.sleep(100);
                         framesDropped.addAndGet(dropCount);
@@ -210,7 +216,7 @@
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mActivity.getWindow().addFrameMetricsListener(frameMetricsListener, handler);
+                mActivity.getWindow().addOnFrameMetricsAvailableListener(frameMetricsListener, handler);
             }
         });
 
@@ -234,7 +240,7 @@
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mActivity.getWindow().removeFrameMetricsListener(frameMetricsListener);
+                mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener);
             }
         });
     }