am 27626c03: Add API key to BackupRestore sample code.
Merge commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp
* commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995':
Add API key to BackupRestore sample code.
diff --git a/apps/Term/src/com/android/term/Term.java b/apps/Term/src/com/android/term/Term.java
index cbf94cf..6d3796a 100644
--- a/apps/Term/src/com/android/term/Term.java
+++ b/apps/Term/src/com/android/term/Term.java
@@ -2614,7 +2614,7 @@
public EmulatorView(Context context) {
super(context);
- commonConstructor();
+ commonConstructor(context);
}
public void register(TermKeyListener listener) {
@@ -2784,17 +2784,17 @@
context.obtainStyledAttributes(android.R.styleable.View);
initializeScrollbars(a);
a.recycle();
- commonConstructor();
+ commonConstructor(context);
}
- private void commonConstructor() {
+ private void commonConstructor(Context context) {
mTextRenderer = null;
mCursorPaint = new Paint();
mCursorPaint.setARGB(255,128,128,128);
mBackgroundPaint = new Paint();
mTopRow = 0;
mLeftColumn = 0;
- mGestureDetector = new GestureDetector(this);
+ mGestureDetector = new GestureDetector(context, this, null);
mGestureDetector.setIsLongpressEnabled(false);
setVerticalScrollBarEnabled(true);
}
diff --git a/build/sdk.atree b/build/sdk.atree
index 4b76de4..e87d841 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -66,16 +66,15 @@
# sdk.git files
# SDK properties
-sdk/files/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties
-# legacy Ant build rules, copied under the old name
-sdk/files/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
-sdk/files/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml
-# newer Ant rules.
-sdk/files/ant_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r2.xml
-sdk/files/ant_test_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r2.xml
-sdk/files/ant_lib_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r2.xml
-# layout device definitiion
-sdk/files/devices.xml tools/lib/devices.xml
+sdk/files/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties
+# copy the Ant rules to the platforms and to the tools.
+sdk/files/ant platforms/${PLATFORM_NAME}/ant
+sdk/files/ant tools/ant
+# also copy the rev1 under the old name/location for legacy reason
+sdk/files/ant/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
+sdk/files/ant/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml
+# layout device definition
+sdk/files/devices.xml tools/lib/devices.xml
# emacs support from sdk.git
sdk/files/android.el tools/lib/android.el
diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
index ae8e53b..4de86cf 100644
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -602,6 +602,9 @@
} else if (opt.equals("--pct-trackball")) {
int i = MonkeySourceRandom.FACTOR_TRACKBALL;
mFactors[i] = -nextOptionLong("trackball events percentage");
+ } else if (opt.equals("--pct-syskeys")) {
+ int i = MonkeySourceRandom.FACTOR_SYSOPS;
+ mFactors[i] = -nextOptionLong("system (key) operations percentage");
} else if (opt.equals("--pct-nav")) {
int i = MonkeySourceRandom.FACTOR_NAV;
mFactors[i] = -nextOptionLong("nav events percentage");
diff --git a/docs/howto_build_SDK.txt b/docs/howto_build_SDK.txt
index bb42fed..e09440b 100644
--- a/docs/howto_build_SDK.txt
+++ b/docs/howto_build_SDK.txt
@@ -81,6 +81,7 @@
$ cd ~/my-android-git
$ . build/envsetup.sh
+ $ lunch sdk-eng
$ make sdk
This will take a while, maybe between 20 minutes and several hours depending on
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index 7c84433..1177cde 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -64,32 +64,32 @@
<classpathentry kind="src" path="development/samples/Snake/src"/>
<classpathentry kind="src" path="development/samples/Snake/tests/src"/>
<classpathentry kind="src" path="development/apps/Term/src"/>
- <classpathentry kind="src" path="dalvik/libcore/annotation/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/archive/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/auth/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/awt-kernel/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/concurrent/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/crypto/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/dalvik/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/icu/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/json/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/junit/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/logging/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/luni-kernel/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/luni/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/math/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/nio_char/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/nio/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/openssl/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/prefs/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/regex/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/security-kernel/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/security/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/sql/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/suncompat/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/text/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/x-net/src/main/java"/>
- <classpathentry kind="src" path="dalvik/libcore/xml/src/main/java"/>
+ <classpathentry kind="src" path="libcore/annotation/src/main/java"/>
+ <classpathentry kind="src" path="libcore/archive/src/main/java"/>
+ <classpathentry kind="src" path="libcore/auth/src/main/java"/>
+ <classpathentry kind="src" path="libcore/awt-kernel/src/main/java"/>
+ <classpathentry kind="src" path="libcore/concurrent/src/main/java"/>
+ <classpathentry kind="src" path="libcore/crypto/src/main/java"/>
+ <classpathentry kind="src" path="libcore/dalvik/src/main/java"/>
+ <classpathentry kind="src" path="libcore/icu/src/main/java"/>
+ <classpathentry kind="src" path="libcore/json/src/main/java"/>
+ <classpathentry kind="src" path="libcore/junit/src/main/java"/>
+ <classpathentry kind="src" path="libcore/logging/src/main/java"/>
+ <classpathentry kind="src" path="libcore/luni-kernel/src/main/java"/>
+ <classpathentry kind="src" path="libcore/luni/src/main/java"/>
+ <classpathentry kind="src" path="libcore/math/src/main/java"/>
+ <classpathentry kind="src" path="libcore/nio_char/src/main/java"/>
+ <classpathentry kind="src" path="libcore/nio/src/main/java"/>
+ <classpathentry kind="src" path="libcore/openssl/src/main/java"/>
+ <classpathentry kind="src" path="libcore/prefs/src/main/java"/>
+ <classpathentry kind="src" path="libcore/regex/src/main/java"/>
+ <classpathentry kind="src" path="libcore/security-kernel/src/main/java"/>
+ <classpathentry kind="src" path="libcore/security/src/main/java"/>
+ <classpathentry kind="src" path="libcore/sql/src/main/java"/>
+ <classpathentry kind="src" path="libcore/suncompat/src/main/java"/>
+ <classpathentry kind="src" path="libcore/text/src/main/java"/>
+ <classpathentry kind="src" path="libcore/x-net/src/main/java"/>
+ <classpathentry kind="src" path="libcore/xml/src/main/java"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/Browser_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/Email_intermediates/src/src"/>
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java b/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
index 38e69d0..a52b01b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
@@ -101,7 +101,7 @@
mContainer.startAnimation(rotation);
}
- public void onItemClick(AdapterView parent, View v, int position, long id) {
+ public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
// Pre-load the image then start the animation
mImageView.setImageResource(PHOTOS_RESOURCES[position]);
applyRotation(position, 0, 90);
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java b/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
index 0ef79b3..6714175 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
@@ -30,7 +30,7 @@
import android.widget.Button;
import android.widget.Toast;
import android.database.Cursor;
-import android.provider.Contacts;
+import android.provider.ContactsContract;
import com.example.android.apis.R;
@@ -135,13 +135,15 @@
mProgressDialog.setTitle(R.string.select_dialog);
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
mProgressDialog.setMax(MAX_PROGRESS);
- mProgressDialog.setButton(getText(R.string.alert_dialog_hide), new DialogInterface.OnClickListener() {
+ mProgressDialog.setButton(DialogInterface.BUTTON_POSITIVE,
+ getText(R.string.alert_dialog_hide), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
/* User clicked Yes so do some stuff */
}
});
- mProgressDialog.setButton2(getText(R.string.alert_dialog_cancel), new DialogInterface.OnClickListener() {
+ mProgressDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
+ getText(R.string.alert_dialog_cancel), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
/* User clicked No so do some stuff */
@@ -184,13 +186,15 @@
/* User clicked on a check box do some stuff */
}
})
- .setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
+ .setPositiveButton(R.string.alert_dialog_ok,
+ new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
/* User clicked Yes so do some stuff */
}
})
- .setNegativeButton(R.string.alert_dialog_cancel, new DialogInterface.OnClickListener() {
+ .setNegativeButton(R.string.alert_dialog_cancel,
+ new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
/* User clicked No so do some stuff */
@@ -199,17 +203,18 @@
.create();
case DIALOG_MULTIPLE_CHOICE_CURSOR:
String[] projection = new String[] {
- Contacts.People._ID,
- Contacts.People.NAME,
- Contacts.People.SEND_TO_VOICEMAIL
+ ContactsContract.Contacts._ID,
+ ContactsContract.Contacts.DISPLAY_NAME,
+ ContactsContract.Contacts.SEND_TO_VOICEMAIL
};
- Cursor cursor = managedQuery(Contacts.People.CONTENT_URI, projection, null, null, null);
+ Cursor cursor = managedQuery(ContactsContract.Contacts.CONTENT_URI,
+ projection, null, null, null);
return new AlertDialog.Builder(AlertDialogSamples.this)
.setIcon(R.drawable.ic_popup_reminder)
.setTitle(R.string.alert_dialog_multi_choice_cursor)
.setMultiChoiceItems(cursor,
- Contacts.People.SEND_TO_VOICEMAIL,
- Contacts.People.NAME,
+ ContactsContract.Contacts.SEND_TO_VOICEMAIL,
+ ContactsContract.Contacts.DISPLAY_NAME,
new DialogInterface.OnMultiChoiceClickListener() {
public void onClick(DialogInterface dialog, int whichButton,
boolean isChecked) {
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java b/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
index dcb8b83..e34f4cf 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
@@ -20,14 +20,11 @@
import android.app.Instrumentation;
import android.content.Intent;
import android.content.IntentFilter;
-import android.os.IBinder;
import android.view.KeyEvent;
-import android.provider.Contacts;
+import android.provider.ContactsContract;
import android.os.Bundle;
import android.util.Log;
-import java.util.Map;
-
/**
* This is an example implementation of the {@link android.app.Instrumentation}
* class, allowing you to run tests against application code. The
@@ -61,7 +58,7 @@
// Monitor for the expected start activity call.
ActivityMonitor am = addMonitor(IntentFilter.create(
- Intent.ACTION_VIEW, Contacts.People.CONTENT_ITEM_TYPE), null, true);
+ Intent.ACTION_VIEW, ContactsContract.Contacts.CONTENT_ITEM_TYPE), null, true);
// We are going to enqueue a couple key events to simulate the user
// selecting an item in the list.
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java b/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
index 97f6199..9b911cc 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
@@ -174,7 +174,7 @@
// Send the notification.
// We use a layout id because it is a unique number. We use it later to cancel.
- mNotificationManager.notify(R.layout.status_bar_notifications, notification);
+ mNotificationManager.notify(MOOD_NOTIFICATIONS, notification);
}
private void setMoodView(int moodId, int textId) {
@@ -202,7 +202,7 @@
// we use a string id because is a unique number. we use it later to cancel the
// notification
- mNotificationManager.notify(R.layout.status_bar_notifications, notif);
+ mNotificationManager.notify(MOOD_NOTIFICATIONS, notif);
}
private void setDefault(int defaults) {
@@ -231,8 +231,8 @@
notification.defaults = defaults;
mNotificationManager.notify(
- R.layout.status_bar_notifications, // we use a string id because it is a unique
- // number. we use it later to cancel the
- notification); // notification
+ MOOD_NOTIFICATIONS, // we use a string id because it is a unique
+ // number. we use it later to cancel the notification
+ notification);
}
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java b/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
index 5f8874c..e2cd1ca 100644
--- a/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
+++ b/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
@@ -22,7 +22,6 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import android.widget.EditText;
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java b/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
index d2a9907..d3b0981 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
@@ -16,15 +16,13 @@
package com.example.android.apis.graphics;
-import android.app.Activity;
import android.content.Context;
import android.graphics.*;
-import android.hardware.SensorListener;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
import android.util.Config;
import android.util.Log;
import android.view.View;
@@ -33,23 +31,22 @@
private static final String TAG = "Compass";
- private SensorManager mSensorManager;
+ private SensorManager mSensorManager;
+ private Sensor mSensor;
private SampleView mView;
private float[] mValues;
- private final SensorListener mListener = new SensorListener() {
-
- public void onSensorChanged(int sensor, float[] values) {
- if (Config.LOGD) Log.d(TAG, "sensorChanged (" + values[0] + ", " + values[1] + ", " + values[2] + ")");
- mValues = values;
+ private final SensorEventListener mListener = new SensorEventListener() {
+ public void onSensorChanged(SensorEvent event) {
+ if (Config.LOGD) Log.d(TAG,
+ "sensorChanged (" + event.values[0] + ", " + event.values[1] + ", " + event.values[2] + ")");
+ mValues = event.values;
if (mView != null) {
mView.invalidate();
}
}
- public void onAccuracyChanged(int sensor, int accuracy) {
- // TODO Auto-generated method stub
-
+ public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
};
@@ -57,6 +54,7 @@
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
+ mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
mView = new SampleView(this);
setContentView(mView);
}
@@ -66,9 +64,9 @@
{
if (Config.LOGD) Log.d(TAG, "onResume");
super.onResume();
- mSensorManager.registerListener(mListener,
- SensorManager.SENSOR_ORIENTATION,
- SensorManager.SENSOR_DELAY_GAME);
+
+ mSensorManager.registerListener(mListener, mSensor,
+ SensorManager.SENSOR_DELAY_GAME);
}
@Override
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java b/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
index ed5b5ae..87e0461 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
@@ -16,22 +16,21 @@
package com.example.android.apis.graphics;
-import android.app.Activity;
import android.content.Context;
import android.graphics.*;
-import android.hardware.SensorListener;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
import android.util.Config;
-import android.util.Log;
import android.view.View;
public class SensorTest extends GraphicsActivity {
+ private final String TAG = "SensorTest";
- private SensorManager mSensorManager;
+ private SensorManager mSensorManager;
+ private Sensor mSensor;
private SampleView mView;
private float[] mValues;
@@ -76,29 +75,31 @@
}
};
- private final SensorListener mListener = new SensorListener() {
+ private final SensorEventListener mListener = new SensorEventListener() {
private final float[] mScale = new float[] { 2, 2.5f, 0.5f }; // accel
-
private float[] mPrev = new float[3];
-
- public void onSensorChanged(int sensor, float[] values) {
+ private long mLastGestureTime;
+
+ public void onSensorChanged(SensorEvent event) {
boolean show = false;
float[] diff = new float[3];
for (int i = 0; i < 3; i++) {
- diff[i] = Math.round(mScale[i] * (values[i] - mPrev[i]) * 0.45f);
+ diff[i] = Math.round(mScale[i] * (event.values[i] - mPrev[i]) * 0.45f);
if (Math.abs(diff[i]) > 0) {
show = true;
}
- mPrev[i] = values[i];
+ mPrev[i] = event.values[i];
}
if (show) {
// only shows if we think the delta is big enough, in an attempt
// to detect "serious" moves left/right or up/down
- android.util.Log.e("test", "sensorChanged " + sensor + " (" + values[0] + ", " + values[1] + ", " + values[2] + ")"
- + " diff(" + diff[0] + " " + diff[1] + " " + diff[2] + ")");
+ android.util.Log.e(TAG, "sensorChanged " + event.sensor.getName() +
+ " (" + event.values[0] + ", " + event.values[1] + ", " +
+ event.values[2] + ")" + " diff(" + diff[0] +
+ " " + diff[1] + " " + diff[2] + ")");
}
long now = android.os.SystemClock.uptimeMillis();
@@ -128,12 +129,8 @@
}
}
}
-
- private long mLastGestureTime;
- public void onAccuracyChanged(int sensor, int accuracy) {
- // TODO Auto-generated method stub
-
+ public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
};
@@ -141,28 +138,24 @@
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
+ mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
mView = new SampleView(this);
setContentView(mView);
-// android.util.Log.d("skia", "create " + mSensorManager);
+ if (Config.LOGD) android.util.Log.d(TAG, "create " + mSensorManager);
}
@Override
protected void onResume() {
super.onResume();
-
- int mask = 0;
-// mask |= SensorManager.SENSOR_ORIENTATION;
- mask |= SensorManager.SENSOR_ACCELEROMETER;
-
- mSensorManager.registerListener(mListener, mask, SensorManager.SENSOR_DELAY_FASTEST);
-// android.util.Log.d("skia", "resume " + mSensorManager);
+ mSensorManager.registerListener(mListener, mSensor, SensorManager.SENSOR_DELAY_FASTEST);
+ if (Config.LOGD) android.util.Log.d(TAG, "resume " + mSensorManager);
}
@Override
protected void onStop() {
mSensorManager.unregisterListener(mListener);
super.onStop();
-// android.util.Log.d("skia", "stop " + mSensorManager);
+ if (Config.LOGD) android.util.Log.d(TAG, "stop " + mSensorManager);
}
private class SampleView extends View {
@@ -182,7 +175,8 @@
mPath.close();
}
- @Override protected void onDraw(Canvas canvas) {
+ @Override
+ protected void onDraw(Canvas canvas) {
Paint paint = mPaint;
canvas.drawColor(Color.WHITE);
@@ -216,4 +210,3 @@
}
}
}
-
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
index e01d6ef..551f7d2 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
@@ -23,7 +23,6 @@
import java.nio.FloatBuffer;
import java.nio.ShortBuffer;
-import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
diff --git a/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java b/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
index dafa192..b8ae074 100644
--- a/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
+++ b/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
@@ -49,14 +49,9 @@
*/
public class MorseCode extends Activity
{
- /** Tag string for our debug logs */
- private static final String TAG = "MorseCode";
-
/** Our text view */
private TextView mTextView;
- ;
-
/**
* Initialization of the Activity after it is first created. Must at least
* call {@link android.app.Activity#setContentView setContentView()} to
diff --git a/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java b/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
index 910961d..9863222 100644
--- a/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
+++ b/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
@@ -20,9 +20,10 @@
import android.content.Context;
import android.os.Bundle;
import android.view.View;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
-import android.hardware.SensorListener;
-import android.util.Log;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -47,13 +48,10 @@
* </table>
*/
public class Sensors extends Activity {
- /** Tag string for our debug logs */
- private static final String TAG = "Sensors";
-
private SensorManager mSensorManager;
private GraphView mGraphView;
- private class GraphView extends View implements SensorListener
+ private class GraphView extends View implements SensorEventListener
{
private Bitmap mBitmap;
private Paint mPaint = new Paint();
@@ -172,29 +170,29 @@
}
}
- public void onSensorChanged(int sensor, float[] values) {
+ public void onSensorChanged(SensorEvent event) {
//Log.d(TAG, "sensor: " + sensor + ", x: " + values[0] + ", y: " + values[1] + ", z: " + values[2]);
synchronized (this) {
if (mBitmap != null) {
final Canvas canvas = mCanvas;
final Paint paint = mPaint;
- if (sensor == SensorManager.SENSOR_ORIENTATION) {
+ if (event.sensor.getType() == Sensor.TYPE_ORIENTATION) {
for (int i=0 ; i<3 ; i++) {
- mOrientationValues[i] = values[i];
+ mOrientationValues[i] = event.values[i];
}
} else {
float deltaX = mSpeed;
float newX = mLastX + deltaX;
- int j = (sensor == SensorManager.SENSOR_MAGNETIC_FIELD) ? 1 : 0;
+ int j = (event.sensor.getType() == Sensor.TYPE_MAGNETIC_FIELD) ? 1 : 0;
for (int i=0 ; i<3 ; i++) {
int k = i+j*3;
- final float v = mYOffset + values[i] * mScale[j];
+ final float v = mYOffset + event.values[i] * mScale[j];
paint.setColor(mColors[k]);
canvas.drawLine(mLastX, mLastValues[k], newX, v, paint);
mLastValues[k] = v;
}
- if (sensor == SensorManager.SENSOR_MAGNETIC_FIELD)
+ if (event.sensor.getType() == Sensor.TYPE_MAGNETIC_FIELD)
mLastX += mSpeed;
}
invalidate();
@@ -202,9 +200,7 @@
}
}
- public void onAccuracyChanged(int sensor, int accuracy) {
- // TODO Auto-generated method stub
-
+ public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
}
@@ -226,10 +222,14 @@
@Override
protected void onResume() {
super.onResume();
+ mSensorManager.registerListener(mGraphView,
+ mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+ SensorManager.SENSOR_DELAY_FASTEST);
+ mSensorManager.registerListener(mGraphView,
+ mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD),
+ SensorManager.SENSOR_DELAY_FASTEST);
mSensorManager.registerListener(mGraphView,
- SensorManager.SENSOR_ACCELEROMETER |
- SensorManager.SENSOR_MAGNETIC_FIELD |
- SensorManager.SENSOR_ORIENTATION,
+ mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION),
SensorManager.SENSOR_DELAY_FASTEST);
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java b/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
index c78b54b..09957c5 100644
--- a/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
+++ b/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
@@ -20,13 +20,9 @@
import android.content.Context;
import android.text.method.ScrollingMovementMethod;
import android.text.method.MovementMethod;
-import android.text.method.KeyListener;
-import android.text.method.TransformationMethod;
import android.text.Editable;
import android.util.AttributeSet;
-import java.util.Map;
-
/**
* This is a TextView that is Editable and by default scrollable,
* like EditText without a cursor.
