Merge branch 'android-framework.lnx.2.0.r5-rel' of... (552d81e3) · Commits · e / os / android_frameworks_base

core/java/android/app/AlarmManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,12 @@ public class AlarmManager {
		*/
		public static final String POWER_OFF_ALARM_INSTANCE_FILE =
		"/persist/alarm/powerOffAlarmInstance";

		/**
		* @hide
		*/
		public static final String POWER_OFF_ALARM_TIMEZONE_FILE =
		"/persist/alarm/timezone";
		/**
		* @hide
		*/

+20 −1

Original line number	Diff line number	Diff line
		@@ -208,6 +208,24 @@ public class CallLog {
		*/
		public static final int BLACKLIST_TYPE = 8;

		/** Call log type for missed IMS calls. */
		private static final int MISSED_IMS_TYPE = 10;
		/**
		* Call log type for incoming WiFi calls.
		* @hide
		*/
		public static final int INCOMING_WIFI_TYPE = 20;
		/**
		* Call log type for outgoing WiFi calls.
		* @hide
		*/
		public static final int OUTGOING_WIFI_TYPE = 21;
		/**
		* Call log type for missed WiFi calls.
		* @hide
		*/
		public static final int MISSED_WIFI_TYPE = 22;

		/**
		* Bit-mask describing features of the call (e.g. video).
		*
		@@ -652,7 +670,8 @@ public class CallLog {
		values.put(NEW, Integer.valueOf(1));
		values.put(ADD_FOR_ALL_USERS, addForAllUsers ? 1 : 0);

		if (callType == MISSED_TYPE) {
		if (callType == MISSED_TYPE \|\| callType == MISSED_IMS_TYPE
		\|\| callType == MISSED_WIFI_TYPE) {
		values.put(IS_READ, Integer.valueOf(is_read ? 1 : 0));
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -2166,6 +2166,13 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		// TODO: Move somewhere sane. This doesn't belong in onLayout().
		if (mFastScroll != null) {
		mFastScroll.onItemCountChanged(getChildCount(), mItemCount);
		//This may call internalSetPadding and cause children dirty.
		//So need to layout children again.
		if(isLayoutRequested()){
		mInLayout = true;
		layoutChildren();
		mInLayout = false;
		}
		}
		}

+10 −2

Original line number	Diff line number	Diff line
		@@ -138,7 +138,15 @@ public class MenuPopupWindow extends ListPopupWindow implements MenuItemHoverLis
		setNextSelectedPositionInt(INVALID_POSITION);

		// Close only the top-level menu.
		((MenuAdapter) getAdapter()).getAdapterMenu().close(false /* closeAllMenus */);
		final ListAdapter adapter = getAdapter();
		final MenuAdapter menuAdapter;
		if (adapter instanceof HeaderViewListAdapter) {
		final HeaderViewListAdapter headerAdapter = (HeaderViewListAdapter) adapter;
		menuAdapter = (MenuAdapter) headerAdapter.getWrappedAdapter();
		} else {
		menuAdapter = (MenuAdapter) adapter;
		}
		menuAdapter.getAdapterMenu().close(false /* closeAllMenus */);
		return true;
		}
		return super.onKeyDown(keyCode, event);

+16 −0

Original line number	Diff line number	Diff line
		@@ -1921,6 +1921,22 @@ public class StateMachine {
		return false;
		}

		/**
		* Check if there are any pending messages with code 'what' in deferred messages queue.
		*/
		protected final boolean hasDeferredMessages(int what, Object obj) {
		SmHandler smh = mSmHandler;
		if (smh == null) return false;

		Iterator<Message> iterator = smh.mDeferredMessages.iterator();
		while (iterator.hasNext()) {
		Message msg = iterator.next();
		if ((msg.what == what) && (msg.obj == obj)) return true;
		}

		return false;
		}

		/**
		* Check if there are any pending posts of messages with code 'what' in
		* the message queue. This does NOT check messages in deferred message queue.