Code drop from //branches/cupcake/...@124589

1 files changed, 11 insertions, 2 deletions

diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java
index 3eb65e2..666efae 100644
--- a/core/java/android/preference/DialogPreference.java
+++ b/core/java/android/preference/DialogPreference.java
@@ -34,7 +34,7 @@ import android.view.View;
 import android.widget.TextView;
 
 /**
- * The {@link DialogPreference} class is a base class for preferences that are
+ * A base class for {@link Preference} objects that are
  * dialog-based. These preferences will, when clicked, open a dialog showing the
  * actual preference controls.
  * 
@@ -356,7 +356,7 @@ public abstract class DialogPreference extends Preference implements
         getPreferenceManager().unregisterOnActivityDestroyListener(this);
         
         mDialog = null;
-        onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON1);
+        onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON_POSITIVE);
     }
 
     /**
@@ -370,6 +370,15 @@ public abstract class DialogPreference extends Preference implements
     }
 
     /**
+     * Gets the dialog that is shown by this preference.
+     * 
+     * @return The dialog, or null if a dialog is not being shown.
+     */
+    public Dialog getDialog() {
+        return mDialog;
+    }
+
+    /**
      * {@inheritDoc}
      */
     public void onActivityDestroy() {