am da429d77: Remove CTS Verifier welcome screen
* commit 'da429d774a06fe442bc2e07fb4c25958ab59c67f':
Remove CTS Verifier welcome screen
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index ef3c073..6373173 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -54,13 +54,6 @@
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIbK6ldcOzoeRtQ1u1dFVJ1A7KetRhit-a1Xa82Q" />
- <activity android:name=".CtsVerifierActivity" android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
<activity android:name=".TestListActivity" android:label="@string/app_name">
<!--
TestListActivity will have the USB accessory Test in its test list, but it
@@ -384,6 +377,14 @@
android:label="@string/p2p_service_discovery_responder"
android:configChanges="keyboardHidden|orientation" />
+ <activity-alias android:name=".CtsVerifierActivity" android:label="@string/app_name"
+ android:targetActivity=".TestListActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity-alias>
+
</application>
</manifest>
diff --git a/apps/CtsVerifier/res/drawable/detective.png b/apps/CtsVerifier/res/drawable/detective.png
deleted file mode 100644
index f9417cc..0000000
--- a/apps/CtsVerifier/res/drawable/detective.png
+++ /dev/null
Binary files differ
diff --git a/apps/CtsVerifier/res/layout/main.xml b/apps/CtsVerifier/res/layout/main.xml
deleted file mode 100644
index cdfb8f4..0000000
--- a/apps/CtsVerifier/res/layout/main.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
- <Button
- android:id="@+id/continue_button"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:text="@string/continue_button_text"
- />
- <TextView
- android:id="@+id/version_text"
- android:gravity="center"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/continue_button"
- android:paddingBottom="10dip"
- style="@style/VersionFont"
- />
- <TextView
- android:id="@+id/welcome_text"
- android:gravity="center"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/version_text"
- android:paddingTop="10dip"
- android:text="@string/welcome_text"
- style="@style/WelcomeFont"
- />
- <ImageView
- android:id="@+id/detective_logo"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_above="@+id/welcome_text"
- android:padding="10dip"
- android:src="@drawable/detective"
- />
-</RelativeLayout>
diff --git a/apps/CtsVerifier/res/menu/test_list_menu.xml b/apps/CtsVerifier/res/menu/test_list_menu.xml
index e777791..ecc6920 100644
--- a/apps/CtsVerifier/res/menu/test_list_menu.xml
+++ b/apps/CtsVerifier/res/menu/test_list_menu.xml
@@ -2,11 +2,14 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/clear"
android:icon="@android:drawable/ic_menu_delete"
- android:title="@string/clear" />
+ android:title="@string/clear"
+ android:showAsAction="ifRoom" />
<item android:id="@+id/view"
android:icon="@android:drawable/ic_menu_view"
- android:title="@string/view" />
+ android:title="@string/view"
+ android:showAsAction="ifRoom" />
<item android:id="@+id/export"
android:icon="@android:drawable/ic_menu_save"
- android:title="@string/export" />
+ android:title="@string/export"
+ android:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index d09efb1..ab9c244 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -15,16 +15,14 @@
-->
<resources>
<string name="app_name">CTS Verifier</string>
- <string name="welcome_text">Welcome to the CTS Verifier!</string>
- <string name="version_text">%1$s</string>
- <string name="continue_button_text">Continue</string>
+
+ <string name="title_version">CTS Verifier %1$s</string>
<string name="pass_button_text">Pass</string>
<string name="info_button_text">Info</string>
<string name="fail_button_text">Fail</string>
<!-- Strings for TestListActivity -->
- <string name="test_list_title">Manual Test List</string>
<string name="test_category_audio">Audio</string>
<string name="test_category_camera">Camera</string>
<string name="test_category_device_admin">Device Administration</string>
diff --git a/apps/CtsVerifier/res/values/styles.xml b/apps/CtsVerifier/res/values/styles.xml
index 51f996d..0dfd02d 100644
--- a/apps/CtsVerifier/res/values/styles.xml
+++ b/apps/CtsVerifier/res/values/styles.xml
@@ -1,14 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="WelcomeFont" parent="@android:style/TextAppearance.Large">
- <item name="android:textColor">#9fbf3b</item>
- </style>
<style name="InstructionsFont" parent="@android:style/TextAppearance.Large">
<item name="android:padding">10dp</item>
</style>
- <style name="VersionFont" parent="@android:style/TextAppearance.Large">
- <item name="android:textColor">#ffffff</item>
- </style>
<style name="MessageRow">
<item name="android:gravity">center_vertical</item>
<item name="android:textSize">18sp</item>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java
deleted file mode 100644
index ee3184b..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 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.cts.verifier;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.Window;
-import android.widget.TextView;
-
-/** {@link Activity} that displays an introduction to the verifier. */
-public class CtsVerifierActivity extends Activity {
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- setContentView(R.layout.main);
-
- OnClickListener clickListener = new OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(CtsVerifierActivity.this, TestListActivity.class));
- }
- };
-
- TextView versionText = (TextView) findViewById(R.id.version_text);
- versionText.setText(getString(R.string.version_text, Version.getVersionName(this)));
-
- findViewById(R.id.detective_logo).setOnClickListener(clickListener);
- findViewById(R.id.continue_button).setOnClickListener(clickListener);
- }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
index c510653..43d300a 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java
@@ -35,6 +35,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setTitle(getString(R.string.title_version, Version.getVersionName(this)));
setTestListAdapter(new ManifestTestListAdapter(this, null));
}
