am 6612dcc1: am 7c73ab42: am d4f867d5: Merge "Add Detective Logo to CTS Verifier" into gingerbread
* commit '6612dcc157a5ee973171003a08622b60be5a051a':
Add Detective Logo to CTS Verifier
diff --git a/apps/CtsVerifier/res/drawable/detective.png b/apps/CtsVerifier/res/drawable/detective.png
new file mode 100644
index 0000000..f9417cc
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable/detective.png
Binary files differ
diff --git a/apps/CtsVerifier/res/layout/main.xml b/apps/CtsVerifier/res/layout/main.xml
index 35f6f23..d6cb6cd 100644
--- a/apps/CtsVerifier/res/layout/main.xml
+++ b/apps/CtsVerifier/res/layout/main.xml
@@ -18,12 +18,6 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
- <TextView
- android:id="@+id/welcome"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/welcome_text"
- />
<Button
android:id="@+id/continue_button"
android:layout_width="fill_parent"
@@ -31,4 +25,23 @@
android:layout_alignParentBottom="true"
android:text="@string/continue_button_text"
/>
+ <TextView
+ android:id="@+id/welcome_text"
+ android:gravity="center"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/continue_button"
+ android:padding="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/values/styles.xml b/apps/CtsVerifier/res/values/styles.xml
new file mode 100644
index 0000000..c5b05cb
--- /dev/null
+++ b/apps/CtsVerifier/res/values/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="WelcomeFont" parent="@android:style/TextAppearance.Large">
+ <item name="android:textColor">#9fbf3b</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java
index 5fd140f..e35674c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/CtsVerifierActivity.java
@@ -20,6 +20,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
+import android.view.Window;
import android.view.View.OnClickListener;
/** {@link Activity} that displays an introduction to the verifier. */
@@ -29,12 +30,17 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.main);
- findViewById(R.id.continue_button).setOnClickListener(new OnClickListener() {
+
+ OnClickListener clickListener = new OnClickListener() {
@Override
public void onClick(View v) {
startActivity(new Intent(CtsVerifierActivity.this, TestListActivity.class));
}
- });
+ };
+
+ findViewById(R.id.detective_logo).setOnClickListener(clickListener);
+ findViewById(R.id.continue_button).setOnClickListener(clickListener);
}
}
