Commit Graph

5517 Commits

Author SHA1 Message Date
Evan Millar
80a6ca15d3 am 5bb45740: Merge change 26459 into eclair
Merge commit '5bb45740d9554298dc19d8275c200f9fddbd2d6e' into eclair-plus-aosp

* commit '5bb45740d9554298dc19d8275c200f9fddbd2d6e':
  New fasttrack assets.
2009-09-22 15:50:56 -07:00
Costin Manolache
d168a80b05 am 4271c7c3: Merge change 26449 into eclair
Merge commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a' into eclair-plus-aosp

* commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a':
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 15:50:31 -07:00
Android (Google) Code Review
4f954e89e9 Merge change 26457 into eclair
* changes:
  Don't restore any setting that we don't think should be backed up
2009-09-22 18:47:14 -04:00
Android (Google) Code Review
b7d8f999ba Merge change 26459 into eclair
* changes:
  New fasttrack assets.
2009-09-22 18:32:46 -04:00
Android (Google) Code Review
f38f760972 Merge change 26449 into eclair
* changes:
  Keep track of 'initial' sync state in SyncStatusInfo
2009-09-22 18:28:58 -04:00
Mark Wagner
27872004ab am 63147705: Merge change 26437 into eclair
Merge commit '63147705bc2893d6ad43270e04beb9ee01e2ad53' into eclair-plus-aosp

* commit '63147705bc2893d6ad43270e04beb9ee01e2ad53':
  Don't show the badge background when we have no uri, email, or phone.
2009-09-22 14:39:02 -07:00
Christopher Tate
d08b3ba065 am b03b3bbd: If backup fails, reenqueue all of the affected packages for next time.
Merge commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3' into eclair-plus-aosp

* commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3':
  If backup fails, reenqueue all of the affected packages for next time.
2009-09-22 14:38:51 -07:00
Android (Google) Code Review
58807ca3b7 Merge change 26437 into eclair
* changes:
  Don't show the badge background when we have no uri, email, or phone.
2009-09-22 17:28:59 -04:00
Karl Rosaen
446cf5f1a9 am 36dac6ae: Merge change 26390 into eclair
Merge commit '36dac6ae8e005f0247e44345727d1580b1623127' into eclair-plus-aosp

* commit '36dac6ae8e005f0247e44345727d1580b1623127':
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-22 14:08:35 -07:00
Dianne Hackborn
814accd1b2 am 9bfb7075: Various fixes and improvements to window, activity.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp

* commit '9bfb707597898f54722460b48588007b682f3e2a':
  Various fixes and improvements to window, activity.
2009-09-22 14:08:22 -07:00
Android (Google) Code Review
f8fac5acb8 Merge change 26390 into eclair
* changes:
  Bring the dimples back, and make the "spin around" animation have a fling feeling.
2009-09-22 17:01:13 -04:00
Derek Sollenberger
9fdcdbd8c1 am c0b8a96d: launching plugin activity when a plugin requests to go full screen.
Merge commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf' into eclair-plus-aosp

* commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf':
  launching plugin activity when a plugin requests to go full screen.
2009-09-22 13:39:39 -07:00
Jaikumar Ganesh
63807d1f85 am 34ca22d2: Merge change 26366 into eclair
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp

* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
  Set the bonding for incoming connections only when authentication is requested.
2009-09-22 13:08:08 -07:00
Dan Egnor
57ae9dc8fa am 6c644f24: Merge change 26379 into eclair
Merge commit '6c644f248f553898248b8a6948fac4d62874fedd' into eclair-plus-aosp

* commit '6c644f248f553898248b8a6948fac4d62874fedd':
  Add parameter for the restore set (device id) data is being restored from to the restore_start event
2009-09-22 13:07:57 -07:00
Android (Google) Code Review
a5ed401bef Merge change 26366 into eclair
* changes:
  Set the bonding for incoming connections only when authentication is requested.
2009-09-22 16:00:12 -04:00
Android (Google) Code Review
719255d352 Merge change 26379 into eclair
* changes:
  Add parameter for the restore set (device id) data is being restored from to the restore_start event
2009-09-22 15:49:58 -04:00
Bjorn Bringert
1f4861fbff am 916b2ca9: Merge change 26355 into eclair
Merge commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb' into eclair-plus-aosp

* commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb':
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-22 12:42:48 -07:00
Android (Google) Code Review
4a2d3e2dd3 Merge change 26355 into eclair
* changes:
  Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
2009-09-22 15:37:15 -04:00
Jason Sams
8973b56c50 am 78f180af: Merge change 26414 into eclair
Merge commit '78f180af218017898593021a0b7fdf9b38aa2b25' into eclair-plus-aosp

* commit '78f180af218017898593021a0b7fdf9b38aa2b25':
  Update viewport when height or width change.
2009-09-22 12:32:51 -07:00
Bjorn Bringert
d8ecf9fbf5 am af1eb148: Merge change 25465 into eclair
Merge commit 'af1eb148377f1dafacda429580b7cfe01781eb4d' into eclair-plus-aosp

* commit 'af1eb148377f1dafacda429580b7cfe01781eb4d':
  Reset typeface when changing from visible password inputType
2009-09-22 12:32:40 -07:00
Yu Shan Emily Lau
f25a5e7376 am 008fc5d1: Merge change 26332 into eclair
Merge commit '008fc5d142b58688a3827a544c524dff11204c62' into eclair-plus-aosp

* commit '008fc5d142b58688a3827a544c524dff11204c62':
  1) Add the wma / wmv profile reader.
2009-09-22 12:32:29 -07:00
Android (Google) Code Review
57096feba6 Merge change 26414 into eclair
* changes:
  Update viewport when height or width change.
2009-09-22 15:27:53 -04:00
Android (Google) Code Review
d99edc5912 Merge change 25465 into eclair
* changes:
  Reset typeface when changing from visible password inputType
2009-09-22 15:25:15 -04:00
Android (Google) Code Review
a64f9aa2e1 Merge change 26332 into eclair
* changes:
  1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2009-09-22 15:09:33 -04:00
Andrei Popescu
8c74c6aaa4 am dee76be4: Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp

* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
  Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
2009-09-22 12:02:59 -07:00
Grace Kloba
5be420557b am 24a3ff95: Change double tap toast to long toast.
Merge commit '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp

* commit '24a3ff958b87550904a71961835f6883d1411c27':
  Change double tap toast to long toast.
2009-09-22 12:02:46 -07:00
Nicolas Roard
fcf7cbc294 am 194099dc: Merge change 26220 into eclair
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp

* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
  Reimplement the settings to use async callbacks
2009-09-22 11:10:41 -07:00
Android (Google) Code Review
445e07ef71 Merge change 26220 into eclair
* changes:
  Reimplement the settings to use async callbacks
2009-09-22 14:02:44 -04:00
Jack Veenstra
f3aca89e3e am 06766900: Merge change 26323 into eclair
Merge commit '0676690091b348d939db0340c3a0d888683c1abb' into eclair-plus-aosp

* commit '0676690091b348d939db0340c3a0d888683c1abb':
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 10:35:24 -07:00
Patrick Scott
887e44b042 am d58ccff7: Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a' into eclair-plus-aosp

* commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a':
  Add a boolean indicating if the apple-touch-icon is precomposed.
2009-09-22 10:35:12 -07:00
Android (Google) Code Review
fc05dcfe81 Merge change 26323 into eclair
* changes:
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
2009-09-22 13:31:02 -04:00
Grace Kloba
4173ed0eed am 408cf852: Support the new dpi change in the WebView.
Merge commit '408cf85207a43c9169f9fb520a584d2858847d24' into eclair-plus-aosp

* commit '408cf85207a43c9169f9fb520a584d2858847d24':
  Support the new dpi change in the WebView.
2009-09-22 10:19:57 -07:00
Chih-Chung Chang
d356c8ac33 am 7b7029e0: Merge change 26236 into eclair
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.
2009-09-22 09:59:46 -07:00
Evan Millar
2936dcae6e am b5c29399: Merge change 26301 into eclair
Merge commit 'b5c2939904d7b374aee5b1f675c560e839a318f1' into eclair-plus-aosp

* commit 'b5c2939904d7b374aee5b1f675c560e839a318f1':
  Add aggregated badge to ContactHeaderWidget
2009-09-22 09:59:34 -07:00
Android (Google) Code Review
5f6f7c7c02 Merge change 26236 into eclair
* changes:
  Make media scanner read the jpeg orientation tag.
