Merge commit 'themes/themes-eclair-regression' into themes-eclair (6d0e558b) · Commits · e / os / android_frameworks_base

api/current.xml

+0 −649

Original line number	Diff line number	Diff line
		@@ -1758,17 +1758,6 @@
		visibility="public"
		>
		</field>
		<field name="alertDialogTheme"
		type="int"
		transient="false"
		volatile="false"
		value="16843459"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="allowBackup"
		type="int"
		transient="false"
		@@ -2143,17 +2132,6 @@
		visibility="public"
		>
		</field>
		<field name="bottomLeftStrip"
		type="int"
		transient="false"
		volatile="false"
		value="16843462"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="bottomMedium"
		type="int"
		transient="false"
		@@ -2187,17 +2165,6 @@
		visibility="public"
		>
		</field>
		<field name="bottomRightStrip"
		type="int"
		transient="false"
		volatile="false"
		value="16843463"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="bufferType"
		type="int"
		transient="false"
		@@ -2253,28 +2220,6 @@
		visibility="public"
		>
		</field>
		<field name="buttonStyleTimePickerDown"
		type="int"
		transient="false"
		volatile="false"
		value="16843468"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="buttonStyleTimePickerUp"
		type="int"
		transient="false"
		volatile="false"
		value="16843467"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="buttonStyleToggle"
		type="int"
		transient="false"
		@@ -2671,28 +2616,6 @@
		visibility="public"
		>
		</field>
		<field name="com_android_server_status_expandedView"
		type="int"
		transient="false"
		volatile="false"
		value="16843472"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="com_android_server_status_latestItemView"
		type="int"
		transient="false"
		volatile="false"
		value="16843473"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="completionHint"
		type="int"
		transient="false"
		@@ -3012,17 +2935,6 @@
		visibility="public"
		>
		</field>
		<field name="dialogTheme"
		type="int"
		transient="false"
		volatile="false"
		value="16843458"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="dialogTitle"
		type="int"
		transient="false"
		@@ -3551,17 +3463,6 @@
		visibility="public"
		>
		</field>
		<field name="expandedMenuTheme"
		type="int"
		transient="false"
		volatile="false"
		value="16843470"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="exported"
		type="int"
		transient="false"
		@@ -4266,17 +4167,6 @@
		visibility="public"
		>
		</field>
		<field name="iconMenuTheme"
		type="int"
		transient="false"
		volatile="false"
		value="16843471"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="iconPreview"
		type="int"
		transient="false"
		@@ -5421,28 +5311,6 @@
		visibility="public"
		>
		</field>
		<field name="listItemBackground"
		type="int"
		transient="false"
		volatile="false"
		value="16843457"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="listItemTextViewStyle"
		type="int"
		transient="false"
		volatile="false"
		value="16843461"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="listPreferredItemHeight"
		type="int"
		transient="false"
		@@ -5674,17 +5542,6 @@
		visibility="public"
		>
		</field>
		<field name="menuItemBackground"
		type="int"
		transient="false"
		volatile="false"
		value="16843469"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="mimeType"
		type="int"
		transient="false"
		@@ -7148,17 +7005,6 @@
		visibility="public"
		>
		</field>
		<field name="searchDialogTheme"
		type="int"
		transient="false"
		volatile="false"
		value="16843460"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="searchMode"
		type="int"
		transient="false"
		@@ -7918,17 +7764,6 @@
		visibility="public"
		>
		</field>
		<field name="tabIndicatorStyle"
		type="int"
		transient="false"
		volatile="false"
		value="16843464"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="tabWidgetStyle"
		type="int"
		transient="false"
		@@ -8248,17 +8083,6 @@
		visibility="public"
		>
		</field>
		<field name="textAppearanceTab"
		type="int"
		transient="false"
		volatile="false"
		value="16843465"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="textCheckMark"
		type="int"
		transient="false"
		@@ -8622,17 +8446,6 @@
		visibility="public"
		>
		</field>
		<field name="timePickerInputStyle"
		type="int"
		transient="false"
		volatile="false"
		value="16843466"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="tint"
		type="int"
		transient="false"
		@@ -12444,17 +12257,6 @@
		visibility="public"
		>
		</field>
		<field name="buy_ringtones"
		type="int"
		transient="false"
		volatile="false"
		value="17040171"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="cancel"
		type="int"
		transient="false"
		@@ -13297,28 +13099,6 @@
		visibility="public"
		>
		</field>
		<field name="TimePickerDownButton"
		type="int"
		transient="false"
		volatile="false"
		value="16973994"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TimePickerUpButton"
		type="int"
		transient="false"
		volatile="false"
		value="16973993"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget"
		type="int"
		transient="false"
		@@ -13473,17 +13253,6 @@
		visibility="public"
		>
		</field>
		<field name="Widget_EditText_TimePicker"
		type="int"
		transient="false"
		volatile="false"
		value="16973985"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_ExpandableListView"
		type="int"
		transient="false"
		@@ -13495,28 +13264,6 @@
		visibility="public"
		>
		</field>
		<field name="Widget_ExpandableListView_Dialog"
		type="int"
		transient="false"
		volatile="false"
		value="16973991"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_ExpandableListView_White"
		type="int"
		transient="false"
		volatile="false"
		value="16973990"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_Gallery"
		type="int"
		transient="false"
		@@ -13583,17 +13330,6 @@
		visibility="public"
		>
		</field>
		<field name="Widget_ListView_Dialog"
		type="int"
		transient="false"
		volatile="false"
		value="16973992"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_ListView_DropDown"
		type="int"
		transient="false"
		@@ -13759,17 +13495,6 @@
		visibility="public"
		>
		</field>
		<field name="Widget_TabIndicator"
		type="int"
		transient="false"
		volatile="false"
		value="16973984"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_TabWidget"
		type="int"
		transient="false"
		@@ -13792,28 +13517,6 @@
		visibility="public"
		>
		</field>
		<field name="Widget_TextView_ListItem"
		type="int"
		transient="false"
		volatile="false"
		value="16973988"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_TextView_ListItem_White"
		type="int"
		transient="false"
		volatile="false"
		value="16973989"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="Widget_TextView_PopupMenu"
		type="int"
		transient="false"
		@@ -13847,28 +13550,6 @@
		visibility="public"
		>
		</field>
		<field name="com_android_server_status_ExpandedView"
		type="int"
		transient="false"
		volatile="false"
		value="16973986"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="com_android_server_status_LatestItemView"
		type="int"
		transient="false"
		volatile="false"
		value="16973987"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="R.xml"
		extends="java.lang.Object"
		@@ -40151,17 +39832,6 @@
		visibility="public"
		>
		</field>
		<field name="PLUTO_ISTHEMEABLE_ATTRIBUTE_NAME"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""isThemeable""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="className"
		type="java.lang.String"
		transient="false"
		@@ -40350,234 +40020,6 @@
		</parameter>
		</method>
		</class>
		<class name="BaseThemeInfo"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.os.Parcelable">
		</implements>
		<constructor name="BaseThemeInfo"
		type="android.content.pm.BaseThemeInfo"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="protected"
		>
		</constructor>
		<constructor name="BaseThemeInfo"
		type="android.content.pm.BaseThemeInfo"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="protected"
		>
		<parameter name="source" type="android.os.Parcel">
		</parameter>
		</constructor>
		<method name="changeDrmFlagIfNeeded"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="protected"
		>
		<parameter name="resourcePath" type="java.lang.String">
		</parameter>
		</method>
		<method name="describeContents"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="dest" type="android.os.Parcel">
		</parameter>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<field name="author"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="copyright"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="favesAppImageName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="favesImageName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="name"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="notificationRingtoneFileName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="notificationRingtoneName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="preview"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ringtoneFileName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ringtoneName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="soundPackName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="styleResourceId"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="themeId"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="themeStyleName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="thumbnail"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="wallpaperImageName"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ComponentInfo"
		extends="android.content.pm.PackageItemInfo"
		abstract="false"
		@@ -41320,16 +40762,6 @@
		visibility="public"
		>
		</field>
		<field name="isThemeApk"
		type="boolean"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="packageName"
		type="java.lang.String"
		transient="false"
		@@ -41994,17 +41426,6 @@
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<method name="getInstalledThemePackages"
		return="java.util.List<android.content.pm.PackageInfo>"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getInstallerPackageName"
		return="java.lang.String"
		abstract="true"
		@@ -44050,76 +43471,6 @@
		>
		</field>
		</class>
		<class name="SoundsInfo"
		extends="android.content.pm.BaseThemeInfo"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="SoundsInfo"
		type="android.content.pm.SoundsInfo"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="parser" type="org.xmlpull.v1.XmlPullParser">
		</parameter>
		<parameter name="res" type="android.content.res.Resources">
		</parameter>
		<parameter name="attrs" type="android.util.AttributeSet">
		</parameter>
		<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">
		</exception>
		</constructor>
		<field name="CREATOR"
		type="android.os.Parcelable.Creator"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ThemeInfo"
		extends="android.content.pm.BaseThemeInfo"
		abstract="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="ThemeInfo"
		type="android.content.pm.ThemeInfo"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="parser" type="org.xmlpull.v1.XmlPullParser">
		</parameter>
		<parameter name="res" type="android.content.res.Resources">
		</parameter>
		<parameter name="attrs" type="android.util.AttributeSet">
		</parameter>
		<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">
		</exception>
		</constructor>
		<field name="CREATOR"
		type="android.os.Parcelable.Creator"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		</package>
		<package name="android.content.res"
		>

