revive contacts launch performance tests & also add the test for dialer UI
this is part of a larger effort to collect app launch performance for the platform.
Change-Id: Id8f881f81a32acdcfc930e214d2910f79508c4cb
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 593d6cc..7af1a54 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -31,6 +31,11 @@
android:targetPackage="com.android.contacts"
android:label="Contacts launch performance">
</instrumentation>
-
+
+
+ <instrumentation android:name="com.android.contacts.DialerLaunchPerformance"
+ android:targetPackage="com.android.contacts"
+ android:label="Dialer launch performance">
+ </instrumentation>
</manifest>
diff --git a/tests/src/com/android/contacts/ContactsLaunchPerformance.java b/tests/src/com/android/contacts/ContactsLaunchPerformance.java
index bd60e70..9177457 100644
--- a/tests/src/com/android/contacts/ContactsLaunchPerformance.java
+++ b/tests/src/com/android/contacts/ContactsLaunchPerformance.java
@@ -17,25 +17,22 @@
package com.android.contacts;
import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
import android.test.LaunchPerformanceBase;
import android.os.Bundle;
-import java.util.Map;
-
/**
* Instrumentation class for Address Book launch performance testing.
*/
public class ContactsLaunchPerformance extends LaunchPerformanceBase {
- public static final String LOG_TAG = "ContactsLaunchPerformance";
-
- public ContactsLaunchPerformance() {
- super();
- }
-
@Override
public void onCreate(Bundle arguments) {
- mIntent.setClassName(getTargetContext(), "com.android.contacts.ContactsListActivity");
+ mIntent.setAction(Intent.ACTION_MAIN);
+ mIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ mIntent.setComponent(new ComponentName("com.android.contacts",
+ "com.android.contacts.DialtactsContactsEntryActivity"));
start();
}
diff --git a/tests/src/com/android/contacts/DialerLaunchPerformance.java b/tests/src/com/android/contacts/DialerLaunchPerformance.java
new file mode 100644
index 0000000..ae78082
--- /dev/null
+++ b/tests/src/com/android/contacts/DialerLaunchPerformance.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+import android.test.LaunchPerformanceBase;
+
+/**
+ * Instrumentation class for Address Book launch performance testing.
+ */
+public class DialerLaunchPerformance extends LaunchPerformanceBase {
+
+ @Override
+ public void onCreate(Bundle arguments) {
+ mIntent.setAction(Intent.ACTION_MAIN);
+ mIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ mIntent.setComponent(new ComponentName("com.android.contacts",
+ "com.android.contacts.DialtactsActivity"));
+
+ start();
+ }
+
+ /**
+ * Calls LaunchApp and finish.
+ */
+ @Override
+ public void onStart() {
+ super.onStart();
+ LaunchApp();
+ finish(Activity.RESULT_OK, mResults);
+ }
+}