2009-09-22 12:51:24 -04:00
Android (Google) Code Review
cd7fedee7f Merge change 26301 into eclair
* changes:
  Add aggregated badge to ContactHeaderWidget
2009-09-22 12:49:20 -04:00
Eric Laurent
d82a9eb80d am 56b20860: Merge change 26349 into eclair
Merge commit '56b208602194a3923521bde1d87453ce3de39576' into eclair-plus-aosp

* commit '56b208602194a3923521bde1d87453ce3de39576':
  Fix issue 2116700: Ringer screwy while connected over Bluetooth.
2009-09-22 09:27:54 -07:00
Grace Kloba
5f8eabe25f am f53c1865: Don\'t snap the initialScale to min or max if it is not defined.
Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp

* commit 'f53c1865248dd2b38f8c24a0419d550330619b19':
  Don't snap the initialScale to min or max if it is not defined.
2009-09-22 09:22:51 -07:00
Chia-chi Yeh
19786993cc am 5b4aa6db: Merge change 26315 into eclair
Merge commit '5b4aa6db428263aa0a48ab3efb896df66a852bce' into eclair-plus-aosp

* commit '5b4aa6db428263aa0a48ab3efb896df66a852bce':
  VpnService: use Credentials instead of CertTool.
2009-09-22 09:22:40 -07:00
Android (Google) Code Review
c40ca463b7 Merge change 26349 into eclair
* changes:
  Fix issue 2116700: Ringer screwy while connected over Bluetooth.
2009-09-22 12:20:38 -04:00
Android (Google) Code Review
1f3c744750 Merge change 26315 into eclair
* changes:
  VpnService: use Credentials instead of CertTool.
2009-09-22 12:02:39 -04:00
Mike Reed
1516dd4043 am 585c67f7: Merge change 26300 into eclair
Merge commit '585c67f70f18b8879ced854c5865141d6c650cd8' into eclair-plus-aosp

* commit '585c67f70f18b8879ced854c5865141d6c650cd8':
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
2009-09-22 05:01:25 -07:00
Android (Google) Code Review
96a1b05478 Merge change 26300 into eclair
* changes:
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
2009-09-22 07:55:58 -04:00
Bjorn Bringert
7dc051e5cd am 976e363f: Merge change 26260 into eclair
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp

* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 03:02:48 -07:00
Android (Google) Code Review
e6450c179e Merge change 26260 into eclair
* changes:
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 05:54:31 -04:00
Eric Laurent
aef692f50f Fix issue 2116700: Ringer screwy while connected over Bluetooth.
There was a regression introduced in AudioFlinger by change 24114 for suspended output:
The suspended output was not reading and mixing audio tracks.
When the phone is ringing, the A2DP output is suspended if the SCO headset and A2DP headset are the same. As the ringtone is played over the duplicated output, the fact that the A2DP output was not reading data was causing the hardware output to be stalled from time to time.
2009-09-22 00:35:48 -07:00
Chung-yih Wang
2ba4a60a1e am 5f55d8c9: Fix the incorrect field name in EAP wifi network.
Merge commit '5f55d8c9d447f492aed955ac29454e0c482a4956' into eclair-plus-aosp

* commit '5f55d8c9d447f492aed955ac29454e0c482a4956':
  Fix the incorrect field name in EAP wifi network.
2009-09-22 00:35:20 -07:00
Chung-yih Wang
b749c18cce am 2e2f6b5e: Merge change 26328 into eclair
Merge commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f' into eclair-plus-aosp

* commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f':
  Fix the issue of 'Wifi framework is not aware of state change'
2009-09-21 23:09:48 -07:00
Android (Google) Code Review
31c0719961 Merge change 26328 into eclair
* changes:
  Fix the issue of 'Wifi framework is not aware of state change'
2009-09-22 02:02:04 -04:00
Jeff Sharkey
6d6bd2fb62 am 9cea89c1: Basic API for third-party apps to define custom Data rows.
Merge commit '9cea89c103bc876bb083a9ac1b845534dca6172b' into eclair-plus-aosp

* commit '9cea89c103bc876bb083a9ac1b845534dca6172b':
  Basic API for third-party apps to define custom Data rows.
2009-09-21 21:45:26 -07:00