12156 Commits

Author SHA1 Message Date
Jaikumar Ganesh
66b6b90bbf am f05ec923: Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'f05ec9237ec907be3f2c581a950149435bd585fb' into eclair-mr2-plus-aosp

* commit 'f05ec9237ec907be3f2c581a950149435bd585fb':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 13:40:38 -08:00
Jaikumar Ganesh
998531f5ea am 94140b35: Merge commit \'9284dec7\' into merge
Merge commit '94140b35541b955589f878ce6b26b65c3b3e18ac' into eclair-mr2-plus-aosp

* commit '94140b35541b955589f878ce6b26b65c3b3e18ac':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 13:09:14 -08:00
Jaikumar Ganesh
f05ec9237e Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.

Manual merge from eclair branch
2009-11-13 13:08:52 -08:00
Jaikumar Ganesh
94140b3554 Merge commit '9284dec7' into merge 2009-11-13 13:02:02 -08:00
Android (Google) Code Review
9284dec737 Merge change I4c05ba1f into eclair
* changes:
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 12:06:29 -08:00
Dan Egnor
0b81ce217e am 5da82421: Merge change Iac63ebc8 into eclair-mr2
Merge commit '5da824210ee34f051c295c12f6bcc4b617da4a1a' into eclair-mr2-plus-aosp

* commit '5da824210ee34f051c295c12f6bcc4b617da4a1a':
  Make WRITE_GSERVICES into system-or-signature (instead of just signature),
2009-11-13 11:33:59 -08:00
Mike Cleron
fcd2917a35 am aaa8e7e6: am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit 'aaa8e7e633b61b221d10f21006bf2cd197004093' into eclair-mr2-plus-aosp

* commit 'aaa8e7e633b61b221d10f21006bf2cd197004093':
  Add support for making a LiveWallpaper the default
2009-11-13 11:33:49 -08:00
Dianne Hackborn
b9456ac726 am 6e0ff0c3: am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e' into eclair-mr2-plus-aosp

* commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:33:37 -08:00
Scott Main
fd13fb7a9c am b0d2313e: am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp

* commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:33:26 -08:00
Android (Google) Code Review
5da824210e Merge change Iac63ebc8 into eclair-mr2
* changes:
  Make WRITE_GSERVICES into system-or-signature (instead of just signature), as a temporary measure so unbundled Google components (GSF, etc.) can hold it.  (In the longer term, WRITE_GSERVICES won't be a system permission at all, but it or something like it will be defined directly by GSF.)
2009-11-13 11:21:27 -08:00
Mike Cleron
aaa8e7e633 am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2

* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
  Add support for making a LiveWallpaper the default
2009-11-13 11:11:42 -08:00
Dianne Hackborn
6e0ff0c37c am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-mr2

* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:11:24 -08:00
Scott Main
b0d2313ea4 am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2

* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:11:06 -08:00
Android (Google) Code Review
27d6e65b71 Merge change I322b6ee7 into eclair
* changes:
  Add support for making a LiveWallpaper the default
2009-11-13 11:01:57 -08:00
Jaikumar Ganesh
4c05ba1fcc Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.

Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
2009-11-13 11:01:25 -08:00
Dianne Hackborn
826d17c069 A little more on #2256270: Package manager sends bad broadcasts when components change
Don't go through all this work if the enabled state hasn't changed.

Change-Id: If7393f53d6c0d0770960bb37bcaa5adebdbb3099
2009-11-13 10:59:42 -08:00
Scott Main
d05fd6c335 am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair

* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 10:45:32 -08:00
Eric Fischer
088c23c8d1 am 2172084c: am b4c20fca: (-s ours) Merge change Ifb28d340 into eclair
Merge commit '2172084ca7fa2c0df6b28ecedfa689b60e980ccf' into eclair-mr2-plus-aosp

* commit '2172084ca7fa2c0df6b28ecedfa689b60e980ccf':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:43:45 -08:00
Eric Fischer
2172084ca7 am b4c20fca: (-s ours) Merge change Ifb28d340 into eclair
Merge commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56' into eclair-mr2

* commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:35:05 -08:00
Android (Google) Code Review
b4c20fca10 Merge change Ifb28d340 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-13 10:13:42 -08:00
Eric Laurent
99e03a3f94 am 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair
Merge commit '6efdbcc3c1afafe2f9401668ce252167600b498f' into eclair-mr2-plus-aosp

* commit '6efdbcc3c1afafe2f9401668ce252167600b498f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-13 09:28:06 -08:00
Eric Laurent
355743c70d am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '609acfd2a1067f49e51925776484b070a24d8301' into eclair-mr2-plus-aosp

* commit '609acfd2a1067f49e51925776484b070a24d8301':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 09:27:55 -08:00
Rebecca Schultz Zavin
bd328d0113 am 9b942117: am 5f8f1487: Merge change Ia0a40883 into eclair
Merge commit '9b94211787b237fd59153f58dd41d738290866c4' into eclair-mr2-plus-aosp

* commit '9b94211787b237fd59153f58dd41d738290866c4':
  Modify the binder to request 1M - 2 pages instead of 1M.  The backing store
2009-11-13 09:27:44 -08:00
Jim Miller
c41bc910bd am 5be290d6: am 11fea858: Merge change I8061e6ac into eclair
Merge commit '5be290d6296da34cdd2724ee94dfc3b61bc02785' into eclair-mr2-plus-aosp

* commit '5be290d6296da34cdd2724ee94dfc3b61bc02785':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-13 09:27:30 -08:00
David 'Digit' Turner
567716acc5 am 097855eb: am 6f5ba934: Merge change I42a0f7a5 into eclair
Merge commit '097855eb00971092ff6332aa2bf0fae71f42ab5f' into eclair-mr2-plus-aosp

* commit '097855eb00971092ff6332aa2bf0fae71f42ab5f':
  PackageManager: Support secondary ABI for native code at installation time.
2009-11-13 09:27:18 -08:00
Dianne Hackborn
255ba31a75 am 1ca191c2: am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '1ca191c2f7eb2be53d0f96117784ecafd888da73' into eclair-mr2-plus-aosp

* commit '1ca191c2f7eb2be53d0f96117784ecafd888da73':
  Fix issue #2258571: Fix build versions
2009-11-13 09:27:04 -08:00
Jason Sams
8dcb4233fc am 4834887e: am 4dd6fee7: Merge change Ieb4b0318 into eclair
Merge commit '4834887e6cb7a69c7a63d939d6706bd52a0e5bfa' into eclair-mr2-plus-aosp

* commit '4834887e6cb7a69c7a63d939d6706bd52a0e5bfa':
  Make default vertex program correctly track surface size.
2009-11-13 09:26:51 -08:00
Jaikumar Ganesh
d96c94aa93 am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair
Merge commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8' into eclair-mr2-plus-aosp

* commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8':
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-13 09:26:38 -08:00
Mathias Agopian
da5e90bee4 am 66b5d902: am 27407208: Merge change Icf335098 into eclair
Merge commit '66b5d902a29e08237f16be53a84f9c2472df8493' into eclair-mr2-plus-aosp

* commit '66b5d902a29e08237f16be53a84f9c2472df8493':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2009-11-13 09:26:24 -08:00
Jason Sams
adf3893983 am da8bb292: am 59175ac2: Merge change I81b1421a into eclair
Merge commit 'da8bb292db289bdd0e02b672daec09e2a3f9f462' into eclair-mr2-plus-aosp

* commit 'da8bb292db289bdd0e02b672daec09e2a3f9f462':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-13 09:26:09 -08:00
Mike Cleron
322b6ee7e1 Add support for making a LiveWallpaper the default 2009-11-12 23:23:49 -08:00
Eric Laurent
6efdbcc3c1 am fddfb9ae: Merge change Iad79689a into eclair
Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-mr2

* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 23:10:34 -08:00
Eric Laurent
609acfd2a1 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:10:18 -08:00
Rebecca Schultz Zavin
9b94211787 am 5f8f1487: Merge change Ia0a40883 into eclair
Merge commit '5f8f1487be78064e8d653dd2d105d8dd444d6a35' into eclair-mr2

* commit '5f8f1487be78064e8d653dd2d105d8dd444d6a35':
  Modify the binder to request 1M - 2 pages instead of 1M.  The backing store
2009-11-12 23:09:56 -08:00
Jim Miller
5be290d629 am 11fea858: Merge change I8061e6ac into eclair
Merge commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04' into eclair-mr2

* commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-12 23:09:15 -08:00
Wink Saville
126fee88d4 am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2
Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp

* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 23:08:56 -08:00
David 'Digit' Turner
097855eb00 am 6f5ba934: Merge change I42a0f7a5 into eclair
Merge commit '6f5ba93469bc26f33b5a260a394406970536c260' into eclair-mr2

* commit '6f5ba93469bc26f33b5a260a394406970536c260':
  PackageManager: Support secondary ABI for native code at installation time.
2009-11-12 23:07:15 -08:00
Dianne Hackborn
1ca191c2f7 am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '1778776cf1349a5f275945c53edcd1454d58639c' into eclair-mr2

* commit '1778776cf1349a5f275945c53edcd1454d58639c':
  Fix issue #2258571: Fix build versions
2009-11-12 23:06:58 -08:00
Jason Sams
4834887e6c am 4dd6fee7: Merge change Ieb4b0318 into eclair
Merge commit '4dd6fee7e444c65f3613b4126124622b32a5d4ff' into eclair-mr2

* commit '4dd6fee7e444c65f3613b4126124622b32a5d4ff':
  Make default vertex program correctly track surface size.
2009-11-12 23:06:44 -08:00
Jaikumar Ganesh
ae29ac179e am 572e0087: Merge change Idfc116fe into eclair
Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2

* commit '572e0087a86c6781e3334f8a6f901039a407138d':
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-12 23:06:29 -08:00
Mathias Agopian
66b5d902a2 am 27407208: Merge change Icf335098 into eclair
Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-mr2

* commit '274072089ceff6eacb9ccfb59290a18f43739c87':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2009-11-12 23:06:15 -08:00
Jason Sams
da8bb292db am 59175ac2: Merge change I81b1421a into eclair
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-mr2

* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-12 23:05:59 -08:00
Dan Egnor
ac63ebc824 Make WRITE_GSERVICES into system-or-signature (instead of just signature),
as a temporary measure so unbundled Google components (GSF, etc.) can hold
it.  (In the longer term, WRITE_GSERVICES won't be a system permission at
all, but it or something like it will be defined directly by GSF.)
2009-11-12 23:02:22 -08:00
Android (Google) Code Review
fddfb9ae03 Merge change Iad79689a into eclair
* changes:
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 22:53:28 -08:00
Android (Google) Code Review
1aa9f3cac3 Merge change I923d7d72 into eclair
* changes:
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:45:50 -08:00
Wink Saville
db9f06d9c4 resolved conflicts for merge of 2a1e9641 to eclair-mr2
Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
2009-11-12 22:44:11 -08:00
Android (Google) Code Review
5f8f1487be Merge change Ia0a40883 into eclair
* changes:
  Modify the binder to request 1M - 2 pages instead of 1M.  The backing store in the kernel requires a guard page, so 1M allocations fragment memory very badly.  Subtracting a couple of pages so that they fit in a power of two allows the kernel to make more efficient use of its virtual address space.
2009-11-12 21:29:13 -08:00
Eric Fischer
fb28d340bf Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-12 19:45:43 -08:00
Daisuke Miyakawa
2a77d4633a am 592988d3: Add unit tests for Japanization and fix several bugs.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp

* commit '592988d307e8d305ca163c4e58da0fb350054194':
  Add unit tests for Japanization and fix several bugs.
2009-11-12 19:08:23 -08:00
Android (Google) Code Review
11fea858b2 Merge change I8061e6ac into eclair
* changes:
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-12 18:51:35 -08:00