Fred Quintana
409e512174
am 5e787c42: - add a "isSyncable" flag to a given account/authority pair that indicates whether or not syncs should be attempted for it. - add public methods to get and set this parameter
...
Merge commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614'
* commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614':
- add a "isSyncable" flag to a given account/authority pair that
2009-08-17 13:07:26 -07:00
Romain Guy
08eb04b34d
am 76c830b2: Merge change 21540 into eclair
...
Merge commit '76c830b229fc21d5ea0ea28955084cc187e25fc6'
* commit '76c830b229fc21d5ea0ea28955084cc187e25fc6':
Fix listview clicks with the trackball.
2009-08-17 13:05:05 -07:00
Android (Google) Code Review
f2e4302a06
Merge change 21540 into eclair
...
* changes:
Fix listview clicks with the trackball.
2009-08-17 13:00:26 -07:00
Mathias Agopian
ea506aeefa
am 0ef135d5: Merge change 21537 into eclair
...
Merge commit '0ef135d5c79ff5b443b43f8743250044700a8bb5'
* commit '0ef135d5c79ff5b443b43f8743250044700a8bb5':
really be more friendly with C
2009-08-17 12:40:41 -07:00
Android (Google) Code Review
63cb51f1cc
Merge change 21537 into eclair
...
* changes:
really be more friendly with C
2009-08-17 12:37:25 -07:00
Mathias Agopian
37b2a3744c
really be more friendly with C
2009-08-17 12:33:20 -07:00
Dan Murphy
1aadb96223
am 921831b4: Merge change 21522 into eclair
...
Merge commit '921831b4dcad1898c265889430a32367e99ef6c1'
* commit '921831b4dcad1898c265889430a32367e99ef6c1':
Dock changes:Docking station intents
2009-08-17 12:31:44 -07:00
Android (Google) Code Review
da5779d981
Merge change 21522 into eclair
...
* changes:
Dock changes:Docking station intents
2009-08-17 12:27:06 -07:00
Dianne Hackborn
c32de5c690
am 1a797546: Merge change 21380 into eclair
...
Merge commit '1a797546d75d2c85d6fefeefdc55de051aa66018'
* commit '1a797546d75d2c85d6fefeefdc55de051aa66018':
More work on wallpapers.
2009-08-17 11:52:06 -07:00
Android (Google) Code Review
d7b5ba34fd
Merge change 21380 into eclair
...
* changes:
More work on wallpapers.
2009-08-17 11:46:57 -07:00
Romain Guy
4281a93a46
am 54ba86f0: Merge change 21512 into eclair
...
Merge commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5'
* commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5':
Honor the clickable and enabled properties in ListView.
2009-08-17 11:09:21 -07:00
Android (Google) Code Review
50ba9f09b2
Merge change 21512 into eclair
...
* changes:
Honor the clickable and enabled properties in ListView.
2009-08-17 11:07:08 -07:00
Mike Lockwood
3f13c75a03
am 9dc2355b: Merge change 21492 into eclair
...
Merge commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8'
* commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
WifiService: Hash based on both SSID and BSSID in scan result cache.
2009-08-17 10:59:49 -07:00
Mike Lockwood
e8188e6723
am 56e7ba29: Merge change 21510 into eclair
...
Merge commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c'
* commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c':
LocationManagerService: Add NullPointerException to avoid change in behavior.
2009-08-17 10:59:46 -07:00
Andreas Huber
5722559ef7
am ffbd2426: Merge change 21340 into eclair
...
Merge commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'
* commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
Squashed commit of the following:
2009-08-17 10:59:41 -07:00
Jeff Sharkey
24789b730d
am fd0d6275: Fix ExpandableListView context menus when has header views.
...
Merge commit 'fd0d627569cb250f7060a83161cc845b9616e5a1'
* commit 'fd0d627569cb250f7060a83161cc845b9616e5a1':
Fix ExpandableListView context menus when has header views.
2009-08-17 10:59:35 -07:00
Amith Yamasani
4775fa8524
am 7d68dae9: Merge change 21494 into eclair
...
Merge commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e'
* commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e':
Allow animation styles to be applied to popup windows.
2009-08-17 10:59:30 -07:00
Grace Kloba
27517606f6
am 86192c61: Merge change 21442 into eclair
...
Merge commit '86192c614c317b428e10c2dc9052a07304aa6c3f'
* commit '86192c614c317b428e10c2dc9052a07304aa6c3f':
Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
2009-08-17 10:59:21 -07:00
Mike Lockwood
d09143cd78
am 6ba7ae1e: LocationManagerService: Fix null pointer check in sendExtraCommand().
...
Merge commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628'
* commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628':
LocationManagerService: Fix null pointer check in sendExtraCommand().
2009-08-17 10:59:12 -07:00
Chih-Chung Chang
a89dc14b8d
am 0ff7a463: Merge change 21473 into eclair
...
Merge commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0'
* commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0':
Fix 1860351: Put datetime in jpeg exif to datetaken field.
2009-08-17 10:59:05 -07:00
Mike Lockwood
3f03bb9431
am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:
...
Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba'
* commit '06952d9299c23ee15df0825e75934971cfecf2ba':
DO NOT MERGE - cherry-picked from master:
2009-08-17 10:59:02 -07:00
Romain Guy
cb5456400e
am 8af2d225: Merge change 21471 into eclair
...
Merge commit '8af2d22552c61d8d4e09e52287f056428172ab05'
* commit '8af2d22552c61d8d4e09e52287f056428172ab05':
Add Galaxy wallpaper
2009-08-17 10:58:55 -07:00
Android (Google) Code Review
2141331742
Merge change 21492 into eclair
...
* changes:
WifiService: Hash based on both SSID and BSSID in scan result cache.
2009-08-17 10:47:06 -07:00
Android (Google) Code Review
a72133feab
Merge change 21510 into eclair
...
* changes:
LocationManagerService: Add NullPointerException to avoid change in behavior.
2009-08-17 10:29:23 -07:00
Android (Google) Code Review
f30da55b5f
Merge change 21340 into eclair
...
* changes:
Squashed commit of the following:
2009-08-17 10:27:41 -07:00
Android (Google) Code Review
be848032fa
Merge change 21494 into eclair
...
* changes:
Allow animation styles to be applied to popup windows.
2009-08-17 09:48:55 -07:00
Android (Google) Code Review
47dfb76836
Merge change 21442 into eclair
...
* changes:
Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
2009-08-17 09:19:23 -07:00
Android (Google) Code Review
ad5540c99e
Merge change 21473 into eclair
...
* changes:
Fix 1860351: Put datetime in jpeg exif to datetaken field.
2009-08-17 05:16:14 -07:00
Android (Google) Code Review
eb288f6f16
Merge change 21471 into eclair
...
* changes:
Add Galaxy wallpaper
2009-08-16 23:24:12 -07:00
Fred Quintana
24d181f151
am 106278c4: (-s ours) Merge change 21432 into eclair
...
Merge commit '106278c40271fec941a86e5eac66ae5c8477a56a'
* commit '106278c40271fec941a86e5eac66ae5c8477a56a':
do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
2009-08-16 17:20:21 -07:00
Android (Google) Code Review
9737134476
Merge change 21432 into eclair
...
* changes:
do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
2009-08-16 17:14:20 -07:00
Jeff Sharkey
89c4831158
am 403d7ac7: Bring back SHOULD_SYNC flag so sync groups can be edited.
...
Merge commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90'
* commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90':
Bring back SHOULD_SYNC flag so sync groups can be edited.
2009-08-16 16:39:35 -07:00
Yong Zhang
24a82530b3
am fa2944d9: Replace loop-delay in setPowerStateToDesired() with async approach
...
Merge commit 'fa2944d93f4c5050fb4a99d90006791c2995b31c'
* commit 'fa2944d93f4c5050fb4a99d90006791c2995b31c':
Replace loop-delay in setPowerStateToDesired() with async approach
2009-08-15 15:32:21 -07:00
Wink Saville
515ca33144
am e6a9bcb7: A hack that when restartRadio is called the CdmaDataConnectionTracker to retry a connection and possibly reconnect after a temporary data loss.
...
Merge commit 'e6a9bcb7e8280512b0f68230fb72a004f86c8ae1'
* commit 'e6a9bcb7e8280512b0f68230fb72a004f86c8ae1':
A hack that when restartRadio is called the CdmaDataConnectionTracker
2009-08-15 11:21:41 -07:00
Wink Saville
380476f5fc
am ad4d9e5b: Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS and when data roaming is enabled reset the retry manager.
...
Merge commit 'ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d'
* commit 'ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d':
Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS
2009-08-15 09:51:29 -07:00
Dianne Hackborn
b58cd66582
am 549db46c: Merge change 21413 into eclair
...
Merge commit '549db46cb31725a66cd32ad4e0abb0d60d893fca'
* commit '549db46cb31725a66cd32ad4e0abb0d60d893fca':
Fix aapt to be able to add configs from overlays.
2009-08-15 00:05:29 -07:00
Android (Google) Code Review
0f20df37da
Merge change 21413 into eclair
...
* changes:
Fix aapt to be able to add configs from overlays.
2009-08-15 00:02:36 -07:00
Mathias Agopian
84ef0d237a
am 7193a587: Merge change 21401 into eclair
...
Merge commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836'
* commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836':
make sure to update a surface's usage bits when it changes, instead of only the first time.
2009-08-14 20:11:09 -07:00
Android (Google) Code Review
6df76d698b
Merge change 21401 into eclair
...
* changes:
make sure to update a surface's usage bits when it changes, instead of only the first time.
2009-08-14 20:07:51 -07:00
Mathias Agopian
ba5972ffdc
make sure to update a surface's usage bits when it changes, instead of only the first time.
...
also fixed a few locking issues in Surface and commented how each member is protected.
2009-08-14 18:52:17 -07:00
Mike Lockwood
734fff252a
am 82726f04: Merge change 21298 into eclair
...
Merge commit '82726f045de91b899502a54ca76d234c43a1ba4b'
* commit '82726f045de91b899502a54ca76d234c43a1ba4b':
ConnectivityService: Do not send broadcasts until the system is ready.
2009-08-14 18:45:40 -07:00
Android (Google) Code Review
7b9bf05445
Merge change 21298 into eclair
...
* changes:
ConnectivityService: Do not send broadcasts until the system is ready.
2009-08-14 18:41:56 -07:00
Wei Huang
5907379bd2
am c650bf58: Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.
...
Merge commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8'
* commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8':
Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.
2009-08-14 17:00:02 -07:00
Dmitri Plotnikov
8cba8c612e
am adb4a72d: Merge change 21364 into eclair
...
Merge commit 'adb4a72d7bcf7351e76ca722b1a9c2a1d5a0d55e'
* commit 'adb4a72d7bcf7351e76ca722b1a9c2a1d5a0d55e':
Moving contacts-specific strings to donottranslate files.
2009-08-14 16:07:59 -07:00
Android (Google) Code Review
e79366b4f9
Merge change 21364 into eclair
...
* changes:
Moving contacts-specific strings to donottranslate files.
2009-08-14 16:04:29 -07:00
Sahil Sachdeva
edaa14474a
am c9706f02: (-s ours) DO NOT MERGE, ALready merged to master. 1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
...
Merge commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069'
* commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069':
DO NOT MERGE, ALready merged to master.
2009-08-14 15:38:30 -07:00
Mike Reed
0356af48c1
am 87224294: Merge change 21311 into eclair
...
Merge commit '872242948184d7b6fed8b127d8ba8386487dc826'
* commit '872242948184d7b6fed8b127d8ba8386487dc826':
fix documentation
2009-08-14 15:13:20 -07:00
Dianne Hackborn
9a909211d1
am 410676bb: Merge change 21307 into eclair
...
Merge commit '410676bbac107726499589b665ef61e3d47355ab'
* commit '410676bbac107726499589b665ef61e3d47355ab':
Turn off static live wallpaper for now.
2009-08-14 15:13:18 -07:00
Leon Scroggins
d9c2fc3c32
am f58ffac2: Hide the title bar when zoomed in.
...
Merge commit 'f58ffac202b5a15f4bbfd5512c58f202a992f594'
* commit 'f58ffac202b5a15f4bbfd5512c58f202a992f594':
Hide the title bar when zoomed in.
2009-08-14 15:13:15 -07:00
Android (Google) Code Review
3f423abdee
Merge change 21311 into eclair
...
* changes:
fix documentation
2009-08-14 12:38:51 -07:00