Merge branch 'eclair' into eclair-release (c214a2a7) · Commits · e / os / android_frameworks_base

api/current.xml

+46 −52

Original line number	Original line	Diff line number	Diff line
	@@ -1934,6 +1934,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="author"
			type="int"
			transient="false"
			volatile="false"
			value="16843444"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="authorities"		<field name="authorities"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -1971,7 +1982,7 @@
	type="int"		type="int"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value="16843446"		value="16843445"
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	@@ -8853,17 +8864,6 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="wallpaperAuthor"
	type="int"
	transient="false"
	volatile="false"
	value="16843444"
	static="true"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	</field>
	<field name="wallpaperCloseEnterAnimation"		<field name="wallpaperCloseEnterAnimation"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -8886,17 +8886,6 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="wallpaperDescription"
	type="int"
	transient="false"
	volatile="false"
	value="16843445"
	static="true"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	</field>
	<field name="wallpaperIntraCloseEnterAnimation"		<field name="wallpaperIntraCloseEnterAnimation"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -25166,6 +25155,28 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="COMMAND_DROP"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""android.home.drop""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="COMMAND_TAP"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""android.wallpaper.tap""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	</class>		</class>
	</package>		</package>
	<package name="android.appwidget"		<package name="android.appwidget"
	@@ -36143,7 +36154,7 @@
	value=""android.intent.extra.changed_component_name""		value=""android.intent.extra.changed_component_name""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	@@ -99872,6 +99883,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="ECLAIR_MR1"
			type="int"
			transient="false"
			volatile="false"
			value="7"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	</class>		</class>
	<class name="Bundle"		<class name="Bundle"
	extends="java.lang.Object"		extends="java.lang.Object"
	@@ -123817,34 +123839,6 @@
	</parameter>		</parameter>
	</method>		</method>
	</class>		</class>
	<class name="WallpaperSettingsActivity"
	extends="android.preference.PreferenceActivity"
	abstract="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<constructor name="WallpaperSettingsActivity"
	type="android.service.wallpaper.WallpaperSettingsActivity"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	</constructor>
	<field name="EXTRA_PREVIEW_MODE"
	type="java.lang.String"
	transient="false"
	volatile="false"
	value=""android.service.wallpaper.PREVIEW_MODE""
	static="true"
	final="true"
	deprecated="not deprecated"
	visibility="public"
	>
	</field>
	</class>
	</package>		</package>
	<package name="android.speech"		<package name="android.speech"
	>		>

