Commit Graph

38903 Commits

Author SHA1 Message Date
Ken Shirriff
79afd5053e am 8fca03a8: am 426ac065: Merge change 22328 into eclair
Merge commit '8fca03a88be981f9737974bbaff4f2fa82f5e19d'

* commit '8fca03a88be981f9737974bbaff4f2fa82f5e19d':
  Fix recurrence parsing for all-day events.
2009-08-21 16:02:49 -07:00
Ken Shirriff
8fca03a88b am 426ac065: Merge change 22328 into eclair
Merge commit '426ac065d0065507b7bc8c7c5c47fc2b09de2c82' into eclair-plus-aosp

* commit '426ac065d0065507b7bc8c7c5c47fc2b09de2c82':
  Fix recurrence parsing for all-day events.
2009-08-21 16:01:01 -07:00
Android (Google) Code Review
426ac065d0 Merge change 22328 into eclair
* changes:
  Fix recurrence parsing for all-day events.
2009-08-21 15:58:43 -07:00
Mathias Agopian
a96d697c6f am 6b3776cd: am 7a1c20ad: Merge change 22344 into eclair
Merge commit '6b3776cd3eb9579cd00ba1c8da9f64357907f846'

* commit '6b3776cd3eb9579cd00ba1c8da9f64357907f846':
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
2009-08-21 15:49:27 -07:00
Mathias Agopian
6b3776cd3e am 7a1c20ad: Merge change 22344 into eclair
Merge commit '7a1c20ad4bfdc9b54b1b0b90115afed774bb9811' into eclair-plus-aosp

* commit '7a1c20ad4bfdc9b54b1b0b90115afed774bb9811':
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
2009-08-21 15:47:33 -07:00
Android (Google) Code Review
7a1c20ad4b Merge change 22344 into eclair
* changes:
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
2009-08-21 15:45:22 -07:00
Mathias Agopian
9e2be20cc5 fix [2070341] [FAST BLOCKER] can't successfully setup erc52 2009-08-21 15:44:17 -07:00
Android Code Review
4dc0d64e27 Merge change 11284
* changes:
  Fix bitmask in aapt's StringPool length construction
2009-08-21 15:35:28 -07:00
Wei Huang
3c2a6e0ff8 am 0949f652: am d3d79453: Merge change 22331 into eclair
Merge commit '0949f652ee2e84ef46d12ac692620286925ded6e'

* commit '0949f652ee2e84ef46d12ac692620286925ded6e':
  add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
2009-08-21 15:25:46 -07:00
Wei Huang
0949f652ee am d3d79453: Merge change 22331 into eclair
Merge commit 'd3d794530962e69df54b6421ed5e0d03d76165ab' into eclair-plus-aosp

* commit 'd3d794530962e69df54b6421ed5e0d03d76165ab':
  add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
2009-08-21 15:22:45 -07:00
Android (Google) Code Review
d3d7945309 Merge change 22331 into eclair
* changes:
  add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
2009-08-21 15:20:31 -07:00
Alex Gruenstein
7ff31d6fcf am ed383866: (-s ours) am f1b64f64: do not merge. Remove voicesearch-specific functionality from framework.
Merge commit 'ed383866032d1c7fb5141d516a5dbddaf973a5bf'

* commit 'ed383866032d1c7fb5141d516a5dbddaf973a5bf':
  do not merge.  Remove voicesearch-specific functionality from framework.
2009-08-21 15:13:42 -07:00
Alex Gruenstein
ed38386603 am f1b64f64: do not merge. Remove voicesearch-specific functionality from framework.
Merge commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5' into eclair-plus-aosp

* commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5':
  do not merge.  Remove voicesearch-specific functionality from framework.
2009-08-21 15:12:07 -07:00
Alex Gruenstein
f1b64f64ab do not merge. Remove voicesearch-specific functionality from framework. 2009-08-21 14:59:26 -07:00
Android (Google) Code Review
36d5aaec2e Merge change 22322 into donut
* changes:
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
2009-08-21 14:47:41 -07:00
Ken Shirriff
1ce2e2e78d Fix recurrence parsing for all-day events.
The doozer server requires P1D instead of P86400S for all-day events.

bug=1594638
2009-08-21 14:37:25 -07:00
Wei Huang
1abf498e7f add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff. 2009-08-21 14:21:43 -07:00
Tom Taylor
cdfdd65f8a Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-08-21 14:15:20 -07:00
Android (Google) Code Review
bdb7ca086b Merge change 9278
* changes:
  Fix all typos (found by script) in the Android documentation.
