Merge "Clean up to no longer use old APIs, add new loader throttle sample." into honeycomb
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 057e20c..2c6b654 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
@@ -77,7 +77,7 @@
switch (id) {
case DIALOG_YES_NO_MESSAGE:
return new AlertDialog.Builder(AlertDialogSamples.this)
- .setIcon(R.drawable.alert_dialog_icon)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.alert_dialog_two_buttons_title)
.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
@@ -94,7 +94,7 @@
.create();
case DIALOG_YES_NO_LONG_MESSAGE:
return new AlertDialog.Builder(AlertDialogSamples.this)
- .setIcon(R.drawable.alert_dialog_icon)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.alert_dialog_two_buttons_msg)
.setMessage(R.string.alert_dialog_two_buttons2_msg)
.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
@@ -118,7 +118,7 @@
.create();
case DIALOG_YES_NO_ULTRA_LONG_MESSAGE:
return new AlertDialog.Builder(AlertDialogSamples.this)
- .setIcon(R.drawable.alert_dialog_icon)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.alert_dialog_two_buttons_msg)
.setMessage(R.string.alert_dialog_two_buttons2ultra_msg)
.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
@@ -156,7 +156,7 @@
.create();
case DIALOG_PROGRESS:
mProgressDialog = new ProgressDialog(AlertDialogSamples.this);
- mProgressDialog.setIcon(R.drawable.alert_dialog_icon);
+ mProgressDialog.setIconAttribute(android.R.attr.alertDialogIcon);
mProgressDialog.setTitle(R.string.select_dialog);
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
mProgressDialog.setMax(MAX_PROGRESS);
@@ -177,7 +177,7 @@
return mProgressDialog;
case DIALOG_SINGLE_CHOICE:
return new AlertDialog.Builder(AlertDialogSamples.this)
- .setIcon(R.drawable.alert_dialog_icon)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.alert_dialog_single_choice)
.setSingleChoiceItems(R.array.select_dialog_items2, 0, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
@@ -254,7 +254,7 @@
LayoutInflater factory = LayoutInflater.from(this);
final View textEntryView = factory.inflate(R.layout.alert_dialog_text_entry, null);
return new AlertDialog.Builder(AlertDialogSamples.this)
- .setIcon(R.drawable.alert_dialog_icon)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.alert_dialog_text_entry)
.setView(textEntryView)
.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java b/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java
index b715ba1..6d6e758 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java
@@ -52,7 +52,7 @@
CharSequence mLegend;
static final int ANR_NONE = 0;
- static final int ANR_THUMBNAIL = 1;
+ static final int ANR_SHADOW = 1;
static final int ANR_DROP = 2;
void sleepSixSeconds() {
@@ -63,21 +63,21 @@
} while (SystemClock.uptimeMillis() < start + 6000);
}
- // Thumbnail builder that can ANR if desired
- class ANRThumbBuilder extends DragThumbnailBuilder {
+ // Shadow builder that can ANR if desired
+ class ANRShadowBuilder extends DragShadowBuilder {
boolean mDoAnr;
- public ANRThumbBuilder(View view, boolean doAnr) {
+ public ANRShadowBuilder(View view, boolean doAnr) {
super(view);
mDoAnr = doAnr;
}
@Override
- public void onDrawThumbnail(Canvas canvas) {
+ public void onDrawShadow(Canvas canvas) {
if (mDoAnr) {
sleepSixSeconds();
}
- super.onDrawThumbnail(canvas);
+ super.onDrawShadow(canvas);
}
}
@@ -136,7 +136,7 @@
setOnLongClickListener(new View.OnLongClickListener() {
public boolean onLongClick(View v) {
ClipData data = ClipData.newPlainText("dot", null, "Dot : " + v.toString());
- v.startDrag(data, new ANRThumbBuilder(v, mAnrType == ANR_THUMBNAIL),
+ v.startDrag(data, new ANRShadowBuilder(v, mAnrType == ANR_SHADOW),
mLocalOnly, (Object)v);
return true;
}
diff --git a/tools/emulator/skins/WXGA/hardware.ini b/tools/emulator/skins/WXGA/hardware.ini
index 6934dd3..da9ef78 100755
--- a/tools/emulator/skins/WXGA/hardware.ini
+++ b/tools/emulator/skins/WXGA/hardware.ini
@@ -1,4 +1,4 @@
# skin-specific hardware values
hw.lcd.density=160
-vm.heapSize=24
+vm.heapSize=48
hw.ramSize=256
