3532 Commits

Author SHA1 Message Date
Ben Murdoch
576c26dd91 am 4cbbca0d: am d497d876: Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
Merge commit '4cbbca0dd3c95dc3875914171d839eac78452562'

* commit '4cbbca0dd3c95dc3875914171d839eac78452562':
  Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
2009-08-26 04:45:31 -07:00
Ben Murdoch
d497d87650 Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
Change-Id:Ic9372b0c86472b42ba5d0b964aaff1e2bbfe3efa
2009-08-26 12:39:55 +01:00
Daisuke Miyakawa
69fd8c19c5 am 5d147264: am 97f87095: Merge change 22399 into eclair
Merge commit '5d147264c76db862d0782ea634a3e4a39a992619'

* commit '5d147264c76db862d0782ea634a3e4a39a992619':
  Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:13:07 -07:00
Android (Google) Code Review
97f870956a Merge change 22399 into eclair
* changes:
  Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:08:38 -07:00
Fred Quintana
c848b7023b clean up the too many deletes dialog 2009-08-25 20:31:05 -07:00
Jeff Sharkey
d2b3a6fb89 am f1be6d0a: am ba176d6c: Don\'t reference hidden API from comments.
Merge commit 'f1be6d0acea4aad4396d76d1d3486783b3d0f4ae'

* commit 'f1be6d0acea4aad4396d76d1d3486783b3d0f4ae':
  Don't reference hidden API from comments.
2009-08-25 19:10:14 -07:00
Jeff Sharkey
ba176d6c8a Don't reference hidden API from comments. 2009-08-25 19:05:47 -07:00
Dmitri Plotnikov
fde0a6e124 am d30866fb: am 22e2aaaa: Merge change 22656 into eclair
Merge commit 'd30866fba31034bc72420506287390d4c347353e'

* commit 'd30866fba31034bc72420506287390d4c347353e':
  Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:36:02 -07:00
Android (Google) Code Review
22e2aaaa5c Merge change 22656 into eclair
* changes:
  Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:33:13 -07:00
Fred Quintana
361ed21177 am 381bc383: am 16c758fb: Merge change 22702 into eclair
Merge commit '381bc38355ae05efee92d369076b3228969c0e1d'

* commit '381bc38355ae05efee92d369076b3228969c0e1d':
  run the sync thread at background priority
2009-08-25 17:46:11 -07:00
Android (Google) Code Review
16c758fb15 Merge change 22702 into eclair
* changes:
  run the sync thread at background priority
2009-08-25 17:42:26 -07:00
Jeff Sharkey
a5cc0b7257 am 77a2bc56: am 534aa012: Mark all legacy contacts APIs as deprecated.
Merge commit '77a2bc56d09242b3e358308641d8f0bb1c184eb2'

* commit '77a2bc56d09242b3e358308641d8f0bb1c184eb2':
  Mark all legacy contacts APIs as deprecated.
2009-08-25 17:33:45 -07:00
Jeff Sharkey
534aa012b5 Mark all legacy contacts APIs as deprecated.
Now that we've merged ContactsContract and are relying on
compatibility mode, we're marking the previous public
contacts API as deprecated.

Fixes http://b/2076016
2009-08-25 17:27:15 -07:00
Eric Fischer
ec6004acf7 am 51dc135c: am 5439f4e3: Merge change 22665 into eclair
Merge commit '51dc135c10e458c1b24de1ca2275ce924a942d6d'

* commit '51dc135c10e458c1b24de1ca2275ce924a942d6d':
  Decapitalize "Input method" in context menu.
2009-08-25 17:26:58 -07:00
Android (Google) Code Review
5439f4e303 Merge change 22665 into eclair
* changes:
  Decapitalize "Input method" in context menu.
2009-08-25 17:24:58 -07:00
johnwang
b58a644d39 am 7250f938: am cc907741: Merge change 22660 into eclair
Merge commit '7250f938accad16e878889c6f4d8be3b8520f510'

* commit '7250f938accad16e878889c6f4d8be3b8520f510':
  Simplify data icons of CDMA in status bar.
2009-08-25 16:23:04 -07:00
Android (Google) Code Review
cc907741b9 Merge change 22660 into eclair
* changes:
  Simplify data icons of CDMA in status bar.
2009-08-25 16:18:32 -07:00
johnwang
9f87cb2f8d Simplify data icons of CDMA in status bar.
Use 3G icons when connect to EvDO, use 1x icons when connected to 1x, and remove dormant state display.
2009-08-25 16:12:39 -07:00
Amith Yamasani
6ff5906981 Fix rare NPE due to key being delivered after activity is stopped. #2062930 2009-08-25 15:42:55 -07:00
Eric Fischer
e6f850597c Decapitalize "Input method" in context menu.
Bug 1844819

