am bad9ac7f: Merge change 27163 into eclair

Merge commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp

* commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8':
  Add transition animation sample, log to service sample.

samples/ApiDemos/src/com/example/android/apis/app/Animation.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2009 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.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 com.example.android.apis.view.Controls1;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+
+/**
+ * <p>Example of explicitly starting and stopping the {@link LocalService}.
+ * This demonstrates the implementation of a service that runs in the same
+ * process as the rest of the application, which is explicitly started and stopped
+ * as desired.</p>
+ */
+public class Animation extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_animation);
+
+        // Watch for button clicks.
+        Button button = (Button)findViewById(R.id.fade_animation);
+        button.setOnClickListener(mFadeListener);
+        button = (Button)findViewById(R.id.zoom_animation);
+        button.setOnClickListener(mZoomListener);
+    }
+
+    private OnClickListener mFadeListener = new OnClickListener() {
+        public void onClick(View v) {
+            // Request the next activity transition (here starting a new one).
+            startActivity(new Intent(Animation.this, Controls1.class));
+            // Supply a custom animation.  This one will just fade the new
+            // activity on top.  Note that we need to also supply an animation
+            // (here just doing nothing for the same amount of time) for the
+            // old activity to prevent it from going away too soon.
+            overridePendingTransition(R.anim.fade, R.anim.hold);
+        }
+    };
+
+    private OnClickListener mZoomListener = new OnClickListener() {
+        public void onClick(View v) {
+            // Request the next activity transition (here starting a new one).
+            startActivity(new Intent(Animation.this, Controls1.class));
+            // This is a more complicated animation, involving transformations
+            // on both this (exit) and the new (enter) activity.  Note how for
+            // the duration of the animation we force the exiting activity
+            // to be Z-ordered on top (even though it really isn't) to achieve
+            // the effect we want.
+            overridePendingTransition(R.anim.zoom_enter, R.anim.zoom_exit);
+        }
+    };
+}
+

samples/ApiDemos/src/com/example/android/apis/app/LocalService.java

@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Parcel;
+import android.util.Log;
 import android.widget.Toast;
 
 // Need the following import to get access to the app resources, since this
@@ -63,6 +64,14 @@ public class LocalService extends Service {
         showNotification();
     }
 
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Log.i("LocalService", "Received start id " + startId + ": " + intent);
+        // We want this service to continue running until it is explicitly
+        // stopped, so return sticky.
+        return START_STICKY;
+    }
+
     @Override
     public void onDestroy() {
         // Cancel the persistent notification.