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 '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 '3bfca6a3a78dee6ff695e4a1b273a939109b07ac'
* commit '3bfca6a3a78dee6ff695e4a1b273a939109b07ac':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
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 'e0751066b05eda8532b7c7d9d55003796490e334' into eclair-mr2-plus-aosp
* commit 'e0751066b05eda8532b7c7d9d55003796490e334':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-mr2
* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
don't request a sync when temp providers are created
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-mr2
* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-mr2
* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
Use computeVerticalScrollRange() to find the bottom
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-mr2
* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
Return an empty PluginList instead of null for the
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-mr2
* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-mr2
* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
Merge commit '7efa671569955aead877d10e7d6b1fa3129184a4'
* commit '7efa671569955aead877d10e7d6b1fa3129184a4':
Make the RegisteredSErvices Cache not allow the registered service for a
Merge commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4' into eclair-mr2-plus-aosp
* commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4':
Make the RegisteredSErvices Cache not allow the registered service for a
Merge commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4' into eclair-mr2-plus-aosp
* commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4':
Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-plus-aosp
* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
don't request a sync when temp providers are created
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-plus-aosp
* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-plus-aosp
* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
Use computeVerticalScrollRange() to find the bottom
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-plus-aosp
* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
Return an empty PluginList instead of null for the
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-plus-aosp
* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-plus-aosp
* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
This flag is necessary for applications to specifythat their daa is never to be encrypted when the encrypted file system feature is
commplete and enabled.
Encrypted File Systems project.
Adding android:neverEncrypt flag to AndroidManifest.XML to allow packages to opt-out from EFS features.
Encrypted File Systems Project.
Fixing white spaces and end-line issues.
Encrypted File SYstems Project: opt-out flag.
Removed AndroidManifest.xml changes, as will make that change in a separate integration.
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-mr2
* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