2009-08-21 14:15:17 -07:00
Tom Taylor
68e037df04 am ae15090b: am 00ddbcaa: Merge change 22314 into eclair
Merge commit 'ae15090b9f47b5c9c482ed886e4b5f9d5299ac41'

* commit 'ae15090b9f47b5c9c482ed886e4b5f9d5299ac41':
  Purge cache
2009-08-21 14:15:16 -07:00
Tom Taylor
ae15090b9f am 00ddbcaa: Merge change 22314 into eclair
Merge commit '00ddbcaa2e8a181a2efd5456a65c619ed941e4b0' into eclair-plus-aosp

* commit '00ddbcaa2e8a181a2efd5456a65c619ed941e4b0':
  Purge cache
2009-08-21 14:12:45 -07:00
Android (Google) Code Review
00ddbcaa2e Merge change 22314 into eclair
* changes:
  Purge cache
2009-08-21 14:10:12 -07:00
Dmitri Plotnikov
15b0bd577e am 53d0581d: am 4178b9bd: Merge change 22316 into eclair
Merge commit '53d0581dc9536b578b59c2a3f7c5d1672c3054bd'

* commit '53d0581dc9536b578b59c2a3f7c5d1672c3054bd':
  Cleaning up Presence API
2009-08-21 13:49:47 -07:00
Li Zhe
0c0392faa9 am f3b8994b: am 6c6d822f: Merge change 22318 into eclair
Merge commit 'f3b8994b6630d79f566d1cf8edf891fa8914adef'

* commit 'f3b8994b6630d79f566d1cf8edf891fa8914adef':
  Framework changes to support HSDPA/HSUPA/HSPA
2009-08-21 13:48:17 -07:00
Dmitri Plotnikov
53d0581dc9 am 4178b9bd: Merge change 22316 into eclair
Merge commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6' into eclair-plus-aosp

* commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6':
  Cleaning up Presence API
2009-08-21 13:48:01 -07:00
Dmitri Plotnikov
f367ba5b35 am b0ef6ca4: am 358e6e3c: Merge change 22292 into eclair
Merge commit 'b0ef6ca47d6f8e24b6bbf0a605c2e42000929bc6'

* commit 'b0ef6ca47d6f8e24b6bbf0a605c2e42000929bc6':
  Adding a "Photo" directory under Contacts.
2009-08-21 13:45:45 -07:00
Li Zhe
f3b8994b66 am 6c6d822f: Merge change 22318 into eclair
Merge commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6' into eclair-plus-aosp

* commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6':
  Framework changes to support HSDPA/HSUPA/HSPA
2009-08-21 13:45:30 -07:00
Android (Google) Code Review
4178b9bd8e Merge change 22316 into eclair
* changes:
  Cleaning up Presence API
2009-08-21 13:45:22 -07:00
Dmitri Plotnikov
31f5dd3cdc Cleaning up Presence API 2009-08-21 13:44:47 -07:00
Android (Google) Code Review
6c6d822f7b Merge change 22318 into eclair
* changes:
  Framework changes to support HSDPA/HSUPA/HSPA HSDPA: High-Speed Downlink Packet Access HSUPA: High-Speend Uplink Packet Access HSPA:  High-Speed Packet Access
2009-08-21 13:43:01 -07:00
Dmitri Plotnikov
b0ef6ca47d am 358e6e3c: Merge change 22292 into eclair
Merge commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083' into eclair-plus-aosp

* commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083':
  Adding a "Photo" directory under Contacts.
2009-08-21 13:42:54 -07:00
Romain Guy
79d9e19d5f am b5a79aa3: am cc0a17cb: Merge change 22290 into eclair
Merge commit 'b5a79aa3e56321f5616ca560e1e7930193fd392a'

* commit 'b5a79aa3e56321f5616ca560e1e7930193fd392a':
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:41:20 -07:00
Li Zhe
ebe66345e7 Framework changes to support HSDPA/HSUPA/HSPA
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA:  High-Speed Packet Access

Add support for HSDPA/HSUPA/HSPA:
 1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
 2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
 3) set radioTechnology into ServiceState in GsmServiceStateTracker
 4) change the implementation of TelephonyManager.getNetworkType to
    solve the competition timing issue between the time of setting
    system property and the time of receiving notification through
    PhoneStateListener
    4.1) add a getNetworkType interface in ITelephony.aidl
 5) add icons resources for HSDPA/HSUPA/HSPA
 6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
