summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-08-11 19:34:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-11 19:34:27 +0000
commit105febd2cfb4760926ed0aef3c24be3727dd36e4 (patch)
treeb8bb86806d86de7543323e3bd8c8cc2a9b212057 /core
parent11104791c71e0140f1d37b711ca929939a85b77c (diff)
parent93d9e26ffbbb6780dd2473cc395ae0a3481b4fd4 (diff)
downloadframeworks_base-105febd2cfb4760926ed0aef3c24be3727dd36e4.zip
frameworks_base-105febd2cfb4760926ed0aef3c24be3727dd36e4.tar.gz
frameworks_base-105febd2cfb4760926ed0aef3c24be3727dd36e4.tar.bz2
Merge "Don't re-wrap alert dialog context" into mnc-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/AlertDialog.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index abe12dc..7824072 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -1082,7 +1082,8 @@ public class AlertDialog extends Dialog implements DialogInterface {
* create and display the dialog.
*/
public AlertDialog create() {
- final AlertDialog dialog = new AlertDialog(P.mContext);
+ // Context has already been wrapped with the appropriate theme.
+ final AlertDialog dialog = new AlertDialog(P.mContext, 0, false);
P.apply(dialog.mAlert);
dialog.setCancelable(P.mCancelable);
if (P.mCancelable) {