Galaxy S Style Power Widget (a4e7aefd) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,11 @@ public abstract class ContentResolver {
	mContext = context;		mContext = context;
	}		}

			/** @hide */
			public final Context getContext() {
			return mContext;
			}

	/** @hide */		/** @hide */
	protected abstract IContentProvider acquireProvider(Context c, String name);		protected abstract IContentProvider acquireProvider(Context c, String name);
	/** Providing a default implementation of this, to avoid having to change		/** Providing a default implementation of this, to avoid having to change

core/java/android/content/ContentService.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -139,6 +139,7 @@ public final class ContentService extends IContentService.Stub {
	ObserverCall oc = calls.get(i);		ObserverCall oc = calls.get(i);
	try {		try {
	oc.mObserver.onChange(oc.mSelfNotify);		oc.mObserver.onChange(oc.mSelfNotify);
			oc.mObserver.onChangeUri(uri, oc.mSelfNotify);
	if (Log.isLoggable(TAG, Log.VERBOSE)) {		if (Log.isLoggable(TAG, Log.VERBOSE)) {
	Log.v(TAG, "Notified " + oc.mObserver + " of " + "update at " + uri);		Log.v(TAG, "Notified " + oc.mObserver + " of " + "update at " + uri);
	}		}

core/java/android/content/res/Resources.java

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParser;
	import org.xmlpull.v1.XmlPullParserException;		import org.xmlpull.v1.XmlPullParserException;

	import android.graphics.Movie;		import android.graphics.Movie;
			import android.graphics.PorterDuff.Mode;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.graphics.drawable.ColorDrawable;		import android.graphics.drawable.ColorDrawable;
	import android.os.Build;		import android.os.Build;
	@@ -582,6 +583,36 @@ public class Resources {
	}		}
	}		}

			/**
			* Return a drawable object associated with a particular resource ID.
			* Various types of objects will be returned depending on the underlying
			* resource -- for example, a solid color, PNG image, scalable image, etc.
			* The Drawable API hides these implementation details.
			*
			* mtwebster: This version also applies a Porter Duff color mask onto the object before
			* returning the object. Put in Resources to give reusability, I plan on
			* applying this to other parts of the gui
			*
			* @param id The desired resource identifier, as generated by the aapt tool.
			* This integer encodes the package, type, and resource entry.
			* The value 0 is an invalid identifier.
			* @param mask The color mask to use (alpha-r-g-b)
			* @param masktype The Porter Duff filter mode
			* @throws NotFoundException Throws NotFoundException if the given ID does
			* not exist.
			* @return Drawable An object that can be used to draw this resource.
			* @hide
			*/
			public Drawable getDrawable(int id, int mask, Mode maskType) throws NotFoundException {
			synchronized (mTmpValue) {
			TypedValue value = mTmpValue;
			getValue(id, value, true);
			Drawable tmpDrawable = loadDrawable(value, id);
			tmpDrawable.setColorFilter(mask, maskType);
			return tmpDrawable;
			}
			}

	/**		/**
	* Return a movie object associated with the particular resource ID.		* Return a movie object associated with the particular resource ID.
	* @param id The desired resource identifier, as generated by the aapt		* @param id The desired resource identifier, as generated by the aapt

core/java/android/database/ContentObserver.java

+32 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.database;		package android.database;

			import android.net.Uri;
	import android.os.Handler;		import android.os.Handler;

	/**		/**
	@@ -34,15 +35,25 @@ public abstract class ContentObserver {
	private final class NotificationRunnable implements Runnable {		private final class NotificationRunnable implements Runnable {

	private boolean mSelf;		private boolean mSelf;
			private Uri mUri = null;

	public NotificationRunnable(boolean self) {		public NotificationRunnable(boolean self) {
	mSelf = self;		mSelf = self;
	}		}

			public NotificationRunnable(Uri uri, boolean self) {
			mSelf = self;
			mUri = uri;
			}

	public void run() {		public void run() {
			if (mUri != null) {
			ContentObserver.this.onChangeUri(mUri, mSelf);
			} else {
	ContentObserver.this.onChange(mSelf);		ContentObserver.this.onChange(mSelf);
	}		}
	}		}
			}

	private static final class Transport extends IContentObserver.Stub {		private static final class Transport extends IContentObserver.Stub {
	ContentObserver mContentObserver;		ContentObserver mContentObserver;
	@@ -66,6 +77,13 @@ public abstract class ContentObserver {
	}		}
	}		}

			public void onChangeUri(Uri uri, boolean selfChange) {
			ContentObserver contentObserver = mContentObserver;
			if (contentObserver != null) {
			contentObserver.dispatchChange(uri, selfChange);
			}
			}

	public void releaseContentObserver() {		public void releaseContentObserver() {
	mContentObserver = null;		mContentObserver = null;
	}		}
	@@ -128,6 +146,9 @@ public abstract class ContentObserver {
	*/		*/
	public void onChange(boolean selfChange) {}		public void onChange(boolean selfChange) {}

			/** @hide */
			public void onChangeUri(Uri uri, boolean selfChange) {}

	public final void dispatchChange(boolean selfChange) {		public final void dispatchChange(boolean selfChange) {
	if (mHandler == null) {		if (mHandler == null) {
	onChange(selfChange);		onChange(selfChange);
	@@ -135,4 +156,14 @@ public abstract class ContentObserver {
	mHandler.post(new NotificationRunnable(selfChange));		mHandler.post(new NotificationRunnable(selfChange));
	}		}
	}		}

			/** @hide */
			public final void dispatchChange(Uri uri, boolean selfChange) {
			if (mHandler == null) {
			onChangeUri(uri, selfChange);
			} else {
			mHandler.post(new NotificationRunnable(uri, selfChange));
			}
			}

	}		}

core/java/android/database/IContentObserver.aidl

100755 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,8 @@

	package android.database;		package android.database;

			import android.net.Uri;

	/**		/**
	* @hide		* @hide
	*/		*/
	@@ -28,4 +30,5 @@ interface IContentObserver
	* commit on the cursor that is being observed.		* commit on the cursor that is being observed.
	*/		*/
	oneway void onChange(boolean selfUpdate);		oneway void onChange(boolean selfUpdate);
			oneway void onChangeUri(in Uri uri, boolean selfUpdate);
	}		}