Holo themes and assets in progress (c63806d8) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6829,6 +6829,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="listDividerAlertDialog"
			type="int"
			transient="false"
			volatile="false"
			value="16843590"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="listPopupWindowStyle"		<field name="listPopupWindowStyle"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -9876,6 +9887,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="textColorAlertDialogListItem"
			type="int"
			transient="false"
			volatile="false"
			value="16843591"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="textColorHighlight"		<field name="textColorHighlight"
	type="int"		type="int"
	transient="false"		transient="false"

core/java/android/app/AlertDialog.java

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.content.Context;
	import android.content.DialogInterface;		import android.content.DialogInterface;
	import android.database.Cursor;		import android.database.Cursor;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
			import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Message;		import android.os.Message;
	import android.view.KeyEvent;		import android.view.KeyEvent;
	@@ -56,7 +57,10 @@ public class AlertDialog extends Dialog implements DialogInterface {
	private AlertController mAlert;		private AlertController mAlert;

	protected AlertDialog(Context context) {		protected AlertDialog(Context context) {
	this(context, com.android.internal.R.style.Theme_Dialog_Alert);		this(context,
			context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB
			? com.android.internal.R.style.Theme_Holo_Dialog_Alert
			: com.android.internal.R.style.Theme_Dialog_Alert);
	}		}

	protected AlertDialog(Context context, int theme) {		protected AlertDialog(Context context, int theme) {
	@@ -65,7 +69,10 @@ public class AlertDialog extends Dialog implements DialogInterface {
	}		}

	protected AlertDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {		protected AlertDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
	super(context, com.android.internal.R.style.Theme_Dialog_Alert);		super(context,
			context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB
			? com.android.internal.R.style.Theme_Holo_Dialog_Alert
			: com.android.internal.R.style.Theme_Dialog_Alert);
	setCancelable(cancelable);		setCancelable(cancelable);
	setOnCancelListener(cancelListener);		setOnCancelListener(cancelListener);
	mAlert = new AlertController(context, this, getWindow());		mAlert = new AlertController(context, this, getWindow());
	@@ -271,7 +278,10 @@ public class AlertDialog extends Dialog implements DialogInterface {
	* Constructor using a context for this builder and the {@link AlertDialog} it creates.		* Constructor using a context for this builder and the {@link AlertDialog} it creates.
	*/		*/
	public Builder(Context context) {		public Builder(Context context) {
	this(context, com.android.internal.R.style.Theme_Dialog_Alert);		this(context,
			context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB
			? com.android.internal.R.style.Theme_Holo_Dialog_Alert
			: com.android.internal.R.style.Theme_Dialog_Alert);
	}		}

	/**		/**

core/java/android/app/ContextImpl.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,6 +76,7 @@ import android.net.Uri;
	import android.net.wifi.IWifiManager;		import android.net.wifi.IWifiManager;
	import android.net.wifi.WifiManager;		import android.net.wifi.WifiManager;
	import android.os.Binder;		import android.os.Binder;
			import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.DropBoxManager;		import android.os.DropBoxManager;
	import android.os.Environment;		import android.os.Environment;
	@@ -1063,8 +1064,13 @@ class ContextImpl extends Context {
	private NotificationManager getNotificationManager() {		private NotificationManager getNotificationManager() {
	synchronized (mSync) {		synchronized (mSync) {
	if (mNotificationManager == null) {		if (mNotificationManager == null) {
			final Context outerContext = getOuterContext();
	mNotificationManager = new NotificationManager(		mNotificationManager = new NotificationManager(
	new ContextThemeWrapper(getOuterContext(), com.android.internal.R.style.Theme_Dialog),		new ContextThemeWrapper(outerContext,
			outerContext.getApplicationInfo().targetSdkVersion >=
			Build.VERSION_CODES.HONEYCOMB
			? com.android.internal.R.style.Theme_Holo_Dialog
			: com.android.internal.R.style.Theme_Dialog),
	mMainThread.getHandler());		mMainThread.getHandler());
	}		}
	}		}

core/java/android/app/DatePickerDialog.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package android.app;
	import android.content.Context;		import android.content.Context;
	import android.content.DialogInterface;		import android.content.DialogInterface;
	import android.content.DialogInterface.OnClickListener;		import android.content.DialogInterface.OnClickListener;
			import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.text.TextUtils.TruncateAt;		import android.text.TextUtils.TruncateAt;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	@@ -82,7 +83,9 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
	int year,		int year,
	int monthOfYear,		int monthOfYear,
	int dayOfMonth) {		int dayOfMonth) {
	this(context, com.android.internal.R.style.Theme_Dialog_Alert,		this(context, context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB
			? com.android.internal.R.style.Theme_Holo_Dialog_Alert
			: com.android.internal.R.style.Theme_Dialog_Alert,
	callBack, year, monthOfYear, dayOfMonth);		callBack, year, monthOfYear, dayOfMonth);
	}		}

core/java/android/app/Dialog.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.content.ContextWrapper;
	import android.content.DialogInterface;		import android.content.DialogInterface;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.net.Uri;		import android.net.Uri;
			import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Message;		import android.os.Message;
	@@ -140,7 +141,10 @@ public class Dialog implements DialogInterface, Window.Callback,
	*/		*/
	public Dialog(Context context, int theme) {		public Dialog(Context context, int theme) {
	mContext = new ContextThemeWrapper(		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);		mWindowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
	Window w = PolicyManager.makeNewWindow(mContext);		Window w = PolicyManager.makeNewWindow(mContext);
	mWindow = w;		mWindow = w;