cmds/svc/src/com/android/commands/svc/PowerCommand.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@ public class PowerCommand extends Svc.Command {
	IBinder lock = new Binder();		IBinder lock = new Binder();
	pm.acquireWakeLock(PowerManager.FULL_WAKE_LOCK, lock, "svc power");		pm.acquireWakeLock(PowerManager.FULL_WAKE_LOCK, lock, "svc power");
	pm.setStayOnSetting(val);		pm.setStayOnSetting(val);
	pm.releaseWakeLock(lock);		pm.releaseWakeLock(lock, 0);
	}		}
	catch (RemoteException e) {		catch (RemoteException e) {
	System.err.println("Faild to set setting: " + e);		System.err.println("Faild to set setting: " + e);

core/java/android/app/ActivityThread.java

+30 −17

Original line number	Original line	Diff line number	Diff line
	@@ -178,15 +178,16 @@ public final class ActivityThread {
	* null.		* null.
	*/		*/
	Resources getTopLevelResources(String resDir, CompatibilityInfo compInfo) {		Resources getTopLevelResources(String resDir, CompatibilityInfo compInfo) {
			ResourcesKey key = new ResourcesKey(resDir, compInfo.applicationScale);
			Resources r;
	synchronized (mPackages) {		synchronized (mPackages) {
	// Resources is app scale dependent.		// Resources is app scale dependent.
	ResourcesKey key = new ResourcesKey(resDir, compInfo.applicationScale);
	if (false) {		if (false) {
	Log.w(TAG, "getTopLevelResources: " + resDir + " / "		Log.w(TAG, "getTopLevelResources: " + resDir + " / "
	+ compInfo.applicationScale);		+ compInfo.applicationScale);
	}		}
	WeakReference<Resources> wr = mActiveResources.get(key);		WeakReference<Resources> wr = mActiveResources.get(key);
	Resources r = wr != null ? wr.get() : null;		r = wr != null ? wr.get() : null;
	if (r != null && r.getAssets().isUpToDate()) {		if (r != null && r.getAssets().isUpToDate()) {
	if (false) {		if (false) {
	Log.w(TAG, "Returning cached resources " + r + " " + resDir		Log.w(TAG, "Returning cached resources " + r + " " + resDir
	@@ -194,6 +195,7 @@ public final class ActivityThread {
	}		}
	return r;		return r;
	}		}
			}

	//if (r != null) {		//if (r != null) {
	// Log.w(TAG, "Throwing away out-of-date resources!!!! "		// Log.w(TAG, "Throwing away out-of-date resources!!!! "
	@@ -213,6 +215,17 @@ public final class ActivityThread {
	+ r.getConfiguration() + " appScale="		+ r.getConfiguration() + " appScale="
	+ r.getCompatibilityInfo().applicationScale);		+ r.getCompatibilityInfo().applicationScale);
	}		}

			synchronized (mPackages) {
			WeakReference<Resources> wr = mActiveResources.get(key);
			Resources existing = wr != null ? wr.get() : null;
			if (existing != null && existing.getAssets().isUpToDate()) {
			// Someone else already created the resources while we were
			// unlocked; go ahead and use theirs.
			r.getAssets().close();
			return existing;
			}

	// XXX need to remove entries when weak references go away		// XXX need to remove entries when weak references go away
	mActiveResources.put(key, new WeakReference<Resources>(r));		mActiveResources.put(key, new WeakReference<Resources>(r));
	return r;		return r;

core/java/android/app/WallpaperInfo.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -101,10 +101,10 @@ public final class WallpaperInfo implements Parcelable {
	com.android.internal.R.styleable.Wallpaper_thumbnail,		com.android.internal.R.styleable.Wallpaper_thumbnail,
	-1);		-1);
	authorRes = sa.getResourceId(		authorRes = sa.getResourceId(
	com.android.internal.R.styleable.Wallpaper_wallpaperAuthor,		com.android.internal.R.styleable.Wallpaper_author,
	-1);		-1);
	descriptionRes = sa.getResourceId(		descriptionRes = sa.getResourceId(
	com.android.internal.R.styleable.Wallpaper_wallpaperDescription,		com.android.internal.R.styleable.Wallpaper_description,
	-1);		-1);

	sa.recycle();		sa.recycle();

core/java/android/app/WallpaperManager.java

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,21 @@ public class WallpaperManager {
	public static final String ACTION_LIVE_WALLPAPER_CHOOSER		public static final String ACTION_LIVE_WALLPAPER_CHOOSER
	= "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";		= "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";

			/**
			* Command for {@link #sendWallpaperCommand}: reported by the wallpaper
			* host when the user taps on an empty area (not performing an action
			* in the host). The x and y arguments are the location of the tap in
			* screen coordinates.
			*/
			public static final String COMMAND_TAP = "android.wallpaper.tap";

			/**
			* Command for {@link #sendWallpaperCommand}: reported by the wallpaper
			* host when the user drops an object into an area of the host. The x
			* and y arguments are the location of the drop.
			*/
			public static final String COMMAND_DROP = "android.home.drop";

	private final Context mContext;		private final Context mContext;

	/**		/**
	@@ -604,7 +619,7 @@ public class WallpaperManager {
	/**		/**
	* For applications that use multiple virtual screens showing a wallpaper,		* For applications that use multiple virtual screens showing a wallpaper,
	* specify the step size between virtual screens. For example, if the		* specify the step size between virtual screens. For example, if the
	* launcher has 5 virtual screens, it would specify an xStep of 0.5,		* launcher has 3 virtual screens, it would specify an xStep of 0.5,
	* since the X offset for those screens are 0.0, 0.5 and 1.0		* since the X offset for those screens are 0.0, 0.5 and 1.0
	* @param xStep The X offset delta from one screen to the next one		* @param xStep The X offset delta from one screen to the next one
	* @param yStep The Y offset delta from one screen to the next one		* @param yStep The Y offset delta from one screen to the next one