Integrate unsubmitted cupcake change 147343:
	CTS: clean up code in android.app package

    Fixes bug 1912974 ActivityManagerTest.testGetRunningServices.
diff --git a/tests/src/android/app/cts/InstrumentationTestActivity.java b/tests/src/android/app/cts/InstrumentationTestActivity.java
index fa473d5..8ab61ce 100644
--- a/tests/src/android/app/cts/InstrumentationTestActivity.java
+++ b/tests/src/android/app/cts/InstrumentationTestActivity.java
@@ -50,7 +50,6 @@
     private boolean mOnTouchEventCalled;
     private int mKeyDownCode;
     private int mKeyUpCode;
-    private boolean mIsOnKeyDownCalled;
     private MotionEvent mMotionEvent;
     private Bundle mBundle;
     private MockTextView mTextView;
diff --git a/tests/src/android/app/cts/LaunchpadActivity.java b/tests/src/android/app/cts/LaunchpadActivity.java
index 8164a85..566e7b7 100644
--- a/tests/src/android/app/cts/LaunchpadActivity.java
+++ b/tests/src/android/app/cts/LaunchpadActivity.java
@@ -43,7 +43,7 @@
         return 0;
     }
 
-    public static final Parcelable.Creator<MyBadParcelable> CREATOR = 
+    public static final Parcelable.Creator<MyBadParcelable> CREATOR =
         new Parcelable.Creator<MyBadParcelable>() {
         public MyBadParcelable createFromParcel(Parcel in) {
             return new MyBadParcelable(in);
diff --git a/tests/src/android/app/cts/MockApplicationActivity.java b/tests/src/android/app/cts/MockApplicationActivity.java
index d5057a7..40299ee 100644
--- a/tests/src/android/app/cts/MockApplicationActivity.java
+++ b/tests/src/android/app/cts/MockApplicationActivity.java
@@ -28,7 +28,6 @@
         TextView textView = new TextView(this);
         textView.setText("Test");
         setContentView(textView);
-
     }
 
 }
diff --git a/tests/src/android/app/cts/MockReceiver.java b/tests/src/android/app/cts/MockReceiver.java
index 507f22f..d102cbe 100644
--- a/tests/src/android/app/cts/MockReceiver.java
+++ b/tests/src/android/app/cts/MockReceiver.java
@@ -21,8 +21,8 @@
 import android.content.Intent;
 
 public class MockReceiver extends BroadcastReceiver {
-    // pendingintent maybe return same instance or new instance, so static
-    // variable is needed.
+
+    // PendingIntent may return same instance or new instance, so static variable is needed.
     public static int sResultCode = 0;
     public static final String MOCKACTION = "android.app.PendingIntentTest.TEST_RECEIVER";
     public static String sAction;
diff --git a/tests/src/android/app/cts/SearchManagerStubActivity.java b/tests/src/android/app/cts/SearchManagerStubActivity.java
index e80d6d2..76ba649 100644
--- a/tests/src/android/app/cts/SearchManagerStubActivity.java
+++ b/tests/src/android/app/cts/SearchManagerStubActivity.java
@@ -170,9 +170,8 @@
         }
     }
 
-    private void startSearch(final String initialQuery, final boolean selectInitialQuery,
-            final ComponentName launchActivity, final Bundle appSearchData,
-            final boolean globalSearch) {
+    private void startSearch(String initialQuery, boolean selectInitialQuery,
+            ComponentName launchActivity, Bundle appSearchData, boolean globalSearch) {
         mSearchManager.startSearch(initialQuery, selectInitialQuery, launchActivity, appSearchData,
                 globalSearch);
         sleep(1000);
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java
index 8a49ce0..36b3af4 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java
@@ -37,13 +37,11 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test describeContents function",
             method = "describeContents",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test describeContents function",
             method = "ActivityManager.MemoryInfo",
             args = {}
         )
@@ -54,7 +52,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test writeToParcel function",
         method = "writeToParcel",
         args = {android.os.Parcel.class, int.class}
     )
@@ -68,8 +65,8 @@
         Parcel parcel = Parcel.obtain();
         mMemory.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
-        ActivityManager.MemoryInfo values = ActivityManager.MemoryInfo.CREATOR
-                .createFromParcel(parcel);
+        ActivityManager.MemoryInfo values =
+            ActivityManager.MemoryInfo.CREATOR.createFromParcel(parcel);
         assertEquals(AVAILMEM, values.availMem);
         assertEquals(THRESHOLD, values.threshold);
         assertEquals(LOWMEMORY, values.lowMemory);
@@ -77,14 +74,14 @@
         // test null condition.
         try {
             mMemory.writeToParcel(null, 0);
-            fail("writeToParcel should throw out NullPointerException" + "when Parcel is null");
+            fail("writeToParcel should throw out NullPointerException when Parcel is null");
         } catch (NullPointerException e) {
+            // expected
         }
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test readFromParcel function",
         method = "readFromParcel",
         args = {android.os.Parcel.class}
     )
@@ -108,8 +105,9 @@
         result = new ActivityManager.MemoryInfo();
         try {
             result.readFromParcel(null);
-            fail("readFromParcel should throw out NullPointerException" + " when Parcel is null");
+            fail("readFromParcel should throw out NullPointerException when Parcel is null");
         } catch (NullPointerException e) {
+            // expected
         }
     }
 
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java
index 4c28990..6fec59f 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java
@@ -18,10 +18,9 @@
 import android.app.ActivityManager;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
-import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 @TestTargetClass(ActivityManager.ProcessErrorStateInfo.class)
 public class ActivityManagerProcessErrorStateInfoTest extends AndroidTestCase {
@@ -45,7 +44,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test describeContents method",
         method = "describeContents",
         args = {}
     )
@@ -55,7 +53,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test writeToParcel method",
         method = "writeToParcel",
         args = {android.os.Parcel.class, int.class}
     )
@@ -82,8 +79,8 @@
         Parcel parcel = Parcel.obtain();
         mErrorStateInfo.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
-        ActivityManager.ProcessErrorStateInfo values = ActivityManager.ProcessErrorStateInfo.CREATOR
-                .createFromParcel(parcel);
+        ActivityManager.ProcessErrorStateInfo values =
+            ActivityManager.ProcessErrorStateInfo.CREATOR.createFromParcel(parcel);
 
         assertEquals(condition, values.condition);
         assertEquals(processName, values.processName);
@@ -101,8 +98,7 @@
         parcel = Parcel.obtain();
         mErrorStateInfo.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
-        values = ActivityManager.ProcessErrorStateInfo.CREATOR
-                .createFromParcel(parcel);
+        values = ActivityManager.ProcessErrorStateInfo.CREATOR.createFromParcel(parcel);
         assertNull(values.crashData);
 
     }
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java
index e75af2d..f961c5a 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java
@@ -20,10 +20,9 @@
 import android.content.Intent;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
-import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 @TestTargetClass(ActivityManager.RecentTaskInfo.class)
 public class ActivityManagerRecentTaskInfoTest extends AndroidTestCase {
@@ -47,7 +46,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test describeContents method",
         method = "describeContents",
         args = {}
     )
@@ -57,7 +55,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test writeToParcel method",
         method = "writeToParcel",
         args = {android.os.Parcel.class, int.class}
     )
@@ -97,7 +94,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test readFromParcel method",
         method = "readFromParcel",
         args = {android.os.Parcel.class}
     )
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java
index 7bc4fd7..9cebaab 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java
@@ -19,10 +19,9 @@
 import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
-import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 @TestTargetClass(ActivityManager.RunningTaskInfo.class)
 public class ActivityManagerRunningTaskInfoTest extends AndroidTestCase {
@@ -54,7 +53,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test describeContents method",
         method = "describeContents",
         args = {}
     )
@@ -64,7 +62,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test writeToParcel method",
         method = "writeToParcel",
         args = {android.os.Parcel.class, int.class}
     )
@@ -98,7 +95,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test readFromParcel method",
         method = "readFromParcel",
         args = {android.os.Parcel.class}
     )
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
index ca50224..28b7fcb 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
@@ -205,13 +205,15 @@
         mInstrumentation.getTargetContext().startService(intent);
         Thread.sleep(WAIT_TIME);
 
-        runningServiceInfo = mActivityManager.getRunningServices(5);
-        HashSet<String> set = new HashSet<String>();
-        assertTrue(runningServiceInfo.size() >= 0 && runningServiceInfo.size() <= 5);
+        runningServiceInfo = mActivityManager.getRunningServices(Integer.MAX_VALUE);
+        boolean foundService = false;
         for (RunningServiceInfo rs : runningServiceInfo) {
-            set.add(rs.service.getClassName());
+            if (rs.service.getClassName().equals(SERVICE_NAME)) {
+                foundService = true;
+                break;
+            }
         }
-        assertTrue(set.contains(SERVICE_NAME));
+        assertTrue(foundService);
         mContext.stopService(intent);
         Thread.sleep(WAIT_TIME);
     }
@@ -295,7 +297,6 @@
         for (ProcessErrorStateInfo pei : errList) {
             android.os.Process.killProcess(pei.pid);
         }
