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

cmds/dumpstate/dumpstate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@ static void dump_kernel_log(const char path, const char title)
		if (stat(path, &sbuf) < 0)
		printf("%s: stat failed (%s)\n", path, strerror(errno));
		else
		printf("Harvested %s", ctime(&sbuf.st_ctime));
		printf("Harvested %s", ctime(&sbuf.st_mtime));

		DUMP(path);
		}

core/java/android/provider/Telephony.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1489,11 +1489,11 @@ public final class Telephony {

		/**
		* This is the scrap file we use to store the media attachment when the user
		* chooses to capture a photo to be attached (and could be used for other media types
		* if necessary). We pass {#link@Uri} to the Camera app, which streams the captured
		* image to the uri. Internally we write the media content to this file.
		* chooses to capture a photo to be attached . We pass {#link@Uri} to the Camera app,
		* which streams the captured image to the uri. Internally we write the media content
		* to this file. It's named '.temp.jpg' so Gallery won't pick it up.
		*/
		public static final String SCRAP_FILE_PATH = "/sdcard/mms/scrapSpace/file";
		public static final String SCRAP_FILE_PATH = "/sdcard/mms/scrapSpace/.temp.jpg";
		}

		public static final class Intents {

core/java/com/android/internal/widget/RotarySelector.java

+32 −9

Original line number	Diff line number	Diff line
		@@ -93,9 +93,9 @@ public class RotarySelector extends View {
		* If the user is currently dragging something.
		*/
		private int mGrabbedState = NOTHING_GRABBED;
		private static final int NOTHING_GRABBED = 0;
		private static final int LEFT_HANDLE_GRABBED = 1;
		private static final int RIGHT_HANDLE_GRABBED = 2;
		public static final int NOTHING_GRABBED = 0;
		public static final int LEFT_HANDLE_GRABBED = 1;
		public static final int RIGHT_HANDLE_GRABBED = 2;

		/**
		* Whether the user has triggered something (e.g dragging the left handle all the way over to
		@@ -522,12 +522,12 @@ public class RotarySelector extends View {
		}
		if (eventX < mLeftHandleX + hitWindow) {
		mRotaryOffsetX = eventX - mLeftHandleX;
		mGrabbedState = LEFT_HANDLE_GRABBED;
		setGrabbedState(LEFT_HANDLE_GRABBED);
		invalidate();
		vibrate(VIBRATE_SHORT);
		} else if (eventX > mRightHandleX - hitWindow) {
		mRotaryOffsetX = eventX - mRightHandleX;
		mGrabbedState = RIGHT_HANDLE_GRABBED;
		setGrabbedState(RIGHT_HANDLE_GRABBED);
		invalidate();
		vibrate(VIBRATE_SHORT);
		}
		@@ -591,7 +591,7 @@ public class RotarySelector extends View {
		startAnimation(eventX - mRightHandleX, 0, SNAP_BACK_ANIMATION_DURATION_MILLIS);
		}
		mRotaryOffsetX = 0;
		mGrabbedState = NOTHING_GRABBED;
		setGrabbedState(NOTHING_GRABBED);
		invalidate();
		if (mVelocityTracker != null) {
		mVelocityTracker.recycle(); // wishin' we had generational GC
		@@ -617,7 +617,7 @@ public class RotarySelector extends View {
		mAnimationDuration = duration;
		mAnimatingDeltaXStart = startX;
		mAnimatingDeltaXEnd = endX;
		mGrabbedState = NOTHING_GRABBED;
		setGrabbedState(NOTHING_GRABBED);
		mDimplesOfFling = 0;
		invalidate();
		}
		@@ -628,7 +628,7 @@ public class RotarySelector extends View {
		mAnimationDuration = 1000 * (endX - startX) / pixelsPerSecond;
		mAnimatingDeltaXStart = startX;
		mAnimatingDeltaXEnd = endX;
		mGrabbedState = NOTHING_GRABBED;
		setGrabbedState(NOTHING_GRABBED);
		invalidate();
		}

		@@ -667,7 +667,7 @@ public class RotarySelector extends View {
		mAnimating = false;
		mRotaryOffsetX = 0;
		mDimplesOfFling = 0;
		mGrabbedState = NOTHING_GRABBED;
		setGrabbedState(NOTHING_GRABBED);
		mTriggered = false;
		}

		@@ -715,6 +715,19 @@ public class RotarySelector extends View {
		}
		}

		/**
		* Sets the current grabbed state, and dispatches a grabbed state change
		* event to our listener.
		*/
		private void setGrabbedState(int newState) {
		if (newState != mGrabbedState) {
		mGrabbedState = newState;
		if (mOnDialTriggerListener != null) {
		mOnDialTriggerListener.onGrabbedStateChange(this, mGrabbedState);
		}
		}
		}

		/**
		* Interface definition for a callback to be invoked when the dial
		* is "triggered" by rotating it one way or the other.
		@@ -740,6 +753,16 @@ public class RotarySelector extends View {
		* either {@link #LEFT_HANDLE}, {@link #RIGHT_HANDLE}.
		*/
		void onDialTrigger(View v, int whichHandle);

		/**
		* Called when the "grabbed state" changes (i.e. when
		* the user either grabs or releases one of the handles.)
		*
		* @param v the view that was triggered
		* @param grabbedState the new state: either {@link #NOTHING_GRABBED},
		* {@link #LEFT_HANDLE_GRABBED}, or {@link #RIGHT_HANDLE_GRABBED}.
		*/
		void onGrabbedStateChange(View v, int grabbedState);
		}

core/jni/android_bluetooth_HeadsetBase.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -396,7 +396,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,
		LOGE("select() on RFCOMM socket: %s (%d)",
		strerror(errno),
		errno);
		return -1;
		return -errno;
		}
		return 0;
		}
		@@ -429,7 +429,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,
		fcntl(nat->rfcomm_sock, F_SETFL, nat->rfcomm_sock_flags);
		close(nat->rfcomm_sock);
		nat->rfcomm_sock = -1;
		return -1;
		return -errno;
		}
		}
		/* Restore the blocking properties of the socket. */

core/res/res/drawable-hdpi/ic_launcher_android.png

+1.99 KiB (6.71 KiB)

Loading image diff...