Remove use of old theme name.

Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
This commit is contained in:
Dianne Hackborn
2011-01-23 13:28:02 -08:00
parent fd6a2b4d25
commit 7c69dba7cc
5 changed files with 25 additions and 15 deletions

View File

@@ -2056,9 +2056,19 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".graphics.HiddenActivity"
android:label="Graphics/OpenGL ES/Hidden Activity"
android:theme="@android:style/Theme.Translucent"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".graphics.TriangleActivity" <activity android:name=".graphics.TriangleActivity"
android:label="Graphics/OpenGL ES/Textured Triangle" android:label="Graphics/OpenGL ES/Textured Triangle"
android:theme="@android:style/Theme.NoTitleBar" android:theme="@android:style/Theme.Holo.Dialog"
android:configChanges="orientation|keyboardHidden"> android:configChanges="orientation|keyboardHidden">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@@ -18,8 +18,9 @@ package com.example.android.apis.app;
// Need the following import to get access to the app resources, since this // Need the following import to get access to the app resources, since this
// class is in a sub-package. // class is in a sub-package.
import com.example.android.apis.R;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
@@ -28,13 +29,10 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.example.android.apis.R;
import com.example.android.apis.app.ForegroundService.Controller;
/** /**
* <h3>Dialog Activity</h3> * <h3>Dialog Activity</h3>
* *
* <p>This demonstrates the how to write an activity that looks like * <p>This demonstrates the how to write an activity that looks like
* a pop-up dialog.</p> * a pop-up dialog.</p>
*/ */
public class DialogActivity extends Activity { public class DialogActivity extends Activity {
@@ -47,15 +45,17 @@ public class DialogActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
// Be sure to call the super class. // Be sure to call the super class.
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_LEFT_ICON); requestWindowFeature(Window.FEATURE_LEFT_ICON);
// See assets/res/any/layout/dialog_activity.xml for this // See assets/res/any/layout/dialog_activity.xml for this
// view layout definition, which is being set here as // view layout definition, which is being set here as
// the content of our screen. // the content of our screen.
setContentView(R.layout.dialog_activity); setContentView(R.layout.dialog_activity);
getWindow().setTitle("This is just a test");
getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,
getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,
android.R.drawable.ic_dialog_alert); android.R.drawable.ic_dialog_alert);
Button button = (Button)findViewById(R.id.add); Button button = (Button)findViewById(R.id.add);

View File

@@ -26,8 +26,10 @@ public class TriangleActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mGLView = new GLSurfaceView(this); mGLView = new GLSurfaceView(this);
mGLView.setEGLConfigChooser(false);
mGLView.setRenderer(new StaticTriangleRenderer(this)); mGLView.setRenderer(new StaticTriangleRenderer(this));
/*ImageView imageView = new ImageView(this);
imageView.setImageResource(R.raw.robot);
setContentView(imageView);*/
setContentView(mGLView); setContentView(mGLView);
} }

View File

@@ -18,8 +18,6 @@
package="com.example.android.hcgallery" android:versionCode="1" package="com.example.android.hcgallery" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="Honeycomb" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<application android:label="@string/app_name" <application android:label="@string/app_name"

View File

@@ -52,7 +52,7 @@
</activity> </activity>
<activity android:name="NoteEditor" <activity android:name="NoteEditor"
android:theme="@android:style/Theme.Light.Holo" android:theme="@android:style/Theme.Holo.Light"
android:screenOrientation="sensor" android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
> >