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
Merge commit 'a183cb5ebd974096afe2335cd4254de68d55021e' into eclair-plus-aosp
* commit 'a183cb5ebd974096afe2335cd4254de68d55021e':
Removed last bits of predefined element types from native code. Predefined types are now constructed at the java layer from standard building blocks.
* 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.
* changes:
Removed last bits of predefined element types from native code. Predefined types are now constructed at the java layer from standard building blocks.
Merge commit 'd0b584148bdcc219136d92e2034e316ae50c8151' into eclair-plus-aosp
* commit 'd0b584148bdcc219136d92e2034e316ae50c8151':
Make tritex test run with latest OpenGL driver.
Merge commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7' into eclair-plus-aosp
* commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7':
Add call log support to pim.vcard.VCardComposer
Use EGLUtils::selectConfigForNativeWindow to select a legitimate
configuration. (Before now we had been selecting an incorrect
configuration, but the older drivers let us get away with it.)
Converted the source to C++ so we can call selectConfigForNativeWindow.
Merge commit '1267b0e1844ac802de92b203007513573e4886fd' into eclair-plus-aosp
* commit '1267b0e1844ac802de92b203007513573e4886fd':
Publish minor additions to GLSurfaceView API.
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.
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 'b4ef3334ca45ce43f8ed9e193e2b63208bb9624b' into eclair-plus-aosp
* commit 'b4ef3334ca45ce43f8ed9e193e2b63208bb9624b':
Change the way DRT determines if it is ready to continue to the next test when running in automated mode.
Merge commit '13ab701e0ab315d75edc03876bf3dc959e6f478c' into eclair-plus-aosp
* commit '13ab701e0ab315d75edc03876bf3dc959e6f478c':
Make the new ContactsContract APIs public.
Merge commit '9251c344596847c4cd4cf5782fde078459fa4cea' into eclair-plus-aosp
* commit '9251c344596847c4cd4cf5782fde078459fa4cea':
use new setDither on ImageRef to retain that setting for purgeable images
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.
Merge commit 'f259901d31738ae4b595d5072e9c8afc1e21ca9a' into eclair-plus-aosp
* commit 'f259901d31738ae4b595d5072e9c8afc1e21ca9a':
keystore: remove old implementation and test.
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp
* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'f11cc96ee837f8b0d530f3a5dd78ffc358727411' into eclair-plus-aosp
* commit 'f11cc96ee837f8b0d530f3a5dd78ffc358727411':
KeyStore: remove classes used by old keystore.