2009-08-21 13:41:05 -07:00
Android (Google) Code Review
358e6e3c12 Merge change 22292 into eclair
* changes:
  Adding a "Photo" directory under Contacts.
2009-08-21 13:40:40 -07:00
Romain Guy
b5a79aa3e5 am cc0a17cb: Merge change 22290 into eclair
Merge commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9' into eclair-plus-aosp

* commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9':
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:38:44 -07:00
Android (Google) Code Review
cc0a17cb08 Merge change 22290 into eclair
* changes:
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:36:30 -07:00
Eric Fischer
cc5dfa9ed0 Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Without this, the runtime would restart when you tried to add a word
from the search widget.

Bug 2069689
2009-08-21 13:31:54 -07:00
Xavier Ducrohet
b01d4f2e03 am 53cc3b3c: am 51afbd30: Merge change 22308 into eclair
Merge commit '53cc3b3c864d51b46851f77137e2563e3782172c'

* commit '53cc3b3c864d51b46851f77137e2563e3782172c':
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:31:14 -07:00
Xavier Ducrohet
53cc3b3c86 am 51afbd30: Merge change 22308 into eclair
Merge commit '51afbd308dff8bd7accf5510e60367107d4c40a1' into eclair-plus-aosp

* commit '51afbd308dff8bd7accf5510e60367107d4c40a1':
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:28:48 -07:00
Android (Google) Code Review
51afbd308d Merge change 22308 into eclair
* changes:
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:26:19 -07:00
Kenny Root
841ce8b7b9 Fix bitmask in aapt's StringPool length construction
The StringPool indicates the length of a string with a 16-bit
integer. If the length of the string is greater than 0x7FFF,
it splits it into two 16-bit integers with the first one
having the high bit set.

The length calculation has a small bug that masks off the
19 bits instead of the first 15 bits as intended.
2009-08-21 15:23:45 -05:00
Elliott Hughes
7f87706927 Fix all typos (found by script) in the Android documentation.
I haven't touched instances of "behaviour", "dequeue", "removeable",
"resizeable", or "removeable" because all are accepted variant spellings
and I don't know what the policy is on such things.
2009-08-21 13:10:55 -07:00
Tom Taylor
4ddacd014b Purge cache
When persisting a PDU, make sure we purge any old instances of the
PDU from the cache.
2009-08-21 13:09:55 -07:00
Jean-Baptiste Queru
56a63fedcf am 761f7934: am dd03c613: resolved conflicts for merge of 081a136d to eclair
Merge commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8'

* commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8':
  Remove third party support for Quick Search Box (aka global search).
2009-08-21 13:02:50 -07:00
Jean-Baptiste Queru
761f79349a am dd03c613: resolved conflicts for merge of 081a136d to eclair
Merge commit 'dd03c6135f91df6d5d9e71de1487520dc3345742' into eclair-plus-aosp

* commit 'dd03c6135f91df6d5d9e71de1487520dc3345742':
  Remove third party support for Quick Search Box (aka global search).
2009-08-21 13:01:22 -07:00
Jean-Baptiste Queru
dd03c6135f resolved conflicts for merge of 081a136d to eclair 2009-08-21 12:59:04 -07:00
Xavier Ducrohet
ad013fae0d Replace fullHeight support by fullSize (height and width)
This is useful for linearlayout in horizontal mode.
2009-08-21 12:55:59 -07:00
Anonymous Coward
081a136d25 Remove third party support for Quick Search Box (aka global search).
- @hides relevant APIs
- removes relevant javadoc
- enforces that only system apps can participate

note: general support is still there, will be easy to reenable when we are ready.
2009-08-21 12:47:14 -07:00
Jaikumar Ganesh
d7f4d90902 am 595b728a: am bfcfb7ee: Merge change 22302 into eclair
Merge commit '595b728a83c8ccdc8aeee30d0c46cd9dfbff9c1d'

* commit '595b728a83c8ccdc8aeee30d0c46cd9dfbff9c1d':
  Set BondState to Canceled when user cancels pairing.
2009-08-21 11:57:28 -07:00
Jaikumar Ganesh
595b728a83 am bfcfb7ee: Merge change 22302 into eclair
Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp

* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
  Set BondState to Canceled when user cancels pairing.
2009-08-21 11:56:06 -07:00