Change-Id: If9ac5daabc6a44196d63f8d534bc8419f997c92f
2009-08-25 15:37:03 -07:00
Dianne Hackborn
f0f7426413 am ab5eed16: am 9acc030b: Implement issue #2071750: add a pre-boot upgrade step.
Merge commit 'ab5eed16f7eeb14094d95a32791e2de133d1c0c8'

* commit 'ab5eed16f7eeb14094d95a32791e2de133d1c0c8':
  Implement issue #2071750: add a pre-boot upgrade step.
2009-08-25 15:36:30 -07:00
Dianne Hackborn
9acc030be4 Implement issue #2071750: add a pre-boot upgrade step.
Change-Id: I7133a03a6bf302dbac00c5f8b0420071d2453f89
2009-08-25 15:15:31 -07:00
Dmitri Plotnikov
5223b1668a Adding an aggregation mode: AGGREGATION_SUSPENDED 2009-08-25 15:15:06 -07:00
Fred Quintana
75d797c2e7 run the sync thread at background priority 2009-08-25 15:05:02 -07:00
johnwang
39fe8bdb62 am c3b64a41: am 4b474440: Merge change 22566 into eclair
Merge commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7'

* commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7':
  Simplify CDMA Status Bar icons
2009-08-25 13:44:18 -07:00
Android (Google) Code Review
4b474440ce Merge change 22566 into eclair
* changes:
  Simplify CDMA Status Bar icons
2009-08-25 13:39:34 -07:00
Jack Wang
49fba412e9 am d22f4d85: am c69a8807: Merge change 22109 into eclair
Merge commit 'd22f4d856e049b33f86c93761a38046644688d90'

* commit 'd22f4d856e049b33f86c93761a38046644688d90':
  Fix bug 1546445: Correct spelling errors in API
2009-08-25 12:50:39 -07:00
Jack Wang
7aba54b2ed Fix bug 1546445: Correct spelling errors in API
- InstrumentationTestCase.injectInsrumentation
- AndroidTestRunner.setInstrumentaiton
2009-08-25 12:44:56 -07:00
johnwang
347c5a22a9 Simplify CDMA Status Bar icons
Update the RSSI display policy in CDMA.
1. Use single RSSI icon instead of two icons
2. If 3G(EV) and 1x network are available than 3G should be displayed,  Displayed RSSI should be from the EV side.
3. If a voice call is made then RSSI should switch to 1x.
2009-08-25 12:39:49 -07:00
Jaikumar Ganesh
84a652cc57 am 88ccc8fb: am 617b22dc: Merge change 22520 into eclair
Merge commit '88ccc8fbfb9ec23fe4f31798787b05e9e75f2fe9'

* commit '88ccc8fbfb9ec23fe4f31798787b05e9e75f2fe9':
  Add local frames for parsing properties and processing events.
2009-08-25 12:11:45 -07:00
Android (Google) Code Review
617b22dc07 Merge change 22520 into eclair
* changes:
  Add local frames for parsing properties and processing events.
2009-08-25 12:07:53 -07:00
Jaikumar Ganesh
6d56b530e1 Add local frames for parsing properties and processing events.
We were running out of local refs when there are lots of devices.
Instead of deleting every single local ref, create a local stack frame.
This operation is inexpensive so doesn't add a high overload and keeps
the code clean instead of deleting every single local ref.
2009-08-25 12:02:34 -07:00
Fred Quintana
5a8bbb903e am ab3996f2: am 5fe00057: Merge change 22549 into eclair
Merge commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67'

* commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67':
  - make it ok to modify the accounts before boot
2009-08-25 11:50:59 -07:00
Android (Google) Code Review
5fe00057dd Merge change 22549 into eclair
* changes:
  - make it ok to modify the accounts before boot - allow packages in the system image to access any authtokens they wish
2009-08-25 11:47:11 -07:00
Mike Reed
458a7fb3da am 9bace916: am dbade9d6: expose runtime changes to gamma
Merge commit '9bace91641df27c5b238fe5fc340e25827382473'

* commit '9bace91641df27c5b238fe5fc340e25827382473':
  expose runtime changes to gamma
2009-08-25 11:00:36 -07:00
Mike Reed
dbade9d6a0 expose runtime changes to gamma 2009-08-25 13:47:47 -04:00
Amith Yamasani
7f48e806a7 am 657bf5b7: am 91ba1c3f: Merge change 22521 into eclair
Merge commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9'

