Merge commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8' into eclair-plus-aosp
* commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8':
Add final to appropriate variables.
Merge commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa' into eclair-plus-aosp
* commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa':
ResultTransport needs a default value. If the thread is
* changes:
ResultTransport needs a default value. If the thread is ununlocked by something else other than CallbackProxy's notify(), it can have a null value.
Merge commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7' into eclair-plus-aosp
* commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7':
Add call log support to pim.vcard.VCardComposer
Merge commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215' into eclair-plus-aosp
* commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215':
Restrict touch to the view height with the title. This
* changes:
Restrict touch to the view height with the title. This should fix the links in the bottom of the screen are not touchable when title bar presents.
should fix the links in the bottom of the screen are not
touchable when title bar presents.
Also fix a bug in calcOutContentVisibleRect. We need to
adjust visibleTitleHeight for the top, but we should not
do it for the bottom. Otherwise, WebKit will have the
wrong visible rect and it will think the part right under
the bottom of the screen are visible.
Fix http://b/issue?id=2140971
Merge commit '4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d' into eclair-plus-aosp
* commit '4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d':
Clear the device's data from the transport when backup is disabled
Turning off backup in the Settings UI constitutes an opt-out of the whole
mechanism. For privacy reasons we instruct the backend to wipe all of the data
belonging to this device when the user does this. If the attempt fails it is
rescheduled in the future based on the transport's requestBackupTime()
suggestion. If network connectivity changes prompt the transport to indicate a
backup pass is appropriate "now," any pending init operation is processed before
the backup schedule is resumed.
The broadcasts used internally to the backup manager are now fully protected;
third party apps can neither send nor receive them.
(Also a minor logging change; don't log 'appropriate' EOF encountered during
parsing of a backup data stream.)
Merge commit 'bb339eadcb4a3ffd2dc861ffb0f268a49238fd03' into eclair-plus-aosp
* commit 'bb339eadcb4a3ffd2dc861ffb0f268a49238fd03':
fix bug where siilent mode dissapears when it triggers instead of animating off to the left edge.
Merge commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49' into eclair-plus-aosp
* commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49':
Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
Merge commit '9f8d59eea1bdb3f979aaa8a5bdf9b1bdada7728b' into eclair-plus-aosp
* commit '9f8d59eea1bdb3f979aaa8a5bdf9b1bdada7728b':
Update RotarySelector to support vertical orientation, and add resolution specific assets (removing old ones).
Merge commit '13ab701e0ab315d75edc03876bf3dc959e6f478c' into eclair-plus-aosp
* commit '13ab701e0ab315d75edc03876bf3dc959e6f478c':
Make the new ContactsContract APIs public.
Open a draft MMS message having some subject, some text and any attachment.
Remove the written subject and again save it as draft. In the messaging
main screen, can still see previously entered subject.
Change-Id: I1a30978b7c06fab253ea5d4da0254c3780d18a62
Merge commit '9251c344596847c4cd4cf5782fde078459fa4cea' into eclair-plus-aosp
* commit '9251c344596847c4cd4cf5782fde078459fa4cea':
use new setDither on ImageRef to retain that setting for purgeable images
Note that there are a few new assets here that don't exist
in mdpi (and aren't yet referenced by code):
core/res/res/drawable-hdpi/stat_sys_signal_0_cdma.png
core/res/res/drawable-hdpi/stat_sys_signal_1_cdma.png
core/res/res/drawable-hdpi/stat_sys_signal_2_cdma.png
core/res/res/drawable-hdpi/stat_sys_signal_3_cdma.png
core/res/res/drawable-hdpi/stat_sys_signal_4_cdma.png
core/res/res/drawable-hdpi/stat_sys_signal_evdo_0.png
core/res/res/drawable-hdpi/stat_sys_signal_evdo_1.png
core/res/res/drawable-hdpi/stat_sys_signal_evdo_2.png
core/res/res/drawable-hdpi/stat_sys_signal_evdo_3.png
core/res/res/drawable-hdpi/stat_sys_signal_evdo_4.png
Merge commit 'a7beb95ede9700b1f206ffa571c205c9b7e68539' into eclair-plus-aosp
* commit 'a7beb95ede9700b1f206ffa571c205c9b7e68539':
Add possibility to customize the chooser dialog used to allow the user to choose the application for sharing a link.
Merge commit 'd421995fdb490c687d27b56aa89bc83afc7c3d06' into eclair-plus-aosp
* commit 'd421995fdb490c687d27b56aa89bc83afc7c3d06':
Fix parsing of HTTP Date years.
Merge commit '23703f16f816d4212e5a95c101a851660c095f24' into eclair-plus-aosp
* commit '23703f16f816d4212e5a95c101a851660c095f24':
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
