Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb (c8c3021a) · Commits · e / os / android_frameworks_base

api/current.xml

+56 −1

Original line number	Diff line number	Diff line
		@@ -11809,6 +11809,28 @@
		visibility="public"
		>
		</field>
		<field name="dialog_holo_dark_frame"
		type="int"
		transient="false"
		volatile="false"
		value="17301682"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="dialog_holo_light_frame"
		type="int"
		transient="false"
		volatile="false"
		value="17301683"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="divider_horizontal_bright"
		type="int"
		transient="false"
		@@ -26585,6 +26607,39 @@
		<parameter name="viewSpacingBottom" type="int">
		</parameter>
		</method>
		<field name="THEME_HOLO_DARK"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="THEME_HOLO_LIGHT"
		type="int"
		transient="false"
		volatile="false"
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="THEME_TRADITIONAL"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="AlertDialog.Builder"
		extends="java.lang.Object"
		@@ -260471,7 +260526,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="t" type="T">
		<parameter name="arg0" type="T">
		</parameter>
		</method>
		</interface>

core/java/android/app/AlertDialog.java

+61 −13

Original line number	Diff line number	Diff line
		@@ -58,30 +58,70 @@ import android.widget.ListView;
		public class AlertDialog extends Dialog implements DialogInterface {
		private AlertController mAlert;

		/**
		* Special theme constant for {@link #AlertDialog(Context, int)}: use
		* the traditional (pre-Holo) alert dialog theme.
		*/
		public static final int THEME_TRADITIONAL = 1;

		/**
		* Special theme constant for {@link #AlertDialog(Context, int)}: use
		* the holographic alert theme with a dark background.
		*/
		public static final int THEME_HOLO_DARK = 2;

		/**
		* Special theme constant for {@link #AlertDialog(Context, int)}: use
		* the holographic alert theme with a light background.
		*/
		public static final int THEME_HOLO_LIGHT = 3;

		protected AlertDialog(Context context) {
		this(context, getDefaultDialogTheme(context));
		this(context, resolveDialogTheme(context, 0), true);
		}

		/**
		* Construct an AlertDialog that uses an explicit theme. The actual style
		* that an AlertDialog uses is a private implementation, however you can
		* here supply either the name of an attribute in the theme from which
		* to get the dialog's style (such as {@link android.R.attr#alertDialogTheme}
		* or one of the constants {@link #THEME_TRADITIONAL},
		* {@link #THEME_HOLO_DARK}, or {@link #THEME_HOLO_LIGHT}.
		*/
		protected AlertDialog(Context context, int theme) {
		super(context, theme == 0 ? getDefaultDialogTheme(context) : theme);
		this(context, theme, true);
		}

		AlertDialog(Context context, int theme, boolean createContextWrapper) {
		super(context, resolveDialogTheme(context, theme), createContextWrapper);
		mWindow.alwaysReadCloseOnTouchAttr();
		mAlert = new AlertController(context, this, getWindow());
		mAlert = new AlertController(getContext(), this, getWindow());
		}

		protected AlertDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
		super(context, getDefaultDialogTheme(context));
		super(context, resolveDialogTheme(context, 0));
		mWindow.alwaysReadCloseOnTouchAttr();
		setCancelable(cancelable);
		setOnCancelListener(cancelListener);
		mAlert = new AlertController(context, this, getWindow());
		}

		private static int getDefaultDialogTheme(Context context) {
		static int resolveDialogTheme(Context context, int resid) {
		if (resid == THEME_TRADITIONAL) {
		return com.android.internal.R.style.Theme_Dialog_Alert;
		} else if (resid == THEME_HOLO_DARK) {
		return com.android.internal.R.style.Theme_Holo_Dialog_Alert;
		} else if (resid == THEME_HOLO_LIGHT) {
		return com.android.internal.R.style.Theme_Holo_Light_Dialog_Alert;
		} else if (resid >= 0x01000000) { // start of real resource IDs.
		return resid;
		} else {
		TypedValue outValue = new TypedValue();
		context.getTheme().resolveAttribute(com.android.internal.R.attr.alertDialogTheme,
		outValue, true);
		return outValue.resourceId;
		}
		}

		/**
		* Gets one of the buttons used in the dialog.
		@@ -294,15 +334,23 @@ public class AlertDialog extends Dialog implements DialogInterface {
		* Constructor using a context for this builder and the {@link AlertDialog} it creates.
		*/
		public Builder(Context context) {
		this(context, getDefaultDialogTheme(context));
		this(context, resolveDialogTheme(context, 0));
		}

		/**
		* Constructor using a context and theme for this builder and
		* the {@link AlertDialog} it creates.
		* the {@link AlertDialog} it creates. The actual theme
		* that an AlertDialog uses is a private implementation, however you can
		* here supply either the name of an attribute in the theme from which
		* to get the dialog's style (such as {@link android.R.attr#alertDialogTheme}
		* or one of the constants
		* {@link AlertDialog#THEME_TRADITIONAL AlertDialog.THEME_TRADITIONAL},
		* {@link AlertDialog#THEME_HOLO_DARK AlertDialog.THEME_HOLO_DARK}, or
		* {@link AlertDialog#THEME_HOLO_LIGHT AlertDialog.THEME_HOLO_LIGHT}.
		*/
		public Builder(Context context, int theme) {
		P = new AlertController.AlertParams(new ContextThemeWrapper(context, theme));
		P = new AlertController.AlertParams(new ContextThemeWrapper(
		context, resolveDialogTheme(context, theme)));
		mTheme = theme;
		}

		@@ -840,7 +888,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(P.mContext, mTheme);
		final AlertDialog dialog = new AlertDialog(P.mContext, mTheme, false);
		P.apply(dialog.mAlert);
		dialog.setCancelable(P.mCancelable);
		dialog.setOnCancelListener(P.mOnCancelListener);

core/java/android/app/Dialog.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		* present its UI.
		*/
		public Dialog(Context context) {
		this(context, 0);
		this(context, 0, true);
		}

		/**
		@@ -135,6 +135,10 @@ 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) {
		this(context, theme, true);
		}

		Dialog(Context context, int theme, boolean createContextWrapper) {
		if (theme == 0) {
		TypedValue outValue = new TypedValue();
		context.getTheme().resolveAttribute(com.android.internal.R.attr.dialogTheme,
		@@ -142,7 +146,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		theme = outValue.resourceId;
		}

		mContext = new ContextThemeWrapper(context, theme);
		mContext = createContextWrapper ? new ContextThemeWrapper(context, theme) : context;
		mWindowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
		Window w = PolicyManager.makeNewWindow(mContext);
		mWindow = w;

core/res/res/values/colors.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,9 @@
		<drawable name="editbox_dropdown_dark_frame">@drawable/editbox_dropdown_background_dark</drawable>
		<drawable name="editbox_dropdown_light_frame">@drawable/editbox_dropdown_background</drawable>

		<drawable name="dialog_holo_dark_frame">@drawable/dialog_full_holo_dark</drawable>
		<drawable name="dialog_holo_light_frame">@drawable/dialog_full_holo_light</drawable>

		<drawable name="input_method_fullscreen_background">#fff9f9f9</drawable>

		<!-- For date picker widget -->

core/res/res/values/public.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -1496,6 +1496,9 @@
		a ListView). -->
		<public type="layout" name="simple_list_item_activated_2" />

		<public type="drawable" name="dialog_holo_dark_frame" />
		<public type="drawable" name="dialog_holo_light_frame" />

		<public type="style" name="Theme.WithActionBar" />
		<public type="style" name="Theme.NoTitleBar.OverlayActionModes" />