-
     }
 
     @TestTargetNew(
diff --git a/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java
index d042a25..a784668 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java
@@ -19,8 +19,6 @@
 import android.content.ComponentName;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
-
-import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
@@ -28,8 +26,8 @@
 @TestTargetClass(ActivityManager.RunningServiceInfo.class)
 public class ActivityManager_RunningServiceInfoTest extends AndroidTestCase {
     private ActivityManager.RunningServiceInfo mRunningServiceInfo;
-    ComponentName mService;
-    final String mPROCESS = "process";
+    private ComponentName mService;
+    private static final String PROCESS = "process";
 
     @Override
     protected void setUp() throws Exception {
@@ -39,7 +37,7 @@
 
         mRunningServiceInfo.service = mService;
         mRunningServiceInfo.pid = 1;
-        mRunningServiceInfo.process = mPROCESS;
+        mRunningServiceInfo.process = PROCESS;
         mRunningServiceInfo.foreground = true;
         mRunningServiceInfo.activeSince = 1l;
         mRunningServiceInfo.started = true;
@@ -51,7 +49,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test constructor of this class",
         method = "ActivityManager.RunningServiceInfo",
         args = {}
     )
@@ -61,7 +58,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test describeContents method",
         method = "describeContents",
         args = {}
     )
@@ -71,7 +67,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test writeToParcel method",
         method = "writeToParcel",
         args = {android.os.Parcel.class, int.class}
     )
@@ -84,7 +79,7 @@
             ActivityManager.RunningServiceInfo.CREATOR.createFromParcel(parcel);
         assertEquals(mService, values.service);
         assertEquals(1, values.pid);
-        assertEquals(mPROCESS, values.process);
+        assertEquals(PROCESS, values.process);
         assertTrue(values.foreground);
         assertEquals(1l, values.activeSince);
         assertTrue(values.started);
@@ -96,7 +91,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test readFromParcel method",
         method = "readFromParcel",
         args = {android.os.Parcel.class}
     )
@@ -110,7 +104,7 @@
         values.readFromParcel(parcel);
         assertEquals(mService, values.service);
         assertEquals(1, values.pid);
-        assertEquals(mPROCESS, values.process);
+        assertEquals(PROCESS, values.process);
         assertTrue(values.foreground);
         assertEquals(1l, values.activeSince);
         assertTrue(values.started);
diff --git a/tests/tests/app/src/android/app/cts/AliasActivityTest.java b/tests/tests/app/src/android/app/cts/AliasActivityTest.java
index 66509ac..a5ab4f3 100644
--- a/tests/tests/app/src/android/app/cts/AliasActivityTest.java
+++ b/tests/tests/app/src/android/app/cts/AliasActivityTest.java
@@ -27,7 +27,7 @@
 @TestTargetClass(AliasActivity.class)
 public class AliasActivityTest extends AndroidTestCase {
 
-    public static final long SLEEP_TIME = 1000;
+    private static final long SLEEP_TIME = 1000;
 
     @TestTargets({
         @TestTargetNew(
@@ -41,12 +41,7 @@
             args = {}
         )
     })
-    /**
-     * check points:
-     * 1  launches another activity
-     * 2  finishes itself
-     */
-    public void testAliasActivity() {
+    public void testAliasActivity() throws InterruptedException {
         new AliasActivity();
 
         Intent intent = new Intent();
@@ -56,17 +51,10 @@
         assertFalse(ChildActivity.isStarted);
         assertFalse(AliasActivityStub.isOnCreateCalled);
         getContext().startActivity(intent);
-        sleep(SLEEP_TIME);
+        Thread.sleep(SLEEP_TIME);
         assertTrue(AliasActivityStub.isOnCreateCalled);
         assertTrue(ChildActivity.isStarted);
         assertTrue(AliasActivityStub.isFinished);
     }
 
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            fail(e.getMessage());
-        }
-    }
 }
diff --git a/tests/tests/app/src/android/app/cts/ApplicationTest.java b/tests/tests/app/src/android/app/cts/ApplicationTest.java
index 8c81d51..c0c777c 100644
--- a/tests/tests/app/src/android/app/cts/ApplicationTest.java
+++ b/tests/tests/app/src/android/app/cts/ApplicationTest.java
@@ -16,17 +16,17 @@
 
 package android.app.cts;
 
+import android.app.Activity;
 import android.app.Application;
