auto import from //branches/cupcake/...@132569 (15ab3eae) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -118963,6 +118963,17 @@
		visibility="public"
		>
		</field>
		<field name="KEYCODE_MUTE"
		type="int"
		transient="false"
		volatile="false"
		value="91"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="KEYCODE_N"
		type="int"
		transient="false"
		@@ -121255,6 +121266,17 @@
		<parameter name="rate" type="int">
		</parameter>
		</constructor>
		<method name="canDetectOrientation"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="disable"
		return="void"
		abstract="false"

core/java/android/app/Activity.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -890,9 +890,9 @@ public class Activity extends ContextThemeWrapper
		}

		/**
		* Called after {@link #onCreate} or {@link #onStop} when the current
		* activity is now being displayed to the user. It will
		* be followed by {@link #onRestart}.
		* Called after {@link #onCreate} — or after {@link #onRestart} when
		* the activity had been stopped, but is now again being displayed to the
		* user. It will be followed by {@link #onResume}.
		*
		* <p><em>Derived classes must call through to the super class's
		* implementation of this method. If they do not, an exception will be
		@@ -907,9 +907,9 @@ public class Activity extends ContextThemeWrapper
		}

		/**
		* Called after {@link #onStart} when the current activity is being
		* Called after {@link #onStop} when the current activity is being
		* re-displayed to the user (the user has navigated back to it). It will
		* be followed by {@link #onResume}.
		* be followed by {@link #onStart} and then {@link #onResume}.
		*
		* <p>For activities that are using raw {@link Cursor} objects (instead of
		* creating them through
		@@ -923,6 +923,7 @@ public class Activity extends ContextThemeWrapper
		* thrown.</em></p>
		*
		* @see #onStop
		* @see #onStart
		* @see #onResume
		*/
		protected void onRestart() {
		@@ -1220,7 +1221,7 @@ public class Activity extends ContextThemeWrapper

		/**
		* Called when you are no longer visible to the user. You will next
		* receive either {@link #onStart}, {@link #onDestroy}, or nothing,
		* receive either {@link #onRestart}, {@link #onDestroy}, or nothing,
		* depending on later user activity.
		*
		* <p>Note that this method may never be called, in low memory situations

core/java/android/hardware/SensorManager.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -620,6 +620,9 @@ public class SensorManager extends IRotationWatcher.Stub
		*/
		@Deprecated
		public boolean registerListener(SensorListener listener, int sensors, int rate) {
		if (listener == null) {
		return false;
		}
		boolean result = false;
		result = registerLegacyListener(SENSOR_ACCELEROMETER, Sensor.TYPE_ACCELEROMETER,
		listener, sensors, rate) \|\| result;
		@@ -638,6 +641,9 @@ public class SensorManager extends IRotationWatcher.Stub
		private boolean registerLegacyListener(int legacyType, int type,
		SensorListener listener, int sensors, int rate)
		{
		if (listener == null) {
		return false;
		}
		boolean result = false;
		// Are we activating this legacy sensor?
		if ((sensors & legacyType) != 0) {
		@@ -693,6 +699,9 @@ public class SensorManager extends IRotationWatcher.Stub
		private void unregisterLegacyListener(int legacyType, int type,
		SensorListener listener, int sensors)
		{
		if (listener == null) {
		return;
		}
		// do we know about this listener?
		LegacyListener legacyListener = null;
		synchronized (mLegacyListenersMap) {
		@@ -800,6 +809,9 @@ public class SensorManager extends IRotationWatcher.Stub
		*/
		public boolean registerListener(SensorEventListener listener, Sensor sensor, int rate,
		Handler handler) {
		if (listener == null \|\| sensor == null) {
		return false;
		}
		boolean result;
		int delay = -1;
		switch (rate) {
		@@ -856,6 +868,9 @@ public class SensorManager extends IRotationWatcher.Stub
		}

		private void unregisterListener(Object listener, Sensor sensor) {
		if (listener == null \|\| sensor == null) {
		return;
		}
		try {
		synchronized (sListeners) {
		final int size = sListeners.size();
		@@ -881,6 +896,9 @@ public class SensorManager extends IRotationWatcher.Stub
		}

		private void unregisterListener(Object listener) {
		if (listener == null) {
		return;
		}
		try {
		synchronized (sListeners) {
		final int size = sListeners.size();

core/java/android/inputmethodservice/SoftInputWindow.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,8 @@ class SoftInputWindow extends Dialog {
		lp.gravity = Gravity.BOTTOM;
		lp.width = -1;
		// Let the input method window's orientation follow sensor based rotation
		lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;
		// Turn this off for now, it is very problematic.
		//lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;

		getWindow().setAttributes(lp);
		getWindow().setFlags(

core/java/android/preference/Preference.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -667,7 +667,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* {@link SharedPreferences}. This should be unique for the package.
		*
		* @param key The key for the preference.
		* @see #getId()
		*/
		public void setKey(String key) {
		mKey = key;
		@@ -1460,7 +1459,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* @param container The Bundle in which to save the instance of this Preference.
		*
		* @see #restoreHierarchyState
		* @see #dispatchSaveInstanceState
		* @see #onSaveInstanceState
		*/
		public void saveHierarchyState(Bundle container) {
		@@ -1474,7 +1472,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		*
		* @param container The Bundle in which to save the instance of this Preference.
		*
		* @see #dispatchRestoreInstanceState
		* @see #saveHierarchyState
		* @see #onSaveInstanceState
		*/
		@@ -1503,7 +1500,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* The default implementation returns null.
		* @see #onRestoreInstanceState
		* @see #saveHierarchyState
		* @see #dispatchSaveInstanceState
		*/
		protected Parcelable onSaveInstanceState() {
		mBaseMethodCalled = true;
		@@ -1516,7 +1512,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* @param container The Bundle that holds the previously saved state.
		*
		* @see #saveHierarchyState
		* @see #dispatchRestoreInstanceState
		* @see #onRestoreInstanceState
		*/
		public void restoreHierarchyState(Bundle container) {
		@@ -1530,7 +1525,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* not want to save state for their children.
		*
		* @param container The Bundle that holds the previously saved state.
		* @see #dispatchSaveInstanceState
		* @see #restoreHierarchyState
		* @see #onRestoreInstanceState
		*/
		@@ -1557,7 +1551,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		* {@link #onSaveInstanceState}.
		* @see #onSaveInstanceState
		* @see #restoreHierarchyState
		* @see #dispatchRestoreInstanceState
		*/
		protected void onRestoreInstanceState(Parcelable state) {
		mBaseMethodCalled = true;