Merge commit 'bfbd2bcd0f15f9b709275a85b444c8fd7ea6192d'
* commit 'bfbd2bcd0f15f9b709275a85b444c8fd7ea6192d':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Merge commit 'fb745d27901a77d3215f32adf426e5f864a1aa01' into eclair-mr2-plus-aosp
* commit 'fb745d27901a77d3215f32adf426e5f864a1aa01':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Merge commit 'b1c62ebf92fe20d006023bfa6fbf2cc731c69e4e' into eclair-mr2-plus-aosp
* commit 'b1c62ebf92fe20d006023bfa6fbf2cc731c69e4e':
New Javadoc for ContactsContract.
Merge commit '5bb200fde2306d9da1972a81c0238c26ca6f475b' into eclair-mr2-plus-aosp
* commit '5bb200fde2306d9da1972a81c0238c26ca6f475b':
Debugging for issue #2250075: Desk dock clock app sometimes doesn't
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-mr2
* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-mr2
* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
New Javadoc for ContactsContract.
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-mr2
* commit '2ade6421f2d6dd615b559c951deace7143958b90':
Debugging for issue #2250075: Desk dock clock app sometimes doesn't
You can no longer receive CONFIGURATION_CHANGED in a manifest, which is really really
bad (launching apps every time the screen is rotated!). A new LOCALE_CHANGED broadcast
is sent that you can receive in a manifest.
Change-Id: I80022375f0716db2e672382a29db3cea1af74702
Merge commit '8ffc24544fe3e4d58d07fdaa2bf4c120277b0bd7' into eclair-mr2-plus-aosp
* commit '8ffc24544fe3e4d58d07fdaa2bf4c120277b0bd7':
Add new date formats for the lock screen.
Merge commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea' into eclair-mr2
* commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea':
Add new date formats for the lock screen.
This adds a history of the last 100 broadcasts that is printed in the
debug log, to be able to see what recently happened at the time the
bug report was taken. Also does some optimization of the printing of
the broadcast records to make it feasible to print this number of
entries. (We kind-of need to do this because there are some broadcasts
like SIG_STR and SYNC_STATE_CHANGED that are being broadcast a LOT.)
Change-Id: I775e1ec0f63369c8bca8c83cee27b95ddc5ec450
Merge commit 'e614f9382799826ca11960eb8ffacb677e2a2b1b'
* commit 'e614f9382799826ca11960eb8ffacb677e2a2b1b':
Don't feed the timezone to RenderScript time functions, let the library figure it out.
Merge commit '2cd22586ab5c16a5caaeb4ec7114b040e07fd6bc'
* commit '2cd22586ab5c16a5caaeb4ec7114b040e07fd6bc':
Do not force screen on when undocking from the desk dock.
Merge commit 'f291a68dbff5fb74696204b2a0bc49d5eba67c93'
* commit 'f291a68dbff5fb74696204b2a0bc49d5eba67c93':
don't request a sync when temp providers are created
Merge commit 'c536bea4df43196a9ec3f20aee5b3cc1509fe6c0'
* commit 'c536bea4df43196a9ec3f20aee5b3cc1509fe6c0':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit 'ebecde29c56778534d619af867d0042d5337b066'
* commit 'ebecde29c56778534d619af867d0042d5337b066':
Use computeVerticalScrollRange() to find the bottom
Merge commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd'
* commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd':
Return an empty PluginList instead of null for the
Merge commit 'ad902f06dd44e30286c48c8a28bb2509b80c63bc'
* commit 'ad902f06dd44e30286c48c8a28bb2509b80c63bc':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit 'dfaec0d987f8f8e8822f554020795bea090e96c1'
* commit 'dfaec0d987f8f8e8822f554020795bea090e96c1':
Throttle nitz updates as the are too numerous on cdma.
Merge commit '3bfca6a3a78dee6ff695e4a1b273a939109b07ac'
* commit '3bfca6a3a78dee6ff695e4a1b273a939109b07ac':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
Merge commit '462e56eb2752f9fe28d93debb70badd6a32e7d47'
* commit '462e56eb2752f9fe28d93debb70badd6a32e7d47':
Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
Merge commit 'b56679a9e4e8ed0e2c626cd7f1f7655fab7e61dc'
* commit 'b56679a9e4e8ed0e2c626cd7f1f7655fab7e61dc':
Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit 'a4b8a30ccb3669eaa13eb848b59f6c3faa12b282'
* commit 'a4b8a30ccb3669eaa13eb848b59f6c3faa12b282':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Merge commit 'dac92e6fb6a29d827b9cbee7712ca07218bb55da' into eclair-mr2-plus-aosp
* commit 'dac92e6fb6a29d827b9cbee7712ca07218bb55da':
Don't feed the timezone to RenderScript time functions, let the library figure it out.
Merge commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b' into eclair-mr2-plus-aosp
* commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b':
Do not force screen on when undocking from the desk dock.
Merge commit 'd73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb' into eclair-mr2-plus-aosp
* commit 'd73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb':
don't request a sync when temp providers are created
Merge commit '6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09' into eclair-mr2-plus-aosp
* commit '6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit '9f4baf308daebbad0d3a634b158f3eb4ae532d39' into eclair-mr2-plus-aosp
* commit '9f4baf308daebbad0d3a634b158f3eb4ae532d39':
Use computeVerticalScrollRange() to find the bottom
Merge commit '09550fde489a6d5155f005fec9b328f1b2a878a6' into eclair-mr2-plus-aosp
* commit '09550fde489a6d5155f005fec9b328f1b2a878a6':
Return an empty PluginList instead of null for the
Merge commit '052908a5d93f3d842cd7a9d8eda5acd3d9565b69' into eclair-mr2-plus-aosp
* commit '052908a5d93f3d842cd7a9d8eda5acd3d9565b69':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit 'f7394fcaedbbf84f7934d0bfcc157948a2d5c166' into eclair-mr2-plus-aosp
* commit 'f7394fcaedbbf84f7934d0bfcc157948a2d5c166':
Throttle nitz updates as the are too numerous on cdma.
Merge commit 'e0751066b05eda8532b7c7d9d55003796490e334' into eclair-mr2-plus-aosp
* commit 'e0751066b05eda8532b7c7d9d55003796490e334':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