+import android.app.Instrumentation;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.test.InstrumentationTestCase;
-
-import dalvik.annotation.BrokenTest;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
 
 /**
  * Test {@link Application}.
@@ -37,62 +37,55 @@
     @TestTargets({
       @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test constructor of Application",
         method = "Application",
         args = {}
       ),
       @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test onConfigurationChanged",
         method = "onConfigurationChanged",
         args = {android.content.res.Configuration.class}
       ),
       @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test onCreate",
         method = "onCreate",
         args = {}
       ),
       @TestTargetNew(
-        level = TestLevel.TODO,
-        notes = "Test onLowMemory",
+        level = TestLevel.NOT_FEASIBLE,
+        notes = "According to issue 1653192, a Java app can't allocate memory without" +
+                " restriction, thus it's hard to test this callback.",
         method = "onLowMemory",
         args = {}
       ),
       @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test onTerminate. The documentation states that one cannot rely on this method"
-                  + " being called. No need to test it here.",
+        level = TestLevel.NOT_FEASIBLE,
+        notes = "The documentation states that one cannot rely on this method being called.",
         method = "onTerminate",
         args = {}
       )
     })
-    @ToBeFixed(bug="1653192", explanation="System doesn't call function onLowMemory")
-    @BrokenTest("onConfigurationChanged() not called after requesting orientation change")
-    public void testApplication() {
-        Intent intent = new Intent();
-        intent.setClass(getInstrumentation().getTargetContext(), MockApplicationActivity.class);
+    public void testApplication() throws Throwable {
+        final Instrumentation instrumentation = getInstrumentation();
+        final Context targetContext = instrumentation.getTargetContext();
+
+        final Intent intent = new Intent(targetContext, MockApplicationActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        final MockApplicationActivity activity =
-            (MockApplicationActivity)getInstrumentation().startActivitySync(intent);
-        MockApplication ma = (MockApplication)activity.getApplication();
 
-        activity.runOnUiThread(new Runnable() {
+        final Activity activity = instrumentation.startActivitySync(intent);
+        final MockApplication mockApp = (MockApplication) activity.getApplication();
+        assertTrue(mockApp.isConstructorCalled);
+        assertTrue(mockApp.isOnCreateCalled);
 
+        runTestOnUiThread(new Runnable() {
             public void run() {
-                // to make android call Application#onConfigurationChanged(Configuration) function.
+                // make sure the configuration has been changed.
                 activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                 activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-
             }
         });
         getInstrumentation().waitForIdleSync();
-        assertTrue(ma.isConstructorCalled);
-        assertTrue(ma.isOnCreateCalled);
-        assertTrue(ma.isOnConfigurationChangedCalled);
-        // TODO: for testing onLowMemory function. We have tried to create
-        // many processes to consume a lot of memory but still cannot make
-        // system call it. Bug id is 1653192.
+
+        assertTrue(mockApp.isOnConfigurationChangedCalled);
     }
 
 }
diff --git a/tests/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java b/tests/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java
index 1d68694..31384cf 100644
--- a/tests/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java
+++ b/tests/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java
@@ -40,14 +40,10 @@
         }
     }
 
-    protected void waitForResult() {
+    protected void waitForResult() throws InterruptedException {
         synchronized (mSync) {
             if (!mSync.mHasNotify) {
-                try {
-                    mSync.wait();
-                } catch (InterruptedException e) {
-                    fail();
-                }
+                mSync.wait();
                 assertTrue(mSync.mResult);
             }
         }
diff --git a/tests/tests/app/src/android/app/cts/InstrumentationTest.java b/tests/tests/app/src/android/app/cts/InstrumentationTest.java
index 56f4338..9119086 100644
--- a/tests/tests/app/src/android/app/cts/InstrumentationTest.java
+++ b/tests/tests/app/src/android/app/cts/InstrumentationTest.java
@@ -54,8 +54,7 @@
 @TestTargetClass(Instrumentation.class)
 public class InstrumentationTest extends InstrumentationTestCase {
 
-    public static final int SLEEP_TIME = 100;
-    public static final int WAIT_TIME = 1000;
+    private static final int WAIT_TIME = 1000;
     private Instrumentation mInstrumentation;
     private InstrumentationTestActivity mActivity;
     private Intent mIntent;
@@ -89,12 +88,8 @@
         super.tearDown();
     }
 
-    /**
-     * Test point : check if the specified instrumentation is started by application loader
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test constructor of Instrumentation",
         method = "Instrumentation",
         args = {}
     )
@@ -102,13 +97,6 @@
         new Instrumentation();
     }
 
-    /**
-     * check all functions related to Monitor
-     * 1 Add a new {@link ActivityMonitor} that will be checked whenever an activity is started
-     * 2 Wait for an existing {@link ActivityMonitor} to be hit
-     * 3 whether an existing {@link ActivityMonitor} has been hit
-     * 4 Remove an {@link ActivityMonitor} that was previously added with {@link #addMonitor}
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -155,8 +143,8 @@
         if (mActivity != null)
             mActivity.finish();
         ActivityResult result = new ActivityResult(Activity.RESULT_OK, new Intent());
-        ActivityMonitor monitor = new ActivityMonitor(InstrumentationTestActivity.class.getName(),
-                result, false);
+        ActivityMonitor monitor = new ActivityMonitor(
+                InstrumentationTestActivity.class.getName(), result, false);
         mInstrumentation.addMonitor(monitor);
         Intent intent = new Intent(mContext, InstrumentationTestActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -191,11 +179,6 @@
         mInstrumentation.removeMonitor(am);
     }
 
-    /**
-     * check points:
-     * 1 perform calling of an activity's {@link Activity#onCreate} method
-     * 2 synchronously wait for the application to be idle
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -208,9 +191,9 @@
             args = {}
         )
     })
-    public void testCallActivityOnCreate() throws Exception {
+    public void testCallActivityOnCreate() throws Throwable {
         mActivity.setOnCreateCalled(false);
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mInstrumentation.callActivityOnCreate(mActivity, new Bundle());
             }
@@ -219,13 +202,6 @@
         assertTrue(mActivity.isOnCreateCalled());
     }
 
-    /**
-     * check points:
-     * 1 start allocation counting
-     * 2 the current results from the allocation counting
-     * 3 the counts for various binder counts for this process
-     * 4 stop allocation counting
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -282,9 +258,6 @@
         assertEquals(threadAllocCount, Debug.getThreadAllocCount());
     }
 
-    /**
-     * Test dispatching a trackball event
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "sendTrackballEventSync",
@@ -300,9 +273,6 @@
         assertEquals(mMotionEvent.getDownTime(), motionEvent.getDownTime());
     }
 
-    /**
-     * Test performing calling of the application's {@link Application#onCreate} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callApplicationOnCreate",
@@ -314,11 +284,6 @@
         assertTrue(ca.mIsOnCreateCalled);
     }
 
-    /**
-     * check points:
-     * 1 Return the Context of this instrumentation's package
-     * 2 Return a Context for the target application being instrumented
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -337,9 +302,6 @@
         assertNotSame(c1.getPackageName(), c2.getPackageName());
     }
 
-    /**
-     * Test executing a particular menu item
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "invokeMenuActionSync",
@@ -353,17 +315,14 @@
         assertEquals(resId, mActivity.getMenuID());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onPostCreate} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnPostCreate",
         args = {Activity.class, Bundle.class}
     )
-    public void testCallActivityOnPostCreate() throws Exception {
+    public void testCallActivityOnPostCreate() throws Throwable {
         mActivity.setOnPostCreate(false);
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mInstrumentation.callActivityOnPostCreate(mActivity, new Bundle());
             }
@@ -372,17 +331,14 @@
         assertTrue(mActivity.isOnPostCreate());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onPostCreate} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnNewIntent",
         args = {Activity.class, Intent.class}
     )
-    public void testCallActivityOnNewIntent() throws Exception {
+    public void testCallActivityOnNewIntent() throws Throwable {
         mActivity.setOnNewIntentCalled(false);
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mInstrumentation.callActivityOnNewIntent(mActivity, null);
             }
@@ -392,17 +348,14 @@
         assertTrue(mActivity.isOnNewIntentCalled());
     }
 
-    /**
-     * Test perform calling of an activity's {@link Activity#onResume} method.
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnResume",
         args = {Activity.class}
     )
-    public void testCallActivityOnResume() throws Exception {
+    public void testCallActivityOnResume() throws Throwable {
         mActivity.setOnResume(false);
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mInstrumentation.callActivityOnResume(mActivity);
             }
@@ -411,11 +364,6 @@
         assertTrue(mActivity.isOnResume());
     }
 
-    /**
-     * test methods that hard to test, the reasons like:
-     * 1 some methods will crash the system
-     * 2 can't start another instrumentation to test some methods
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.NOT_FEASIBLE,
@@ -458,14 +406,9 @@
             args = {int.class, Bundle.class}
         )
     })
-    public void testMisc() throws Exception {  }
+    public void testMisc() throws Exception {
+    }
 
-    /**
-     * check points:
-     * 1 set automatic performance snapshot
-     * 2 start performance snapshot
-     * 3 stop performance snapshot
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -489,12 +432,6 @@
         mInstrumentation.endPerformanceSnapshot();
     }
 
-    /**
-     * check points:
-     * 1 Check whether this instrumentation was started with profiling enabled
-     * 2 start profiling if isProfiling() returns true
-     * 3 Stops profiling if isProfiling() returns true
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.NOT_FEASIBLE,
@@ -521,10 +458,6 @@
         mInstrumentation.stopProfiling();
     }
 
-    /**
-     * Test showing the context menu for the currently focused view and executing
-     *  a particular context menu item.
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "invokeContextMenuAction",
@@ -541,9 +474,6 @@
         assertEquals(flag, activity.mWindow.mFlags);
     }
 
-    /**
-     * Test sending the key events corresponding to the text to the app being instrumented
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "sendStringSync",
@@ -568,9 +498,6 @@
         }
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onPause} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnSaveInstanceState",
@@ -586,9 +513,6 @@
         assertSame(bundle, mActivity.getBundle());
     }
 
-    /**
-     * test sendPointerSync whether or not works with the global system in or out of touch mode
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.PARTIAL,
@@ -616,7 +540,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test getComponentName function of Instrumentation",
         method = "getComponentName",
         args = {}
     )
@@ -627,9 +550,6 @@
         assertNotNull(com.getShortClassName());
     }
 
-    /**
-     * test performing instantiation of the process's {@link Application} object
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -653,9 +573,6 @@
         assertEquals(className, app.getClass().getName());
     }
 
-    /**
-     * Test executing a call on the application's main thread, blocking until it is complete
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "runOnMainSync",
@@ -672,9 +589,6 @@
         assertTrue(mRunOnMainSyncResult);
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onPause} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnPause",
@@ -687,32 +601,24 @@
         assertTrue(mActivity.isOnPauseCalled());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onDestroy} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnDestroy",
         args = {Activity.class}
     )
     public void testCallActivityOnDestroy() throws Exception {
-
         mActivity.setOnDestroyCalled(false);
         mInstrumentation.callActivityOnDestroy(mActivity);
         mInstrumentation.waitForIdleSync();
         assertTrue(mActivity.isOnDestroyCalled());
     }
 
-    /**
-     * Test sending an up and down key event sync to the currently focused window
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "sendKeyDownUpSync",
         args = {int.class}
     )
     public void testSendKeyDownUpSync() throws Exception {
-
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_0);
         mInstrumentation.waitForIdleSync();
         assertEquals(1, mActivity.getKeyUpList().size());
@@ -721,9 +627,6 @@
         assertEquals(KeyEvent.KEYCODE_0, mActivity.getKeyDownList().get(0).getKeyCode());
     }
 
-    /**
-     * test performing instantiation of an {@link Activity} object
-     */
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
@@ -764,9 +667,6 @@
         activity.finish();
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onStart} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnStart",
@@ -779,9 +679,6 @@
         assertTrue(mActivity.isOnStart());
     }
 
-    /**
-     * Test scheduling a callback for when the application's main thread goes idle
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "waitForIdle",
@@ -796,16 +693,11 @@
         assertTrue(mr.isRunCalled());
     }
 
-    /**
-     * Test sending both the down and up key events for a particular character key code
-     */
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "sendCharacterSync",
-            args = {int.class}
-        )
-    })
+    @TestTargetNew(
+        level = TestLevel.COMPLETE,
+        method = "sendCharacterSync",
+        args = {int.class}
+    )
     public void testSendCharacterSync() throws Exception {
         mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_0);
         mInstrumentation.waitForIdleSync();
@@ -813,9 +705,6 @@
         assertEquals(KeyEvent.KEYCODE_0, mActivity.getKeyUpCode());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onRestart} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnRestart",
@@ -828,9 +717,6 @@
         assertTrue(mActivity.isOnRestart());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onStop} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnStop",
@@ -843,9 +729,6 @@
         assertTrue(mActivity.isOnStop());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onUserLeaveHint} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnUserLeaving",
@@ -858,9 +741,6 @@
         assertTrue(mActivity.isOnLeave());
     }
 
-    /**
-     * Test performing calling of an activity's {@link Activity#onRestoreInstanceState} method
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "callActivityOnRestoreInstanceState",
@@ -873,9 +753,6 @@
         assertTrue(mActivity.isOnRestoreInstanceState());
     }
 
-    /**
-     * Test sending a key event to the currently focused window/view and wait for it to be processed
-     */
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         method = "sendKeySync",
@@ -888,7 +765,7 @@
         assertEquals(KeyEvent.KEYCODE_0, mActivity.getKeyDownCode());
     }
 
