summaryrefslogtreecommitdiff
path: root/core/java/android/app/Dialog.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-09-23 16:21:30 -0700
committerAdam Powell <adamp@google.com>2010-09-27 17:10:30 -0700
commitc63806d852a550d82bbe6cadff8a2139d78ed559 (patch)
tree7f8edea1998fc5b388e69ab30a390282ef7dba5e /core/java/android/app/Dialog.java
parent1beeab70a22c1d880b9aa7dfba09ef1d4203a37d (diff)
Holo themes and assets in progress
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
Diffstat (limited to 'core/java/android/app/Dialog.java')
-rw-r--r--core/java/android/app/Dialog.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index a0be0cde1f5d..04735bfa4d82 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -25,6 +25,7 @@ import android.content.ContextWrapper;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -140,7 +141,10 @@ public class Dialog implements DialogInterface, Window.Callback,
*/
public Dialog(Context context, int theme) {
mContext = new ContextThemeWrapper(
- context, theme == 0 ? com.android.internal.R.style.Theme_Dialog : theme);
+ context, theme == 0 ?
+ (context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB
+ ? com.android.internal.R.style.Theme_Holo_Dialog
+ : com.android.internal.R.style.Theme_Dialog) : theme);
mWindowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
Window w = PolicyManager.makeNewWindow(mContext);
mWindow = w;