Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Holo fixes and refinements"

Browse Source
This commit is contained in:
Adam Powell
2010-10-12 18:49:08 -07:00
committed by Android (Google) Code Review
parent 63eadbce77 ccb013ffac
commit 4388ecbf94
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/AlertDialog.java
View File

@@ -277,7 +277,6 @@ public class AlertDialog extends Dialog implements DialogInterface {
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.
@@ -291,7 +290,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
* the {@link AlertDialog} it creates.
*/
public Builder(Context context, int theme) {
P = new AlertController.AlertParams(context);
P = new AlertController.AlertParams(new ContextThemeWrapper(context, theme));
mTheme = theme;
}
@@ -304,10 +303,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
* @return A Context for built Dialogs.
*/
public Context getContext() {
if (mWrappedContext == null) {
mWrappedContext = new ContextThemeWrapper(P.mContext, mTheme);
}
return mWrappedContext;
return P.mContext;
}
/**