-    class MockRunnable implements Runnable {
+    private static class MockRunnable implements Runnable {
         private boolean mIsRunCalled ;
 
         public void run() {
@@ -900,7 +777,7 @@
         }
     }
 
-    class MockActivity extends Activity {
+    private class MockActivity extends Activity {
         MockWindow mWindow = new MockWindow(mContext);
 
         @Override
@@ -908,7 +785,7 @@
             return mWindow;
         }
 
-        class MockWindow extends Window {
+        private class MockWindow extends Window {
 
             public int mId;
             public int mFlags;
@@ -1084,7 +961,7 @@
         }
     }
 
-    class InstrumentationTestStub extends Application {
+    private static class InstrumentationTestStub extends Application {
         boolean mIsOnCreateCalled = false;
 
         @Override
diff --git a/tests/tests/app/src/android/app/cts/Instrumentation_ActivityResultTest.java b/tests/tests/app/src/android/app/cts/Instrumentation_ActivityResultTest.java
index b0ab011..50f7468 100644
--- a/tests/tests/app/src/android/app/cts/Instrumentation_ActivityResultTest.java
+++ b/tests/tests/app/src/android/app/cts/Instrumentation_ActivityResultTest.java
@@ -28,22 +28,20 @@
 
 @TestTargetClass(Instrumentation.ActivityResult.class)
 public class Instrumentation_ActivityResultTest extends AndroidTestCase {
+
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of {@link Instrumentation.ActivityResult}",
             method = "Instrumentation.ActivityResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test method: getResultCode",
             method = "getResultCode",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test method: getResultData",
             method = "getResultData",
             args = {}
         )
diff --git a/tests/tests/app/src/android/app/cts/LaunchTest.java b/tests/tests/app/src/android/app/cts/LaunchTest.java
index 6562a1c..4c2f3f4 100644
--- a/tests/tests/app/src/android/app/cts/LaunchTest.java
+++ b/tests/tests/app/src/android/app/cts/LaunchTest.java
@@ -49,787 +49,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -843,787 +732,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -1636,787 +1414,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -2428,787 +2095,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -3221,787 +2777,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -4014,787 +3459,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -4807,787 +4141,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {android.content.res.Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
diff --git a/tests/tests/app/src/android/app/cts/LifecycleTest.java b/tests/tests/app/src/android/app/cts/LifecycleTest.java
index 72c82ba..56517ae 100644
--- a/tests/tests/app/src/android/app/cts/LifecycleTest.java
+++ b/tests/tests/app/src/android/app/cts/LifecycleTest.java
@@ -61,787 +61,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
-            method = "onMenuOpened",
+             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
-            method = "onPanelClosed",
+             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -854,787 +743,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -1647,787 +1425,677 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -2440,787 +2108,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -3233,787 +2790,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -4026,787 +3472,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -4819,787 +4154,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -5612,787 +4836,677 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -6405,787 +5519,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
@@ -7198,787 +6201,676 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "Activity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
+            method = "onUserInteraction",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "onUserLeaveHint",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVisible",
+            args = {boolean.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "closeContextMenu",
+            args = {}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
             method = "finalize",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getInstanceCount",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getIntent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getApplication",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isChild",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getParent",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindowManager",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWindow",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCurrentFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumWidth",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getWallpaperDesiredMinimumHeight",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestoreInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostCreate",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRestart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPostResume",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onNewIntent",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSaveInstanceState",
             args = {Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPause",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateThumbnail",
             args = {Bitmap.class, Canvas.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDescription",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onStop",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onDestroy",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onConfigurationChanged",
             args = {Configuration.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getChangingConfigurations",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLastNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onRetainNonConfigurationInstance",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onLowMemory",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedQuery",
             args = {Uri.class, String[].class, String.class, String[].class, String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "managedCommitUpdates",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "stopManagingCursor",
             args = {Cursor.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setPersistent",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "findViewById",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "addContentView",
             args = {View.class, ViewGroup.LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setDefaultKeyMode",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyDown",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onKeyUp",
             args = {int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
-            method = "onKeyMultiple",
+             method = "onKeyMultiple",
             args = {int.class, int.class, KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowAttributesChanged",
             args = {LayoutParams.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContentChanged",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onWindowFocusChanged",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "hasWindowFocus",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchKeyEvent",
             args = {KeyEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTouchEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dispatchTrackballEvent",
             args = {MotionEvent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelView",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreatePanelMenu",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPreparePanel",
             args = {int.class, View.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuOpened",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onMenuItemSelected",
             args = {int.class, MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPanelClosed",
             args = {int.class, Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareOptionsMenu",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onOptionsMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "closeOptionsMenu",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateContextMenu",
             args = {ContextMenu.class, View.class, ContextMenuInfo.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "registerForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "unregisterForContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "openContextMenu",
             args = {View.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextItemSelected",
             args = {MenuItem.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onContextMenuClosed",
             args = {Menu.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onPrepareDialog",
             args = {int.class, Dialog.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "showDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "dismissDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "removeDialog",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onSearchRequested",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startSearch",
             args = {String.class, boolean.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "takeKeyEvents",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "requestWindowFeature",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableResource",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableUri",
             args = {int.class, Uri.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawable",
             args = {int.class, Drawable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setFeatureDrawableAlpha",
             args = {int.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLayoutInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getMenuInflater",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onApplyThemeResource",
             args = {Theme.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityForResult",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityIfNeeded",
             args = {Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startNextMatchingActivity",
             args = {Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "startActivityFromChild",
             args = {Activity.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setResult",
             args = {int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingPackage",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getCallingActivity",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isFinishing",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finish",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishFromChild",
             args = {Activity.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivity",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "finishActivityFromChild",
             args = {Activity.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onActivityResult",
             args = {int.class, int.class, Intent.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "createPendingResult",
             args = {int.class, Intent.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setRequestedOrientation",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getRequestedOrientation",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTaskId",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "isTaskRoot",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "moveTaskToBack",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getLocalClassName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getComponentName",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getPreferences",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getSystemService",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitle",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setTitleColor",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitle",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getTitleColor",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onTitleChanged",
             args = {CharSequence.class, int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onChildTitleChanged",
             args = {Activity.class, CharSequence.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminateVisibility",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgressBarIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "setVolumeControlStream",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "getVolumeControlStream",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "runOnUiThread",
             args = {Runnable.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "",
             method = "onCreateView",
             args = {String.class, Context.class, AttributeSet.class}
         )
diff --git a/tests/tests/app/src/android/app/cts/PendingIntentTest.java b/tests/tests/app/src/android/app/cts/PendingIntentTest.java
index f719796..a6b9a03 100644
--- a/tests/tests/app/src/android/app/cts/PendingIntentTest.java
+++ b/tests/tests/app/src/android/app/cts/PendingIntentTest.java
@@ -16,91 +16,95 @@
 
 package android.app.cts;
 
-import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestLevel;
-import dalvik.annotation.ToBeFixed;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
 
 @TestTargetClass(PendingIntent.class)
 public class PendingIntentTest extends AndroidTestCase {
 
     private static final int WAIT_TIME = 5000;
-    PendingIntent mPendingIntent;
-    Intent mIntent;
-    Context mContext;
-    boolean mFinishResult;
-    boolean mHandleResult;
-    String mResultAction;
-    Notification mNotification;
-    PendingIntent.OnFinished mFinish = new PendingIntent.OnFinished() {
-
-        public void onSendFinished(PendingIntent pi, Intent intent, int resultCode,
-                String resultData, Bundle resultExtras) {
-            mFinishResult = true;
-            if (intent != null) {
-                mResultAction = intent.getAction();
-            }
-        }
-    };
-
-    Handler mHandler = new Handler() {
-
-        @Override
-        public void dispatchMessage(Message msg) {
-            mHandleResult = true;
-            super.dispatchMessage(msg);
-        }
-
-        @Override
-        public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
-            mHandleResult = true;
-            return super.sendMessageAtTime(msg, uptimeMillis);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            mHandleResult = true;
-        }
-    };
+    private PendingIntent mPendingIntent;
+    private Intent mIntent;
+    private Context mContext;
+    private boolean mFinishResult;
+    private boolean mHandleResult;
+    private String mResultAction;
+    private PendingIntent.OnFinished mFinish;
+    private boolean mLooperStart;
+    private Looper mLooper;
+    private Handler mHandler;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mContext = getContext();
+        mFinish = new PendingIntent.OnFinished() {
+            public void onSendFinished(PendingIntent pi, Intent intent, int resultCode,
+                    String resultData, Bundle resultExtras) {
+                mFinishResult = true;
+                if (intent != null) {
+                    mResultAction = intent.getAction();
+                }
+            }
+        };
+
+        new Thread() {
+            @Override
+            public void run() {
+                Looper.prepare();
+                mLooper = Looper.myLooper();
+                mLooperStart = true;
+                Looper.loop();
+            }
+        }.start();
+        while (!mLooperStart) {
+            Thread.sleep(50);
+        }
+        mHandler = new Handler(mLooper) {
+            @Override
+            public void dispatchMessage(Message msg) {
+                mHandleResult = true;
+                super.dispatchMessage(msg);
+            }
+
+            @Override
+            public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
+                mHandleResult = true;
+                return super.sendMessageAtTime(msg, uptimeMillis);
+            }
+
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                mHandleResult = true;
+            }
+        };
     }
 
-    /**
-     * Wait for an action to complete.
-     *
-     * @param time The time to wait.
-     */
-    protected void waitForAction(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            fail("Error occurred while waiting for an action");
-        }
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mLooper.quit();
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test getActivity",
         method = "getActivity",
         args = {android.content.Context.class, int.class, android.content.Intent.class, int.class}
     )
-    public void testGetActivity() {
+    public void testGetActivity() throws InterruptedException, CanceledException {
         PendingIntentStubActivity.status = PendingIntentStubActivity.INVALIDATE;
         mPendingIntent = null;
         mIntent = new Intent();
@@ -111,9 +115,9 @@
                 PendingIntent.FLAG_CANCEL_CURRENT);
         assertEquals(mContext.getPackageName(), mPendingIntent.getTargetPackage());
 
-        pendingIntentSend(mPendingIntent);
+        mPendingIntent.send();
 
-        waitForAction(WAIT_TIME);
+        Thread.sleep(WAIT_TIME);
         assertNotNull(mPendingIntent);
         assertEquals(PendingIntentStubActivity.status, PendingIntentStubActivity.ON_CREATE);
 
@@ -127,7 +131,6 @@
                 PendingIntent.FLAG_ONE_SHOT);
 
         pendingIntentSendError(mPendingIntent);
-
     }
 
     private void pendingIntentSendError(PendingIntent pendingIntent) {
@@ -139,33 +142,25 @@
             mPendingIntent.send();
             fail("CanceledException expected, but not thrown");
         } catch (PendingIntent.CanceledException e) {
-        }
-    }
-
-    private void pendingIntentSend(PendingIntent pendingIntent) {
-        try {
-            pendingIntent.send();
-        } catch (CanceledException e) {
-            fail("Unexpected CanceledException");
+            // expected
         }
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test getBroadcast",
         method = "getBroadcast",
         args = {android.content.Context.class, int.class, android.content.Intent.class, int.class}
     )
-    public void testGetBroadcast() {
+    public void testGetBroadcast() throws InterruptedException, CanceledException {
         MockReceiver.sAction = null;
         mIntent = new Intent(MockReceiver.MOCKACTION);
         mIntent.setClass(mContext, MockReceiver.class);
         mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
 
-        pendingIntentSend(mPendingIntent);
+        mPendingIntent.send();
 
-        waitForAction(WAIT_TIME);
+        Thread.sleep(WAIT_TIME);
         assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
 
         // test getBroadcast return null
@@ -182,20 +177,19 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test getService",
         method = "getService",
         args = {android.content.Context.class, int.class, android.content.Intent.class, int.class}
     )
-    public void testGetService() {
+    public void testGetService() throws InterruptedException, CanceledException {
         MockService.result = false;
         mIntent = new Intent();
         mIntent.setClass(mContext, MockService.class);
         mPendingIntent = PendingIntent.getService(mContext, 1, mIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
 
-        pendingIntentSend(mPendingIntent);
+        mPendingIntent.send();
 
-        waitForAction(WAIT_TIME);
+        Thread.sleep(WAIT_TIME);
         assertTrue(MockService.result);
 
         // test getService return null
@@ -204,25 +198,24 @@
                 PendingIntent.FLAG_NO_CREATE);
         assertNull(mPendingIntent);
 
-        mPendingIntent = PendingIntent
-                .getService(mContext, 1, mIntent, PendingIntent.FLAG_ONE_SHOT);
+        mPendingIntent = PendingIntent.getService(mContext, 1, mIntent,
+                PendingIntent.FLAG_ONE_SHOT);
 
         pendingIntentSendError(mPendingIntent);
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test cancel",
         method = "cancel",
         args = {}
     )
-    public void testCancel() {
+    public void testCancel() throws CanceledException {
         mIntent = new Intent();
         mIntent.setClass(mContext, MockService.class);
         mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
 
-        pendingIntentSend(mPendingIntent);
+        mPendingIntent.send();
 
         mPendingIntent.cancel();
         pendingIntentSendShouldFail(mPendingIntent);
@@ -239,11 +232,10 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test send",
         method = "send",
         args = {}
     )
-    public void testSend() {
+    public void testSend() throws InterruptedException, CanceledException {
         MockReceiver.sAction = null;
         MockReceiver.sResultCode = -1;
         mIntent = new Intent();
@@ -252,9 +244,9 @@
         mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
 
-        pendingIntentSend(mPendingIntent);
+        mPendingIntent.send();
 
-        waitForAction(WAIT_TIME);
+        Thread.sleep(WAIT_TIME);
 
         // send function to send default code 0
         assertEquals(0, MockReceiver.sResultCode);
@@ -262,209 +254,181 @@
         mPendingIntent.cancel();
 
         pendingIntentSendShouldFail(mPendingIntent);
-
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test send(int)",
         method = "send",
         args = {int.class}
     )
-    public void testSendWithParamInt() {
-
+    public void testSendWithParamInt() throws InterruptedException, CanceledException {
         mIntent = new Intent(MockReceiver.MOCKACTION);
         mIntent.setClass(mContext, MockReceiver.class);
         mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
+        MockReceiver.sResultCode = 0;
+        MockReceiver.sAction = null;
+        // send result code 1.
+        mPendingIntent.send(1);
+        Thread.sleep(WAIT_TIME);
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
 
-        try {
-            MockReceiver.sResultCode = 0;
-            MockReceiver.sAction = null;
-            // send result code 1.
-            mPendingIntent.send(1);
-            waitForAction(WAIT_TIME);
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
+        // assert the result code
+        assertEquals(1, MockReceiver.sResultCode);
+        assertEquals(mResultAction, null);
 
-            // assert the result code
-            assertEquals(1, MockReceiver.sResultCode);
-            assertEquals(mResultAction, null);
+        mResultAction = null;
+        MockReceiver.sResultCode = 0;
+        // send result code 2
+        mPendingIntent.send(2);
+        Thread.sleep(WAIT_TIME);
 
-            mResultAction = null;
-            MockReceiver.sResultCode = 0;
-            // send result code 2
-            mPendingIntent.send(2);
-            waitForAction(WAIT_TIME);
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
 
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
-
-            // assert the result code
-            assertEquals(2, MockReceiver.sResultCode);
-            assertEquals(MockReceiver.sAction, MockReceiver.MOCKACTION);
-            assertNull(mResultAction);
-
-        } catch (PendingIntent.CanceledException e) {
-            fail("Unexpected CanceledException");
-        }
+        // assert the result code
+        assertEquals(2, MockReceiver.sResultCode);
+        assertEquals(MockReceiver.sAction, MockReceiver.MOCKACTION);
+        assertNull(mResultAction);
         mPendingIntent.cancel();
         pendingIntentSendShouldFail(mPendingIntent);
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test send(Context, int, Intent)",
         method = "send",
         args = {android.content.Context.class, int.class, android.content.Intent.class}
     )
-    public void testSendWithParamContextIntIntent() {
+    public void testSendWithParamContextIntIntent() throws InterruptedException, CanceledException {
         mIntent = new Intent(MockReceiver.MOCKACTION);
         mIntent.setClass(mContext, MockReceiver.class);
 
-        try {
-            MockReceiver.sAction = null;
-            MockReceiver.sResultCode = 0;
+        MockReceiver.sAction = null;
+        MockReceiver.sResultCode = 0;
 
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
 
-            mPendingIntent.send(mContext, 1, null);
-            waitForAction(WAIT_TIME);
+        mPendingIntent.send(mContext, 1, null);
+        Thread.sleep(WAIT_TIME);
 
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
-            assertEquals(1, MockReceiver.sResultCode);
-            mPendingIntent.cancel();
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
+        assertEquals(1, MockReceiver.sResultCode);
+        mPendingIntent.cancel();
 
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            MockReceiver.sAction = null;
-            MockReceiver.sResultCode = 0;
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        MockReceiver.sAction = null;
+        MockReceiver.sResultCode = 0;
 
-            mPendingIntent.send(mContext, 2, mIntent);
-            waitForAction(WAIT_TIME);
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
-            assertEquals(2, MockReceiver.sResultCode);
-            mPendingIntent.cancel();
-
-        } catch (PendingIntent.CanceledException e) {
-            fail("Unexpected CanceledException");
-        }
+        mPendingIntent.send(mContext, 2, mIntent);
+        Thread.sleep(WAIT_TIME);
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
+        assertEquals(2, MockReceiver.sResultCode);
+        mPendingIntent.cancel();
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test send(int, OnFinished, Handler)",
         method = "send",
         args = {int.class, android.app.PendingIntent.OnFinished.class, android.os.Handler.class}
     )
-    @ToBeFixed(bug = "", explanation = "PendingIntent#send(int, OnFinished, "
-                   + "Handler) handler should work")
-    public void testSendWithParamIntOnFinishedHandler() {
+    public void testSendWithParamIntOnFinishedHandler() throws InterruptedException,
+            CanceledException {
         mIntent = new Intent(MockReceiver.MOCKACTION);
         mIntent.setClass(mContext, MockReceiver.class);
 
-        try {
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            mFinishResult = false;
-            mHandleResult = false;
-            MockReceiver.sAction = null;
-            MockReceiver.sResultCode = 0;
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        mFinishResult = false;
+        mHandleResult = false;
+        MockReceiver.sAction = null;
+        MockReceiver.sResultCode = 0;
 
-            mPendingIntent.send(1, null, null);
-            waitForAction(WAIT_TIME);
-            assertFalse(mFinishResult);
-            assertFalse(mHandleResult);
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
+        mPendingIntent.send(1, null, null);
+        Thread.sleep(WAIT_TIME);
+        assertFalse(mFinishResult);
+        assertFalse(mHandleResult);
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
 
-            // assert result code
-            assertEquals(1, MockReceiver.sResultCode);
-            mPendingIntent.cancel();
+        // assert result code
+        assertEquals(1, MockReceiver.sResultCode);
+        mPendingIntent.cancel();
 
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            mFinishResult = false;
-            MockReceiver.sAction = null;
-            MockReceiver.sResultCode = 0;
-            mHandleResult = false;
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        mFinishResult = false;
+        MockReceiver.sAction = null;
+        MockReceiver.sResultCode = 0;
+        mHandleResult = false;
 
-            mPendingIntent.send(2, mFinish, null);
-            waitForAction(WAIT_TIME);
-            assertTrue(mFinishResult);
-            assertFalse(mHandleResult);
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
+        mPendingIntent.send(2, mFinish, null);
+        Thread.sleep(WAIT_TIME);
+        assertTrue(mFinishResult);
+        assertFalse(mHandleResult);
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
 
-            // assert result code
-            assertEquals(2, MockReceiver.sResultCode);
-            mPendingIntent.cancel();
+        // assert result code
+        assertEquals(2, MockReceiver.sResultCode);
+        mPendingIntent.cancel();
 
-            mHandleResult = false;
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            MockReceiver.sAction = null;
-            mPendingIntent.send(3, null, mHandler);
-            waitForAction(WAIT_TIME);
-            // here we set a hander to send, but there is nothing called handler
-            // to make mHandleResult true. A bug?
-            assertFalse(mHandleResult);
-            assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
+        mHandleResult = false;
+        mFinishResult = false;
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        MockReceiver.sAction = null;
+        mPendingIntent.send(3, mFinish, mHandler);
+        Thread.sleep(WAIT_TIME);
+        assertTrue(mHandleResult);
+        assertTrue(mFinishResult);
+        assertEquals(MockReceiver.MOCKACTION, MockReceiver.sAction);
 
-            // assert result code
-            assertEquals(3, MockReceiver.sResultCode);
-            mPendingIntent.cancel();
-        } catch (PendingIntent.CanceledException e) {
-            fail("Unexpected CanceledException");
-        }
-
+        // assert result code
+        assertEquals(3, MockReceiver.sResultCode);
+        mPendingIntent.cancel();
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test send(Context, int, Intent, OnFinished, Handler)",
         method = "send",
         args = {Context.class, int.class, Intent.class,
                 PendingIntent.OnFinished.class, Handler.class}
     )
-    public void testSendWithParamContextIntIntentOnFinishedHandler() {
+    public void testSendWithParamContextIntIntentOnFinishedHandler() throws InterruptedException,
+            CanceledException {
         mIntent = new Intent(MockReceiver.MOCKACTION);
         mIntent.setAction(MockReceiver.MOCKACTION);
 
-        try {
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            mFinishResult = false;
-            mResultAction = null;
-            mHandleResult = false;
-            mPendingIntent.send(mContext, 1, mIntent, null, null);
-            waitForAction(WAIT_TIME);
-            assertFalse(mFinishResult);
-            assertFalse(mHandleResult);
-            assertNull(mResultAction);
-            mPendingIntent.cancel();
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        mFinishResult = false;
+        mResultAction = null;
+        mHandleResult = false;
+        mPendingIntent.send(mContext, 1, mIntent, null, null);
+        Thread.sleep(WAIT_TIME);
+        assertFalse(mFinishResult);
+        assertFalse(mHandleResult);
+        assertNull(mResultAction);
+        mPendingIntent.cancel();
 
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            mFinishResult = false;
-            mResultAction = null;
-            mHandleResult = false;
-            mPendingIntent.send(mContext, 1, mIntent, mFinish, null);
-            waitForAction(WAIT_TIME);
-            assertTrue(mFinishResult);
-            assertEquals(mResultAction, MockReceiver.MOCKACTION);
-            assertFalse(mHandleResult);
-            mPendingIntent.cancel();
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        mFinishResult = false;
+        mResultAction = null;
+        mHandleResult = false;
+        mPendingIntent.send(mContext, 1, mIntent, mFinish, null);
+        Thread.sleep(WAIT_TIME);
+        assertTrue(mFinishResult);
+        assertEquals(mResultAction, MockReceiver.MOCKACTION);
+        assertFalse(mHandleResult);
+        mPendingIntent.cancel();
 
-            mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
-            mFinishResult = false;
-            mResultAction = null;
-            mHandleResult = false;
-            mPendingIntent.send(mContext, 1, mIntent, mFinish, mHandler);
-            waitForAction(WAIT_TIME);
-            assertTrue(mHandleResult);
-            assertEquals(mResultAction, MockReceiver.MOCKACTION);
-            assertTrue(mFinishResult);
-            mPendingIntent.cancel();
-        } catch (PendingIntent.CanceledException e) {
-            fail("Unexpected CanceledException");
-        }
-
+        mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
+        mFinishResult = false;
+        mResultAction = null;
+        mHandleResult = false;
+        mPendingIntent.send(mContext, 1, mIntent, mFinish, mHandler);
+        Thread.sleep(WAIT_TIME);
+        assertTrue(mHandleResult);
+        assertEquals(mResultAction, MockReceiver.MOCKACTION);
+        assertTrue(mFinishResult);
+        mPendingIntent.cancel();
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test getTargetPackage",
         method = "getTargetPackage",
         args = {}
     )
@@ -478,13 +442,11 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test equals",
             method = "equals",
             args = {java.lang.Object.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test hashCode",
             method = "hashCode",
            args = {}
         )
@@ -514,27 +476,23 @@
 
         assertTrue(mPendingIntent.equals(target));
         assertEquals(mPendingIntent.hashCode(), target.hashCode());
-
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test describeContents",
         method = "describeContents",
         args = {}
     )
     public void testDescribeContents() {
-
         mIntent = new Intent();
         mPendingIntent = PendingIntent.getActivity(mContext, 1, mIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
-        int expected = 0;
+        final int expected = 0;
         assertEquals(expected, mPendingIntent.describeContents());
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test writeToParcel",
         method = "writeToParcel",
         args = {android.os.Parcel.class, int.class}
     )
@@ -553,19 +511,16 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test writePendingIntentOrNullToParcel",
             method = "writePendingIntentOrNullToParcel",
             args = {android.app.PendingIntent.class, android.os.Parcel.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test readPendingIntentOrNullFromParcel",
             method = "readPendingIntentOrNullFromParcel",
             args = {android.os.Parcel.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test toString",
             method = "toString",
             args = {}
         )
@@ -588,7 +543,6 @@
         PendingIntent.writePendingIntentOrNullToParcel(mPendingIntent, parcel);
         target = PendingIntent.readPendingIntentOrNullFromParcel(parcel);
         assertNull(target);
-
     }
 
 }
diff --git a/tests/tests/app/src/android/app/cts/PendingIntent_CanceledExceptionTest.java b/tests/tests/app/src/android/app/cts/PendingIntent_CanceledExceptionTest.java
index dc9d225..8e67b7d 100644
--- a/tests/tests/app/src/android/app/cts/PendingIntent_CanceledExceptionTest.java
+++ b/tests/tests/app/src/android/app/cts/PendingIntent_CanceledExceptionTest.java
@@ -30,25 +30,21 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of PendingIntent.CanceledException.",
             method = "PendingIntent.CanceledException",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of PendingIntent.CanceledException.",
             method = "PendingIntent.CanceledException",
             args = {String.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of PendingIntent.CanceledException.",
             method = "PendingIntent.CanceledException",
             args = {Exception.class}
         )
     })
     public void testConstructor() {
-
         PendingIntent.CanceledException canceledException = new PendingIntent.CanceledException();
         try {
             throw canceledException;
diff --git a/tests/tests/app/src/android/app/cts/ProgressDialogTest.java b/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
index a834e52..2a52f27 100644
--- a/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
@@ -29,11 +29,13 @@
 import android.view.Window;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestTargetNew;
+
+import com.android.internal.R;
+
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
-import com.android.internal.R;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
 
 /**
  * Test {@link ProgressDialog}.
@@ -72,13 +74,12 @@
         mActivity = getActivity();
         mContext = mActivity;
         mProgressDialog = new ProgressDialog(mContext);
-        mDrawable = getActivity().getResources()
-                .getDrawable(com.android.cts.stub.R.drawable.yellow);
+        mDrawable = getActivity().getResources().getDrawable(
+                com.android.cts.stub.R.drawable.yellow);
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: ProgressDialog",
         method = "ProgressDialog",
         args = {android.content.Context.class}
     )
@@ -88,30 +89,26 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: ProgressDialog",
         method = "ProgressDialog",
         args = {android.content.Context.class, int.class}
     )
     public void testProgressDialog2(){
-        new ProgressDialog(mContext, com.android.internal.R.style.Theme_Translucent);
+        new ProgressDialog(mContext, com.android.cts.stub.R.style.Theme_AlertDialog);
     }
 
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test method: ",
             method = "onCreate",
             args = {android.os.Bundle.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test method: ",
             method = "onStart",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test method: ",
             method = "onStop",
             args = {}
         )
@@ -132,9 +129,8 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: show",
         method = "show",
-        args = {android.content.Context.class, java.lang.CharSequence.class, 
+        args = {android.content.Context.class, java.lang.CharSequence.class,
                 java.lang.CharSequence.class}
     )
     @UiThreadTest
@@ -143,23 +139,22 @@
 
         mMessageView = (TextView) mProgressDialog.getWindow().findViewById(R.id.message);
         mTitleView = (TextView) mProgressDialog.getWindow().findViewById(R.id.alertTitle);
-
         assertEquals(MESSAGE, mMessageView.getText());
         assertEquals(TITLE, mTitleView.getText());
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: show",
         method = "show",
-        args = {android.content.Context.class, java.lang.CharSequence.class, 
+        args = {android.content.Context.class, java.lang.CharSequence.class,
                 java.lang.CharSequence.class, boolean.class}
     )
     @UiThreadTest
     public void testShow2() {
         mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE, false);
 
-        /* note: the progress bar's style only supports indeterminate mode,
+        /*
+         * note: the progress bar's style only supports indeterminate mode,
          * so can't change indeterminate
          */
         assertTrue(mProgressDialog.isIndeterminate());
@@ -170,12 +165,11 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: show",
         method = "show",
-        args = {android.content.Context.class, java.lang.CharSequence.class, 
+        args = {android.content.Context.class, java.lang.CharSequence.class,
                 java.lang.CharSequence.class, boolean.class, boolean.class}
     )
-    public void testShow3() {
+    public void testShow3() throws Throwable {
         final OnCancelListener cL = new OnCancelListener(){
             public void onCancel(DialogInterface dialog) {
                 mCanceled = true;
@@ -183,12 +177,12 @@
         };
 
         // cancelable is false
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE, true, false);
 
                 mProgressDialog.setOnCancelListener(cL);
-                KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
+                final KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
                 mProgressDialog.onKeyDown(KeyEvent.KEYCODE_BACK, event);
             }
         });
@@ -197,13 +191,13 @@
         assertFalse(mCanceled);
 
         // cancelable is true
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE, true, true);
 
                 assertFalse(mCanceled);
                 mProgressDialog.setOnCancelListener(cL);
-                KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
+                final KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
                 mProgressDialog.onKeyDown(KeyEvent.KEYCODE_BACK, event);
             }
         });
@@ -214,13 +208,12 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: show",
         method = "show",
-        args = {android.content.Context.class, java.lang.CharSequence.class, 
+        args = {android.content.Context.class, java.lang.CharSequence.class,
                 java.lang.CharSequence.class, boolean.class, boolean.class,
                 android.content.DialogInterface.OnCancelListener.class}
     )
-    public void testShow4() {
+    public void testShow4() throws Throwable {
         final OnCancelListener cL = new OnCancelListener(){
             public void onCancel(DialogInterface dialog) {
                 mCanceled = true;
@@ -228,11 +221,11 @@
         };
 
         // cancelable is false
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE, true, false, cL);
 
-                KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
+                final KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
                 mProgressDialog.onKeyDown(KeyEvent.KEYCODE_BACK, event);
             }
         });
@@ -241,12 +234,12 @@
         assertFalse(mCanceled);
 
         // cancelable is true
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE, true, true, cL);
 
                 assertFalse(mCanceled);
-                KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
+                final KeyEvent event = new KeyEvent(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BACK);
                 mProgressDialog.onKeyDown(KeyEvent.KEYCODE_BACK, event);
             }
         });
@@ -258,13 +251,11 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setMax and getMax",
             method = "setMax",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setMax and getMax",
             method = "getMax",
             args = {}
         )
@@ -284,13 +275,11 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setProgress and getProgress",
             method = "setProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setProgress and getProgress",
             method = "getProgress",
             args = {}
         )
@@ -313,13 +302,11 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setSecondaryProgress and getSecondaryProgress",
             method = "setSecondaryProgress",
             args = {int.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setSecondaryProgress and getSecondaryProgress",
             method = "getSecondaryProgress",
             args = {}
         )
@@ -342,13 +329,11 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setIndeterminate and isIndeterminate",
             method = "setIndeterminate",
             args = {boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: setIndeterminate and isIndeterminate",
             method = "isIndeterminate",
             args = {}
         )
@@ -374,12 +359,11 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: incrementProgressBy",
         method = "incrementProgressBy",
         args = {int.class}
     )
-    public void testIncrementProgressBy() {
-        mActivity.runOnUiThread(new Runnable() {
+    public void testIncrementProgressBy() throws Throwable {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = new ProgressDialog(mContext);
                 mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
@@ -399,12 +383,11 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: incrementSecondaryProgressBy",
         method = "incrementSecondaryProgressBy",
         args = {int.class}
     )
-    public void testIncrementSecondaryProgressBy() {
-        mActivity.runOnUiThread(new Runnable() {
+    public void testIncrementSecondaryProgressBy() throws Throwable {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = new ProgressDialog(mContext);
                 mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
@@ -423,16 +406,15 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: setProgressDrawable",
         method = "setProgressDrawable",
         args = {android.graphics.drawable.Drawable.class}
     )
-    public void testSetProgressDrawable() {
-        mActivity.runOnUiThread(new Runnable() {
+    public void testSetProgressDrawable() throws Throwable {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE);
-                Window w = mProgressDialog.getWindow();
-                ProgressBar progressBar = (ProgressBar) w.findViewById(R.id.progress);
+                final Window w = mProgressDialog.getWindow();
+                final ProgressBar progressBar = (ProgressBar) w.findViewById(R.id.progress);
 
                 mProgressDialog.setProgressDrawable(mDrawable);
                 mActureDrawable = progressBar.getProgressDrawable();
@@ -449,15 +431,14 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: setIndeterminateDrawable",
         method = "setIndeterminateDrawable",
         args = {android.graphics.drawable.Drawable.class}
     )
-    public void testSetIndeterminateDrawable() {
-        mActivity.runOnUiThread(new Runnable() {
+    public void testSetIndeterminateDrawable() throws Throwable {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE);
-                Window w = mProgressDialog.getWindow();
+                final Window w = mProgressDialog.getWindow();
                 mProgressBar = (ProgressBar) w.findViewById(R.id.progress);
 
                 mProgressDialog.setIndeterminateDrawable(mDrawable);
@@ -474,12 +455,11 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: setMessage",
         method = "setMessage",
         args = {java.lang.CharSequence.class}
     )
-    public void testSetMessage() {
-        mActivity.runOnUiThread(new Runnable() {
+    public void testSetMessage() throws Throwable {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 // mProgress is null
                 mProgressDialog = new ProgressDialog(mContext);
@@ -491,7 +471,7 @@
         });
         mInstrumentation.waitForIdleSync();
 
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 // mProgress is not null
                 mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE);
@@ -505,11 +485,10 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: setProgressStyle",
         method = "setProgressStyle",
         args = {int.class}
     )
-    public void testSetProgressStyle() {
+    public void testSetProgressStyle() throws Throwable {
         setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
         assertEquals("10/100", mProgressNumber.getText());
 
@@ -520,8 +499,8 @@
         assertNull(null, mProgressNumber);
     }
 
-    private void setProgressStyle(final int style) {
-        mActivity.runOnUiThread(new Runnable() {
+    private void setProgressStyle(final int style) throws Throwable {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 mProgressDialog = new ProgressDialog(mContext);
                 mProgressDialog.setProgressStyle(style);
@@ -529,14 +508,15 @@
                 mProgressDialog.show();
                 mProgressDialog.setProgress(10);
                 mProgressDialog.setMax(100);
-                Window w = mProgressDialog.getWindow(); //for one line less than 100
+                Window w = mProgressDialog.getWindow();
+                //for one line less than 100
                 mProgressNumber = (TextView) w.findViewById(R.id.progress_number);
             }
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    private class MockProgressDialog extends ProgressDialog {
+    private static class MockProgressDialog extends ProgressDialog {
         public boolean mIsOnStopCalled;
         public boolean mIsOnStartCalled;
         public boolean mIsOnCreateCalled;
diff --git a/tests/tests/app/src/android/app/cts/SearchManagerTest.java b/tests/tests/app/src/android/app/cts/SearchManagerTest.java
index a05bdda..7ff8839 100644
--- a/tests/tests/app/src/android/app/cts/SearchManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/SearchManagerTest.java
@@ -41,19 +41,16 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test startSearch function",
             method = "startSearch",
             args = {String.class, boolean.class, ComponentName.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test isVisible",
             method = "isVisible",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test stopSearch",
             method = "stopSearch",
             args = {}
         )
@@ -61,7 +58,7 @@
     @ToBeFixed(bug="1443833", explanation="when start search with parameter"
           + "[test3, true, mComponentName, new Bundle(), false] mSearchManager is"
           + " invisible. Is this a bug?")
-    public void testStartSearch() {
+    public void testStartSearch() throws InterruptedException {
         SearchManagerStubActivity.setCTSResult(this);
         setupActivity(SearchManagerStubActivity.TEST_START_SEARCH);
         waitForResult();
@@ -70,24 +67,21 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test startSearch",
             method = "startSearch",
             args = {String.class, boolean.class, ComponentName.class, Bundle.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test stopSearch function",
             method = "stopSearch",
             args = {}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test isVisible",
             method = "isVisible",
             args = {}
         )
     })
-    public void testStopSearch() {
+    public void testStopSearch() throws InterruptedException {
         SearchManagerStubActivity.setCTSResult(this);
         setupActivity(SearchManagerStubActivity.TEST_STOP_SEARCH);
         waitForResult();
@@ -96,54 +90,45 @@
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test setOnDismissListener function",
             method = "setOnDismissListener",
             args = {android.app.SearchManager.OnDismissListener.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test onDismiss",
             method = "onDismiss",
             args = {DialogInterface.class}
         )
     })
     @ToBeFixed(bug = "1731631", explanation = "From the doc of SearchManager, "
-         + "we see that \"If the user simply canceled the search UI, "
-         + "your activity will regain input focus and proceed as before. "
-         + "See setOnDismissListener(SearchManager.OnDismissListener) and "
-         + "setOnCancelListener(SearchManager.OnCancelListener) "
-         + "if you required direct notification of search dialog dismissals.\" "
-         + "So that means if the SearchManager has set the OnDismissListener "
-         + "and user cancel the search UI, OnDismissListener#onDismiss() will be called. "
-         + "But we have tried to cancel the search UI with the back key "
-         + "but onDismiss() is not called. Is this a bug?")
-    public void testSetOnDismissListener() {
+            + "we see that \"If the user simply canceled the search UI, "
+            + "your activity will regain input focus and proceed as before. "
+            + "See setOnDismissListener(SearchManager.OnDismissListener) and "
+            + "setOnCancelListener(SearchManager.OnCancelListener) "
+            + "if you required direct notification of search dialog dismissals.\" "
+            + "So that means if the SearchManager has set the OnDismissListener "
+            + "and user cancel the search UI, OnDismissListener#onDismiss() will be called. "
+            + "But we have tried to cancel the search UI with the back key "
+            + "but onDismiss() is not called. Is this a bug?")
+    public void testSetOnDismissListener() throws InterruptedException {
         SearchManagerStubActivity.setCTSResult(this);
         setupActivity(SearchManagerStubActivity.TEST_ON_DISMISSLISTENER);
         // Here sleep is to make sure stub Activity is finished
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException e) {
-            fail(e.getMessage());
-        }
-//        waitForResult();
+        Thread.sleep(5000);
     }
 
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test setOnCancelListener function",
             method = "setOnCancelListener",
             args = {android.app.SearchManager.OnCancelListener.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "Test onCancel",
             method = "onCancel",
             args = {DialogInterface.class}
         )
     })
-    public void testSetOnCancelListener() {
+    public void testSetOnCancelListener() throws InterruptedException {
         SearchManagerStubActivity.setCTSResult(this);
         setupActivity(SearchManagerStubActivity.TEST_ON_CANCELLISTENER);
         waitForResult();
diff --git a/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java b/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
index 2176ae8..4cfa372 100644
--- a/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
@@ -21,17 +21,16 @@
 import android.app.TimePickerDialog;
 import android.app.TimePickerDialog.OnTimeSetListener;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.text.format.DateFormat;
 import android.test.ActivityInstrumentationTestCase2;
+import android.text.format.DateFormat;
 import android.view.KeyEvent;
 import android.widget.TextView;
 import android.widget.TimePicker;
-import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
 
 /**
  * Test {@link TimePickerDialog}.
@@ -48,12 +47,7 @@
     private int mCallbackHour;
     private int mCallbackMinute;
 
-    private OnTimeSetListener mOnTimeSetListener = new OnTimeSetListener(){
-        public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-            mCallbackHour = hourOfDay;
-            mCallbackMinute = minute;
-        }
-    };
+    private OnTimeSetListener mOnTimeSetListener;
 
     private Context mContext;
     private DialogStubActivity mActivity;
@@ -69,43 +63,40 @@
 
         mContext = getInstrumentation().getContext();
         mActivity = getActivity();
-        mTimePickerDialog = new TimePickerDialog( mContext,
-                                                  mOnTimeSetListener,
-                                                  TARGET_HOUR,
-                                                  TARGET_MINUTE,
-                                                  true);
+        mOnTimeSetListener = new OnTimeSetListener(){
+            public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+                mCallbackHour = hourOfDay;
+                mCallbackMinute = minute;
+            }
+        };
+        mTimePickerDialog = new TimePickerDialog( mContext, mOnTimeSetListener, TARGET_HOUR,
+                TARGET_MINUTE, true);
     }
 
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: TimePickerDialog and onSaveInstanceState",
             method = "TimePickerDialog",
-            args = {android.content.Context.class, 
-                    android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class, 
+            args = {android.content.Context.class,
+                    android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class,
                     boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: TimePickerDialog and onSaveInstanceState",
             method = "TimePickerDialog",
-            args = {android.content.Context.class, int.class, 
-                    android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class, 
-                    boolean.class}
+            args = {android.content.Context.class,
+                    int.class, android.app.TimePickerDialog.OnTimeSetListener.class,
+                    int.class, int.class, boolean.class}
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            notes = "test methods: TimePickerDialog and onSaveInstanceState",
             method = "onSaveInstanceState",
             args = {}
         )
     })
     public void testSaveInstanceState(){
-        TimePickerDialog tD = new TimePickerDialog( mContext,
-                                                    mOnTimeSetListener,
-                                                    TARGET_HOUR,
-                                                    TARGET_MINUTE,
-                                                    true);
+        TimePickerDialog tD = new TimePickerDialog( mContext, mOnTimeSetListener, TARGET_HOUR,
+                TARGET_MINUTE, true);
 
         Bundle b = tD.onSaveInstanceState();
 
@@ -114,13 +105,8 @@
         assertTrue(b.getBoolean(IS_24_HOUR));
 
         int minute = 13;
-        int theme = com.android.internal.R.style.Theme_Translucent;
-        tD = new TimePickerDialog( mContext,
-                                   theme,
-                                   mOnTimeSetListener,
-                                   TARGET_HOUR,
-                                   minute,
-                                   false);
+        tD = new TimePickerDialog( mContext, com.android.cts.stub.R.style.Theme_AlertDialog,
+                mOnTimeSetListener, TARGET_HOUR, minute, false);
 
         b = tD.onSaveInstanceState();
 
@@ -131,7 +117,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: onClick",
         method = "onClick",
         args = {android.content.DialogInterface.class, int.class}
     )
@@ -144,16 +129,15 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: onTimeChanged",
         method = "onTimeChanged",
         args = {android.widget.TimePicker.class, int.class, int.class}
     )
-    public void testOnTimeChanged() {
+    public void testOnTimeChanged() throws Throwable {
         final int minute = 34;
         popDialog(DialogStubActivity.TEST_TIMEPICKERDIALOG);
         final TimePickerDialog d = (TimePickerDialog) mActivity.getDialog();
 
-        mActivity.runOnUiThread(new Runnable() {
+        runTestOnUiThread(new Runnable() {
             public void run() {
                 d.onTimeChanged(null, TARGET_HOUR, minute);
             }
@@ -166,13 +150,13 @@
         java.text.DateFormat dateFormat = DateFormat.getTimeFormat(getActivity());
 
         String expected = dateFormat.format(mCalendar.getTime());
-        TextView tv = (TextView) d.getWindow().findViewById(com.android.internal.R.id.alertTitle);
+        TextView tv = (TextView) d.getWindow().findViewById(
+                com.android.internal.R.id.alertTitle);
         assertEquals(expected, tv.getText());
     }
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test method: updateTime",
         method = "updateTime",
         args = {int.class, int.class}
     )
@@ -189,7 +173,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "test methods onRestoreInstanceState",
         method = "onRestoreInstanceState",
         args = {android.os.Bundle.class}
     )
@@ -210,7 +193,7 @@
         assertFalse(b2.getBoolean(IS_24_HOUR));
     }
 
-    protected void popDialog(int index) {
+    private void popDialog(int index) {
         assertTrue(index > 0);
 
         while (index != 0) {