From 165b906aa57dd9ffe6fc639337df548e536397ca Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <FireFart@gmail.com>
Date: Sun, 16 May 2010 22:46:34 +0200
Subject: [PATCH 1/2] Removed Duplicate Build Paths

Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
---
 ide/eclipse/.classpath | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index b1ec9ba9b..c04fa6b3c 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -45,7 +45,6 @@
 	<classpathentry kind="src" path="frameworks/base/telephony/java"/>
 	<classpathentry kind="src" path="frameworks/base/test-runner"/>
 	<classpathentry kind="src" path="frameworks/base/tts/java"/>
-	<classpathentry kind="src" path="frameworks/base/vpn/java"/>
 	<classpathentry kind="src" path="frameworks/base/wifi/java"/>
 	<classpathentry kind="src" path="frameworks/base/vpn/java"/>
 	<classpathentry kind="src" path="frameworks/policies/base/phone"/>
@@ -100,7 +99,6 @@
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java"/>
-	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java"/>
 	<classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn/java"/>
 	<classpathentry kind="src" path="out/target/common/R"/>

From b88f42b3618a688ad395b3de14b1e54cefdeff60 Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <FireFart@gmail.com>
Date: Mon, 17 May 2010 20:36:01 +0200
Subject: [PATCH 2/2] Removed Calls to deprecated API

Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
---
 .../com/example/android/apis/app/AlertDialogSamples.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 0ef79b3a6..de5f7112b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
@@ -135,13 +135,15 @@ public class AlertDialogSamples extends Activity {
             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 */