core/java/android/app/ActivityThread.java

+1 −12

Original line number	Diff line number	Diff line
		@@ -2494,19 +2494,8 @@ public final class ActivityThread {
		activity.mStartedActivity = false;
		int theme = r.activityInfo.getThemeResource();
		if (theme != 0) {
		// Following is a workaround to have those activity managed dialogs to be themed when the theme flag is on.
		if (r.activityInfo.isThemeable() && (theme == android.R.style.Theme_Dialog \|\|
		theme == com.android.internal.R.style.Theme_Dialog_Alert)) {
		if (theme == android.R.style.Theme_Dialog) {
		activity.setTheme(Dialog.resolveDefaultTheme(activity, 0, android.R.styleable.Theme_dialogTheme,
		com.android.internal.R.style.Theme_Dialog));
		} else if (theme == com.android.internal.R.style.Theme_Dialog_Alert) {
		activity.setTheme(AlertDialog.resolveDefaultTheme(activity, 0));
		}
		} else {
		activity.setTheme(theme);
		}
		}

		activity.mCalled = false;
		mInstrumentation.callActivityOnCreate(activity, r.state);

core/java/android/app/AlertDialog.java

+15 −23

Original line number	Diff line number	Diff line
		@@ -56,25 +56,19 @@ public class AlertDialog extends Dialog implements DialogInterface {
		private AlertController mAlert;

		protected AlertDialog(Context context) {
		this(context, 0);
		this(context, com.android.internal.R.style.Theme_Dialog_Alert);
		}

		protected AlertDialog(Context context, int theme) {
		super(context, resolveDefaultTheme(context, theme));
		mAlert = new AlertController(getContext(), this, getWindow());
		super(context, theme);
		mAlert = new AlertController(context, this, getWindow());
		}

		protected AlertDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
		super(context, resolveDefaultTheme(context, 0));
		super(context, com.android.internal.R.style.Theme_Dialog_Alert);
		setCancelable(cancelable);
		setOnCancelListener(cancelListener);
		mAlert = new AlertController(getContext(), this, getWindow());
		}

		static int resolveDefaultTheme(Context context, int theme) {
		return Dialog.resolveDefaultTheme(context, theme,
		android.R.styleable.Theme_alertDialogTheme,
		com.android.internal.R.style.Theme_Dialog_Alert);
		mAlert = new AlertController(context, this, getWindow());
		}

		/**
		@@ -270,15 +264,13 @@ public class AlertDialog extends Dialog implements DialogInterface {
		}

		public static class Builder {
		private final Context mContext;
		private final AlertController.AlertParams P;

		/**
		* Constructor using a context for this builder and the {@link AlertDialog} it creates.
		*/
		public Builder(Context context) {
		mContext = context;
		P = new AlertController.AlertParams();
		P = new AlertController.AlertParams(context);
		}

		/**
		@@ -287,7 +279,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		public Builder setTitle(int titleId) {
		P.mTitle = mContext.getText(titleId);
		P.mTitle = P.mContext.getText(titleId);
		return this;
		}

		@@ -323,7 +315,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		public Builder setMessage(int messageId) {
		P.mMessage = mContext.getText(messageId);
		P.mMessage = P.mContext.getText(messageId);
		return this;
		}

		@@ -365,7 +357,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		public Builder setPositiveButton(int textId, final OnClickListener listener) {
		P.mPositiveButtonText = mContext.getText(textId);
		P.mPositiveButtonText = P.mContext.getText(textId);
		P.mPositiveButtonListener = listener;
		return this;
		}
		@@ -391,7 +383,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		public Builder setNegativeButton(int textId, final OnClickListener listener) {
		P.mNegativeButtonText = mContext.getText(textId);
		P.mNegativeButtonText = P.mContext.getText(textId);
		P.mNegativeButtonListener = listener;
		return this;
		}
		@@ -417,7 +409,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		public Builder setNeutralButton(int textId, final OnClickListener listener) {
		P.mNeutralButtonText = mContext.getText(textId);
		P.mNeutralButtonText = P.mContext.getText(textId);
		P.mNeutralButtonListener = listener;
		return this;
		}
		@@ -473,7 +465,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		public Builder setItems(int itemsId, final OnClickListener listener) {
		P.mItems = mContext.getResources().getTextArray(itemsId);
		P.mItems = P.mContext.getResources().getTextArray(itemsId);
		P.mOnClickListener = listener;
		return this;
		}
		@@ -546,7 +538,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		*/
		public Builder setMultiChoiceItems(int itemsId, boolean[] checkedItems,
		final OnMultiChoiceClickListener listener) {
		P.mItems = mContext.getResources().getTextArray(itemsId);
		P.mItems = P.mContext.getResources().getTextArray(itemsId);
		P.mOnCheckboxClickListener = listener;
		P.mCheckedItems = checkedItems;
		P.mIsMultiChoice = true;
		@@ -625,7 +617,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		*/
		public Builder setSingleChoiceItems(int itemsId, int checkedItem,
		final OnClickListener listener) {
		P.mItems = mContext.getResources().getTextArray(itemsId);
		P.mItems = P.mContext.getResources().getTextArray(itemsId);
		P.mOnClickListener = listener;
		P.mCheckedItem = checkedItem;
		P.mIsSingleChoice = true;
		@@ -791,7 +783,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* to do and want this to be created and displayed.
		*/
		public AlertDialog create() {
		final AlertDialog dialog = new AlertDialog(mContext);
		final AlertDialog dialog = new AlertDialog(P.mContext);
		P.apply(dialog.mAlert);
		dialog.setCancelable(P.mCancelable);
		dialog.setOnCancelListener(P.mOnCancelListener);

core/java/android/app/DatePickerDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
		int year,
		int monthOfYear,
		int dayOfMonth) {
		this(context, 0,
		this(context, com.android.internal.R.style.Theme_Dialog_Alert,
		callBack, year, monthOfYear, dayOfMonth);
		}

core/java/android/app/Dialog.java

+2 −21

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.content.Context;
		import android.content.DialogInterface;
		import android.content.ComponentName;
		import android.content.ContextWrapper;
		import android.content.res.TypedArray;
		import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -135,9 +134,8 @@ public class Dialog implements DialogInterface, Window.Callback,
		* <var>context</var>. If 0, the default dialog theme will be used.
		*/
		public Dialog(Context context, int theme) {
		mContext = new ContextThemeWrapper(context,
		resolveDefaultTheme(context, theme, android.R.styleable.Theme_dialogTheme,
		com.android.internal.R.style.Theme_Dialog));
		mContext = new ContextThemeWrapper(
		context, theme == 0 ? com.android.internal.R.style.Theme_Dialog : theme);
		mWindowManager = (WindowManager)context.getSystemService("window");
		Window w = PolicyManager.makeNewWindow(mContext);
		mWindow = w;
		@@ -148,23 +146,6 @@ public class Dialog implements DialogInterface, Window.Callback,
		mListenersHandler = new ListenersHandler(this);
		}

		/**
		* This method is provided to work around the constructor pattern limitation
		* present in Dialog. We must resolve theme==0 to the runtime specified
		* theme, but this cannot be done by subclasses except through this method.
		*/
		static int resolveDefaultTheme(Context context, int theme, int themeAttrIndex,
		int staticDefault) {
		if (theme != 0) {
		return theme;
		} else {
		TypedArray a = context.obtainStyledAttributes(android.R.styleable.Theme);
		int newTheme = a.getResourceId(themeAttrIndex, staticDefault);
		a.recycle();
		return newTheme;
		}
		}

		/**
		* @deprecated
		* @hide