Added AlertDialog.Builder#getContext
Change-Id: Ic3033a4eff67f507aa39dacfc4c8984a9ee142c1
diff --git a/api/current.xml b/api/current.xml
index 2c41aeb..9578301 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -26685,6 +26685,17 @@
visibility="public"
>
</method>
+<method name="getContext"
+ return="android.content.Context"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="setAdapter"
return="android.app.AlertDialog.Builder"
abstract="false"
@@ -305890,7 +305901,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="x" type="java.sql.Blob">
+<parameter name="blob" type="java.sql.Blob">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -306049,7 +306060,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="x" type="java.sql.Clob">
+<parameter name="clob" type="java.sql.Clob">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -306187,7 +306198,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="value" type="java.io.Reader">
+<parameter name="reader" type="java.io.Reader">
</parameter>
<parameter name="length" type="long">
</parameter>
@@ -306223,7 +306234,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="value" type="java.sql.NClob">
+<parameter name="nclob" type="java.sql.NClob">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -306276,7 +306287,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="value" type="java.lang.String">
+<parameter name="string" type="java.lang.String">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -306386,7 +306397,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="x" type="java.sql.RowId">
+<parameter name="rowId" type="java.sql.RowId">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -306403,7 +306414,7 @@
>
<parameter name="parameterName" type="java.lang.String">
</parameter>
-<parameter name="xmlObject" type="java.sql.SQLXML">
+<parameter name="sqlXml" type="java.sql.SQLXML">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -311539,7 +311550,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="x" type="java.io.InputStream">
+<parameter name="inputStream" type="java.io.InputStream">
</parameter>
<parameter name="length" type="long">
</parameter>
@@ -311558,7 +311569,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="x" type="java.io.InputStream">
+<parameter name="inputStream" type="java.io.InputStream">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -311611,7 +311622,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="x" type="java.io.InputStream">
+<parameter name="inputStream" type="java.io.InputStream">
</parameter>
<parameter name="length" type="long">
</parameter>
@@ -311630,7 +311641,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="x" type="java.io.InputStream">
+<parameter name="inputStream" type="java.io.InputStream">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -311963,7 +311974,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="value" type="java.io.Reader">
+<parameter name="reader" type="java.io.Reader">
</parameter>
<parameter name="length" type="long">
</parameter>
@@ -311982,7 +311993,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="value" type="java.io.Reader">
+<parameter name="reader" type="java.io.Reader">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -312052,7 +312063,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="value" type="java.lang.String">
+<parameter name="theString" type="java.lang.String">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -312179,7 +312190,7 @@
>
<parameter name="parameterIndex" type="int">
</parameter>
-<parameter name="x" type="java.sql.RowId">
+<parameter name="theRowId" type="java.sql.RowId">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -315173,7 +315184,7 @@
>
<parameter name="columnIndex" type="int">
</parameter>
-<parameter name="x" type="java.sql.RowId">
+<parameter name="value" type="java.sql.RowId">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -315190,7 +315201,7 @@
>
<parameter name="columnLabel" type="java.lang.String">
</parameter>
-<parameter name="x" type="java.sql.RowId">
+<parameter name="value" type="java.sql.RowId">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -317522,7 +317533,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="x" type="java.sql.NClob">
+<parameter name="theNClob" type="java.sql.NClob">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -317537,7 +317548,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="x" type="java.lang.String">
+<parameter name="theString" type="java.lang.String">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -317582,7 +317593,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="x" type="java.sql.RowId">
+<parameter name="theRowId" type="java.sql.RowId">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
@@ -317597,7 +317608,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="x" type="java.sql.SQLXML">
+<parameter name="theXml" type="java.sql.SQLXML">
</parameter>
<exception name="SQLException" type="java.sql.SQLException">
</exception>
diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index 92cedc4..f0477e5 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -16,6 +16,8 @@
package android.app;
+import com.android.internal.app.AlertController;
+
import android.content.Context;
import android.content.DialogInterface;
import android.database.Cursor;
@@ -23,6 +25,7 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Message;
+import android.view.ContextThemeWrapper;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager;
@@ -31,8 +34,6 @@
import android.widget.ListAdapter;
import android.widget.ListView;
-import com.android.internal.app.AlertController;
-
/**
* A subclass of Dialog that can display one, two or three buttons. If you only want to
* display a String in this dialog box, use the setMessage() method. If you
@@ -273,6 +274,7 @@
public static class Builder {
private final AlertController.AlertParams P;
private int mTheme;
+ private Context mWrappedContext;
/**
* Constructor using a context for this builder and the {@link AlertDialog} it creates.
@@ -294,6 +296,21 @@
}
/**
+ * Returns a {@link Context} with the appropriate theme for dialogs created by this Builder.
+ * Applications should use this Context for obtaining LayoutInflaters for inflating views
+ * that will be used in the resulting dialogs, as it will cause views to be inflated with
+ * the correct theme.
+ *
+ * @return A Context for built Dialogs.
+ */
+ public Context getContext() {
+ if (mWrappedContext == null) {
+ mWrappedContext = new ContextThemeWrapper(P.mContext, mTheme);
+ }
+ return mWrappedContext;
+ }
+
+ /**
* Set the title using the given resource id.
*
* @return This Builder object to allow for chaining of calls to set methods
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 04735bf..a178c04 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -177,7 +177,7 @@
/**
* Retrieve the Context this Dialog is running in.
*
- * @return Context The Context that was supplied to the constructor.
+ * @return Context The Context used by the Dialog.
*/
public final Context getContext() {
return mContext;