Commit: 8929f134293cfcb636ac3da76b2b400ae3df1a06 - development (git)

development

Commit MetaInfo

• Revisión: 8929f134293cfcb636ac3da76b2b400ae3df1a06 (tree)
• Tiempo: 2011-01-24 07:41:27
• Autor: Dianne Hackborn <hackbod@goog...>
• Commiter: Android Git Automerger

Log Message

am 7c69dba7: Remove use of old theme name.

* commit '7c69dba7cc03073820d567dcb2fa6af031326e7a':

Remove use of old theme name.

Cambiar Resumen

• modified: samples/ApiDemos/AndroidManifest.xml
• modified: samples/ApiDemos/src/com/example/android/apis/app/DialogActivity.java
• modified: samples/ApiDemos/src/com/example/android/apis/graphics/TriangleActivity.java
• modified: samples/Honeycomb-Gallery/AndroidManifest.xml
• modified: samples/NotePad/AndroidManifest.xml

Diferencia incremental

--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -2057,9 +2057,19 @@
             </intent-filter>
         </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"
                 android:label="Graphics/OpenGL ES/Textured Triangle"
-                android:theme="@android:style/Theme.NoTitleBar"
+                android:theme="@android:style/Theme.Holo.Dialog"
                 android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

--- a/samples/ApiDemos/src/com/example/android/apis/app/DialogActivity.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/DialogActivity.java
@@ -18,8 +18,9 @@ package com.example.android.apis.app;
 
 // 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.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
@@ -28,13 +29,10 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.example.android.apis.R;
-import com.example.android.apis.app.ForegroundService.Controller;
-
 /**
  * <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>
  */
 public class DialogActivity extends Activity {
@@ -47,15 +45,17 @@ public class DialogActivity extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
         // Be sure to call the super class.
         super.onCreate(savedInstanceState);
-        
+
         requestWindowFeature(Window.FEATURE_LEFT_ICON);
-        
+
+
         // See assets/res/any/layout/dialog_activity.xml for this
         // view layout definition, which is being set here as
         // the content of our screen.
         setContentView(R.layout.dialog_activity);
-        
-        getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, 
+        getWindow().setTitle("This is just a test");
+
+        getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,
                 android.R.drawable.ic_dialog_alert);
 
         Button button = (Button)findViewById(R.id.add);

--- a/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleActivity.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleActivity.java
@@ -26,8 +26,10 @@ public class TriangleActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mGLView = new GLSurfaceView(this);
-        mGLView.setEGLConfigChooser(false);
         mGLView.setRenderer(new StaticTriangleRenderer(this));
+        /*ImageView imageView = new ImageView(this);
+        imageView.setImageResource(R.raw.robot);
+        setContentView(imageView);*/
         setContentView(mGLView);
     }
 

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

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