New Views/Controls themes: Theme.Holo and Theme.Light.Holo
Change-Id: Ie3cd1ea5713119ce2027096a55e68997127a46f7
diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 1ebc3ee..a8d5563 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1220,63 +1220,63 @@
</intent-filter>
</activity>
- <activity android:name=".view.List1" android:label="Views/Lists/1. Array">
+ <activity android:name=".view.List1" android:label="Views/Lists/01. Array">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List2" android:label="Views/Lists/2. Cursor (People)">
+ <activity android:name=".view.List2" android:label="Views/Lists/02. Cursor (People)">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List3" android:label="Views/Lists/3. Cursor (Phones)">
+ <activity android:name=".view.List3" android:label="Views/Lists/03. Cursor (Phones)">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List4" android:label="Views/Lists/4. ListAdapter">
+ <activity android:name=".view.List4" android:label="Views/Lists/04. ListAdapter">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List5" android:label="Views/Lists/5. Separators">
+ <activity android:name=".view.List5" android:label="Views/Lists/05. Separators">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List6" android:label="Views/Lists/6. ListAdapter Collapsed">
+ <activity android:name=".view.List6" android:label="Views/Lists/06. ListAdapter Collapsed">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List7" android:label="Views/Lists/7. Cursor (Phones)">
+ <activity android:name=".view.List7" android:label="Views/Lists/07. Cursor (Phones)">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List8" android:label="Views/Lists/8. Photos">
+ <activity android:name=".view.List8" android:label="Views/Lists/08. Photos">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.List9" android:label="Views/Lists/9. Array (Overlay)">
+ <activity android:name=".view.List9" android:label="Views/Lists/09. Array (Overlay)">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
@@ -1503,15 +1503,35 @@
</activity>
<activity android:name=".view.Controls1"
- android:label="Views/Controls/1. Light Theme"
- android:theme="@android:style/Theme.Light">
+ android:label="Views/Controls/1. Light Theme"
+ android:theme="@android:style/Theme.Light">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
- <activity android:name=".view.Controls2" android:label="Views/Controls/2. Default Theme">
+ <activity android:name=".view.Controls2"
+ android:label="Views/Controls/2. Default Theme"
+ android:theme="@android:style/Theme">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.SAMPLE_CODE" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name=".view.Controls3"
+ android:label="Views/Controls/3. Holo Light Theme"
+ android:theme="@android:style/Theme.Light.Holo">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.SAMPLE_CODE" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name=".view.Controls4"
+ android:label="Views/Controls/4. Holo Dark Theme"
+ android:theme="@android:style/Theme.Holo">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/FragmentDialog.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentDialog.java
index bf9a7ea..bb2ef8b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/FragmentDialog.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentDialog.java
@@ -25,8 +25,8 @@
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.View.OnClickListener;
+import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Controls2.java b/samples/ApiDemos/src/com/example/android/apis/view/Controls2.java
index 4f4024b..42bc297 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/Controls2.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Controls2.java
@@ -16,35 +16,4 @@
package com.example.android.apis.view;
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
-import com.example.android.apis.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Spinner;
-import android.widget.ArrayAdapter;
-
-
-/**
- * A gallery of basic controls: Button, EditText, RadioButton, Checkbox,
- * Spinner. This example uses the default theme.
- */
-public class Controls2 extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.controls_1);
-
- Spinner s1 = (Spinner) findViewById(R.id.spinner1);
- ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
- android.R.layout.simple_spinner_item, mStrings);
- adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
- s1.setAdapter(adapter);
- }
-
- private static final String[] mStrings = {
- "Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune"
- };
-}
+public class Controls2 extends Controls1 {}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Controls3.java b/samples/ApiDemos/src/com/example/android/apis/view/Controls3.java
new file mode 100644
index 0000000..407767f
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Controls3.java
@@ -0,0 +1,19 @@
+/*
+ * 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.example.android.apis.view;
+
+public class Controls3 extends Controls1 {}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Controls4.java b/samples/ApiDemos/src/com/example/android/apis/view/Controls4.java
new file mode 100644
index 0000000..3dcf310
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Controls4.java
@@ -0,0 +1,19 @@
+/*
+ * 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.example.android.apis.view;
+
+public class Controls4 extends Controls1 {}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Tabs3.java b/samples/ApiDemos/src/com/example/android/apis/view/Tabs3.java
index e09f041..587bfe8 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/Tabs3.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Tabs3.java
@@ -44,7 +44,7 @@
// the tab is clicked.
tabHost.addTab(tabHost.newTabSpec("tab3")
.setIndicator("destroy")
- .setContent(new Intent(this, Controls2.class)
+ .setContent(new Intent(this, Controls1.class)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)));
}
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/_index.html b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
index a462bc1..21d756f 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
@@ -235,13 +235,21 @@
<h3>Controls</h3>
<dl>
- <dt><a href="Controls1.html">1. Theme White</a></dt>
- <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the white theme. </dd>
+ <dt><a href="Controls1.html">1. Theme Light</a></dt>
+ <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the light theme. </dd>
</dl>
<dl>
- <dt><a href="Controls2.html">2. Theme Dark</a></dt>
+ <dt><a href="Controls1.html">2. Theme Dark</a></dt>
<dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the dark theme. </dd>
</dl>
+<dl>
+ <dt><a href="Controls1.html">3. Theme Holographic Light</a></dt>
+ <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the light holographic theme. </dd>
+</dl>
+<dl>
+ <dt><a href="Controls1.html">4. Theme Holographic Dark</a></dt>
+ <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the dark holographic theme. </dd>
+</dl>
<h3>Auto Complete</h3>
<dl>
