Merge commit '4e552b606cc9fc3e6cac210b3894974709531ec1' into eclair-mr2-plus-aosp
* commit '4e552b606cc9fc3e6cac210b3894974709531ec1':
Add BMW and Audi to Auto Pairing black list.
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-mr2
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
Merge commit '4888c7da45b356bfcff5a6564150ca95a0a0afcf' into eclair-mr2-plus-aosp
* commit '4888c7da45b356bfcff5a6564150ca95a0a0afcf':
Honor the mInitialScale set on WebView. This was
Merge commit '207d00c13c02d301ff4ec302b1ee8cd7c256a4a5' into eclair-mr2-plus-aosp
* commit '207d00c13c02d301ff4ec302b1ee8cd7c256a4a5':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-mr2
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-mr2
* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.
Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
* changes:
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states. Tweak "animation" to be 250ms based on conversation with ui guys. Some minor performance tweaks to SlidingTab.
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
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 '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 '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 '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