* commit '657bf5b751b7d2008dff0f91082a75bc1d699fa9':
  Revert volume if it wasn't okayed by user.
2009-08-25 10:27:42 -07:00
Android (Google) Code Review
91ba1c3f9d Merge change 22521 into eclair
* changes:
  Revert volume if it wasn't okayed by user.
2009-08-25 10:23:29 -07:00
Karl Rosaen
2856d1143e am 16077822: am 678771b8: New strings and utlity method tweaks associated with updated account unlock screen flow.
Merge commit '1607782261f4213aa9b4b7b1cf492d51849cdda5'

* commit '1607782261f4213aa9b4b7b1cf492d51849cdda5':
  New strings and utlity method tweaks associated with updated account unlock screen flow.
2009-08-25 09:35:27 -07:00
Karl Rosaen
678771b811 New strings and utlity method tweaks associated with updated account unlock screen flow.
- 'setPermanentlyLocked(false)' no longer automatically resets the pattern
- new string for "waiting to verify account" progress dialog
- new string for account unlock screen title when you aren't past the too many
attempts, but just hit the 'forgot pattern' button
2009-08-25 08:26:38 -07:00
Chih-Chung Chang
3429d3439c am c607435c: am 4804c3e2: Merge change 22564 into eclair
Merge commit 'c607435cae64d2f9c7af408e10e1e72eb637c458'

* commit 'c607435cae64d2f9c7af408e10e1e72eb637c458':
  Add an extra intent parameter for recording duration limit.
2009-08-25 00:00:50 -07:00
Android (Google) Code Review
4804c3e23b Merge change 22564 into eclair
* changes:
  Add an extra intent parameter for recording duration limit.
2009-08-24 23:56:49 -07:00
Daisuke Miyakawa
f4ddea7690 Refactor VCard handling code, phase 2, 3, 4, 5
Phase 2
Make VCard Importer use Data structures in ContactsContract instead of
using old Conatacts structure.

Phase 3
Developed VCardComposer, which was originally in Contacts package, but
now in base/core/java. Also made it use queryEntries() as per jsharkey's
suggestion.

Phase 4
Added VCardUtils and moved some common methods to it, some of which should be
in public API, but hidden for now.

Phase 5
Made VCardComposer emits (almost) valid vCard 3.0 data.
Confirmed with vCard data emitted by Mac.

Related issue:
1784580, 1728351, 1967349

Note:
Probable next step:
- Add "fast parse" mode in VCradBuilder, in which, VCardBuilder skip parsing the value of
each property. It will make the parsing faster.
-- Note that parsing the parameters of each entry cannot be skipped, since it may contains
the information about Encoding of the property. In other words, if the line is
in Quoted-Printable format, the next line may be the part of the property, not a
separated property, which should be parsed accordingly.

- Needs test
2009-08-25 15:39:06 +09:00
Jeff Sharkey
8cc8c8cd84 am 4ce07160: am f7eab4f7: Don\'t use deprecated API in contact header widget.
Merge commit '4ce07160ec6030b3afdd22867e39ca818c5e44c4'

* commit '4ce07160ec6030b3afdd22867e39ca818c5e44c4':
  Don't use deprecated API in contact header widget.
2009-08-24 22:11:14 -07:00
Jeff Sharkey
f7eab4f78f Don't use deprecated API in contact header widget.
Fixes http://b/2074981
2009-08-24 22:05:35 -07:00
Chih-Chung Chang
eb0098d8e8 Add an extra intent parameter for recording duration limit. 2009-08-25 12:59:54 +08:00
Fred Quintana
7be5964e74 - make it ok to modify the accounts before boot
- allow packages in the system image to access any authtokens they wish
2009-08-24 19:35:52 -07:00
Jackson Fan
5e511dbdfa am 8e40bad2: am 094f44ba: Merge change 22545 into eclair
Merge commit '8e40bad232741703bfd584ac4c8fde13bd716162'

* commit '8e40bad232741703bfd584ac4c8fde13bd716162':
  Use correct UUID to authorize AVRCP
2009-08-24 19:09:49 -07:00
Android (Google) Code Review
094f44ba6c Merge change 22545 into eclair
* changes:
  Use correct UUID to authorize AVRCP
2009-08-24 19:05:06 -07:00
Jackson Fan
9abcf0982e Use correct UUID to authorize AVRCP 2009-08-24 19:02:58 -07:00