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 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-mr2
* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
* 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
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-mr2
* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
This change is based on the change I319bf9ee, but different in that there's no test, since
test framework for vCard code is just in MR2, not in MR1.
Internal issue number: 2246410
Dr.NO: Hiroshi
The previous implementation selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object without valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.
Dr.NO: Hiroshi
Internal issue number: 2252304
Merge commit '0cda59112526c03f3b8be0eb885926b7515df756' into eclair-mr2-plus-aosp
* commit '0cda59112526c03f3b8be0eb885926b7515df756':
Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Previous change selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object withouth valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.
Add a unit test for this fix.
Internal issue number: 2252304
* changes:
Make the RegisteredSErvices Cache not allow the registered service for a type to change without first uninstalling the previous service for that type, unless the newly installed service is in the system image.
