Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base (d5c19608) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ public class AccountManagerService
		new AtomicReference<AccountManagerService>();

		private static final boolean isDebuggableMonkeyBuild =
		SystemProperties.getBoolean("ro.monkey", false)
		SystemProperties.getBoolean("monkey.running", false)
		&& SystemProperties.getBoolean("ro.debuggable", false);
		private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[]{};

core/java/android/content/res/ColorStateList.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import java.util.Arrays;
		* <selector xmlns:android="http://schemas.android.com/apk/res/android">
		* <item android:state_focused="true" android:color="@color/testcolor1"/>
		* <item android:state_pressed="true" android:state_enabled="false" android:color="@color/testcolor2" />
		* <item android:state_enabled="false" android:colore="@color/testcolor3" />
		* <item android:state_enabled="false" android:color="@color/testcolor3" />
		* <item android:state_active="true" android:color="@color/testcolor4" />
		* <item android:color="@color/testcolor5"/>
		* </selector>

core/java/android/provider/MediaStore.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -178,6 +178,14 @@ public final class MediaStore {
		*/
		public final static String EXTRA_OUTPUT = "output";

		/**
		* The string that is used when a media attribute is not known. For example,
		* if an audio file does not have any meta data, the artist and album columns
		* will be set to this value.
		* @hide
		*/
		public static final String UNKNOWN_STRING = "<unknown>";

		/**
		* Common fields for most MediaProvider tables
		*/
		@@ -964,7 +972,7 @@ public final class MediaStore {
		public static String keyFor(String name) {
		if (name != null) {
		boolean sortfirst = false;
		if (name.equals(android.media.MediaFile.UNKNOWN_STRING)) {
		if (name.equals(UNKNOWN_STRING)) {
		return "\001";
		}
		// Check if the first character is \001. We use this to

core/java/android/view/WindowOrientationListener.java

+64 −70

Original line number	Diff line number	Diff line
		@@ -32,14 +32,13 @@ import android.util.Log;
		*/
		public abstract class WindowOrientationListener {
		private static final String TAG = "WindowOrientationListener";
		private static final boolean DEBUG = false;
		private static final boolean localLOGV = DEBUG ? Config.LOGD : Config.LOGV;
		private static final boolean DEBUG = true;
		private static final boolean localLOGV = DEBUG \|\| Config.DEBUG;
		private SensorManager mSensorManager;
		private boolean mEnabled = false;
		private int mRate;
		private Sensor mSensor;
		private SensorEventListener mSensorEventListener;
		private int mSensorRotation = -1;
		private SensorEventListenerImpl mSensorEventListener;

		/**
		* Creates a new WindowOrientationListener.
		@@ -80,7 +79,6 @@ public abstract class WindowOrientationListener {
		}
		if (mEnabled == false) {
		if (localLOGV) Log.d(TAG, "WindowOrientationListener enabled");
		mSensorRotation = -1;
		mSensorManager.registerListener(mSensorEventListener, mSensor, mRate);
		mEnabled = true;
		}
		@@ -96,23 +94,22 @@ public abstract class WindowOrientationListener {
		}
		if (mEnabled == true) {
		if (localLOGV) Log.d(TAG, "WindowOrientationListener disabled");
		mSensorRotation = -1;
		mSensorManager.unregisterListener(mSensorEventListener);
		mEnabled = false;
		}
		}

		public int getCurrentRotation() {
		return mSensorRotation;
		if (mEnabled) {
		return mSensorEventListener.getCurrentRotation();
		}
		return -1;
		}

		class SensorEventListenerImpl implements SensorEventListener {
		private static final int _DATA_X = 0;
		private static final int _DATA_Y = 1;
		private static final int _DATA_Z = 2;
		// Angle around x-axis thats considered almost perfect vertical to hold
		// the device
		private static final int PIVOT = 20;
		// Angle around x-asis that's considered almost too vertical. Beyond
		// this angle will not result in any orientation changes. f phone faces uses,
		// the device is leaning backward.
		@@ -121,29 +118,60 @@ public abstract class WindowOrientationListener {
		// angle will not result in any orientation changes. If phone faces uses,
		// the device is leaning forward.
		private static final int PIVOT_LOWER = -10;
		// Upper threshold limit for switching from portrait to landscape
		private static final int PL_UPPER = 295;
		// Lower threshold limit for switching from landscape to portrait
		private static final int LP_LOWER = 320;
		// Lower threshold limt for switching from portrait to landscape
		private static final int PL_LOWER = 270;
		// Upper threshold limit for switching from landscape to portrait
		private static final int LP_UPPER = 359;
		// Minimum angle which is considered landscape
		private static final int LANDSCAPE_LOWER = 235;
		// Minimum angle which is considered portrait
		private static final int PORTRAIT_LOWER = 60;

		// Internal value used for calculating linear variant
		private static final float PL_LF_UPPER =
		((float)(PL_UPPER-PL_LOWER))/((float)(PIVOT_UPPER-PIVOT));
		private static final float PL_LF_LOWER =
		((float)(PL_UPPER-PL_LOWER))/((float)(PIVOT-PIVOT_LOWER));
		// Internal value used for calculating linear variant
		private static final float LP_LF_UPPER =
		((float)(LP_UPPER - LP_LOWER))/((float)(PIVOT_UPPER-PIVOT));
		private static final float LP_LF_LOWER =
		((float)(LP_UPPER - LP_LOWER))/((float)(PIVOT-PIVOT_LOWER));
		static final int ROTATION_0 = 0;
		static final int ROTATION_90 = 1;
		static final int ROTATION_180 = 2;
		static final int ROTATION_270 = 3;
		int mRotation = ROTATION_0;

		// Threshold values defined for device rotation positions
		// follow order ROTATION_0 .. ROTATION_270
		final int THRESHOLDS[][][] = new int[][][] {
		{{60, 135}, {135, 225}, {225, 300}},
		{{0, 45}, {45, 135}, {135, 210}, {330, 360}},
		{{0, 45}, {45, 120}, {240, 315}, {315, 360}},
		{{0, 30}, {150, 225}, {225, 315}, {315, 360}}
		};

		// Transform rotation ranges based on THRESHOLDS. This
		// has to be in step with THESHOLDS
		final int ROTATE_TO[][] = new int[][] {
		{ROTATION_270, ROTATION_180, ROTATION_90},
		{ROTATION_0, ROTATION_270, ROTATION_180, ROTATION_0},
		{ROTATION_0, ROTATION_270, ROTATION_90, ROTATION_0},
		{ROTATION_0, ROTATION_180, ROTATION_90, ROTATION_0}
		};

		// Mapping into actual Surface rotation values
		final int TRANSFORM_ROTATIONS[] = new int[]{Surface.ROTATION_0,
		Surface.ROTATION_90, Surface.ROTATION_180, Surface.ROTATION_270};

		int getCurrentRotation() {
		return TRANSFORM_ROTATIONS[mRotation];
		}

		private void calculateNewRotation(int orientation, int zyangle) {
		if (localLOGV) Log.i(TAG, orientation + ", " + zyangle + ", " + mRotation);
		int rangeArr[][] = THRESHOLDS[mRotation];
		int row = -1;
		for (int i = 0; i < rangeArr.length; i++) {
		if ((orientation >= rangeArr[i][0]) && (orientation < rangeArr[i][1])) {
		row = i;
		break;
		}
		}
		if (row != -1) {
		// Find new rotation based on current rotation value.
		// This also takes care of irregular rotations as well.
		int rotation = ROTATE_TO[mRotation][row];
		if (localLOGV) Log.i(TAG, " new rotation = " + rotation);
		if (rotation != mRotation) {
		mRotation = rotation;
		// Trigger orientation change
		onOrientationChanged(TRANSFORM_ROTATIONS[rotation]);
		}
		}
		}

		public void onSensorChanged(SensorEvent event) {
		float[] values = event.values;
		@@ -153,12 +181,11 @@ public abstract class WindowOrientationListener {
		float OneEightyOverPi = 57.29577957855f;
		float gravity = (float) Math.sqrt(XX+YY+Z*Z);
		float zyangle = (float)Math.asin(Z/gravity)*OneEightyOverPi;
		int rotation = -1;
		if ((zyangle <= PIVOT_UPPER) && (zyangle >= PIVOT_LOWER)) {
		// Check orientation only if the phone is flat enough
		// Don't trust the angle if the magnitude is small compared to the y value
		float angle = (float)Math.atan2(Y, -X) * OneEightyOverPi;
		int orientation = 90 - (int)Math.round(angle);
		int orientation = 90 - Math.round(angle);
		// normalize to 0 - 359 range
		while (orientation >= 360) {
		orientation -= 360;
		@@ -166,40 +193,7 @@ public abstract class WindowOrientationListener {
		while (orientation < 0) {
		orientation += 360;
		}
		// Orientation values between LANDSCAPE_LOWER and PL_LOWER
		// are considered landscape.
		// Ignore orientation values between 0 and LANDSCAPE_LOWER
		// For orientation values between LP_UPPER and PL_LOWER,
		// the threshold gets set linearly around PIVOT.
		if ((orientation >= PL_LOWER) && (orientation <= LP_UPPER)) {
		float threshold;
		float delta = zyangle - PIVOT;
		if (mSensorRotation == Surface.ROTATION_90) {
		if (delta < 0) {
		// Delta is negative
		threshold = LP_LOWER - (LP_LF_LOWER * delta);
		} else {
		threshold = LP_LOWER + (LP_LF_UPPER * delta);
		}
		rotation = (orientation >= threshold) ? Surface.ROTATION_0 : Surface.ROTATION_90;
		} else {
		if (delta < 0) {
		// Delta is negative
		threshold = PL_UPPER+(PL_LF_LOWER * delta);
		} else {
		threshold = PL_UPPER-(PL_LF_UPPER * delta);
		}
		rotation = (orientation <= threshold) ? Surface.ROTATION_90: Surface.ROTATION_0;
		}
		} else if ((orientation >= LANDSCAPE_LOWER) && (orientation < LP_LOWER)) {
		rotation = Surface.ROTATION_90;
		} else if ((orientation >= PL_UPPER) \|\| (orientation <= PORTRAIT_LOWER)) {
		rotation = Surface.ROTATION_0;
		}
		if ((rotation != -1) && (rotation != mSensorRotation)) {
		mSensorRotation = rotation;
		onOrientationChanged(mSensorRotation);
		}
		calculateNewRotation(orientation, Math.round(zyangle));
		}
		}

core/java/android/widget/AbsListView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2969,7 +2969,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		break;
		case KeyEvent.KEYCODE_SPACE:
		// Only send spaces once we are filtered
		okToSend = mFiltered = true;
		okToSend = mFiltered;
		break;
		}