10226 Commits

Author SHA1 Message Date
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
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
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
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
Jim Miller
4811d62d5f Fix 2209086: Updated assets and fixed widget dimension calculation.
Added hvga assets for new lock screen widget.

Tested:
	LockScreen on wvga and hvga devices.
	InCallScreen on wvga and hvga devices.
2009-11-12 18:15:00 -08:00
Android (Google) Code Review
6f5ba93469 Merge change I42a0f7a5 into eclair
* changes:
  PackageManager: Support secondary ABI for native code at installation time.
2009-11-12 17:51:26 -08:00
Dianne Hackborn
1778776cf1 Fix issue #2258571: Fix build versions
Update the definition of SDK 6, remove all new APIs from it.

Change-Id: Id96827f630ab46279d9ad8d3f7498e5515e0a688
2009-11-12 17:02:03 -08:00
Rebecca Schultz Zavin
a0a40883d0 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.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-11-12 16:31:12 -08:00
Android (Google) Code Review
4dd6fee7e4 Merge change Ieb4b0318 into eclair
* changes:
  Make default vertex program correctly track surface size.
2009-11-12 16:29:26 -08:00
Android (Google) Code Review
572e0087a8 Merge change Idfc116fe into eclair
* changes:
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-12 16:10:10 -08:00
Jason Sams
eb4b031804 Make default vertex program correctly track surface size. 2009-11-12 16:09:45 -08:00
David 'Digit' Turner
feba743b47 PackageManager: Support secondary ABI for native code at installation time.
The goal of this change is to allow the Package Manager to look for native
shared libraries corresponding to the CPU ABI reported by ro.product.cpu.abi2
if none was found for the CPU ABI given by ro.product.cpu.abi

This is used to support both ARMv5 and ARMv7 native code on modern ARMv7-based
devices. Typically, such a device would report a primary ABI of 'armeabi-v7a'
and a secondary one of 'armeabi', to indicate that it can run the binaries
generated for both.
2009-11-12 15:55:17 -08:00
Android (Google) Code Review
274072089c Merge change Icf335098 into eclair
* changes:
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2009-11-12 15:36:27 -08:00
Daisuke Miyakawa
592988d307 Add unit tests for Japanization and fix several bugs.
Internal issue number: 2195990
2009-11-13 08:33:11 +09:00
Android (Google) Code Review
59175ac269 Merge change I81b1421a into eclair
* changes:
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.
2009-11-12 15:27:28 -08:00
Mathias Agopian
cf3350982f fix [2236865] STOPSHIP: bump soft gl and egl minor version number 2009-11-12 15:19:42 -08:00
Android (Google) Code Review
2a1e96412c Merge change Ie122606f into eclair
* changes:
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 15:12:08 -08:00
Jason Sams
3bc47d4381 Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state. 2009-11-12 15:10:47 -08:00
Dan Egnor
f18a01c77e Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Un-hide the DropBoxManager interface, and update the public API accordingly.
2009-11-12 13:58:27 -08:00
Romain Guy
897a744bb7 am b602c328: Merge change I31c52bef into eclair
Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2

* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
  Revert change incorrectly submitted as part of change #32153.
2009-11-12 13:42:00 -08:00
Mathias Agopian
daafd5441a am dffa96f7: Merge change I90daccf3 into eclair
Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-mr2

* commit 'dffa96f7349a44a5d587656fce5c55386d44b150':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU
2009-11-12 13:41:48 -08:00
Android (Google) Code Review
b602c328c2 Merge change I31c52bef into eclair
* changes:
  Revert change incorrectly submitted as part of change #32153.
2009-11-12 13:37:30 -08:00
Jaikumar Ganesh
de1fcd49e7 Return null if SIM doesn't have the MSISDN Aplha tag.
This makes both the GSM and CDMA version compatible.

Bug: 2247067
Dr No: jsh
2009-11-12 13:29:33 -08:00
Android (Google) Code Review
dffa96f734 Merge change I90daccf3 into eclair
* changes:
  fix [2143798] Need to figure out how to do video on Passion w/ GPU
2009-11-12 13:25:36 -08:00
Jim Miller
0b66ea65f7 am 2477fd69: Merge change Ic31c11ad into eclair
Merge commit '2477fd69492055f3c6ee62ed9993e9fde8283144' into eclair-mr2

* commit '2477fd69492055f3c6ee62ed9993e9fde8283144':
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:17:27 -08:00
Dan Egnor
4c414e51b1 am 58c603ef: Merge change Id301a47f into eclair
Merge commit '58c603eff0d0b13fe581119e1d9c228da99d77e7' into eclair-mr2

* commit '58c603eff0d0b13fe581119e1d9c228da99d77e7':
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 13:17:15 -08:00
Android (Google) Code Review
2477fd6949 Merge change Ic31c11ad into eclair
* changes:
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:13:58 -08:00
Android (Google) Code Review
58c603eff0 Merge change Id301a47f into eclair
* changes:
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 12:54:43 -08:00
Dan Egnor
d301a47ff9 Fix bug 2253204: MapView resources for hdpi devices. 2009-11-12 12:24:33 -08:00
Eric Laurent
923d7d721d Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.

Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
2009-11-12 12:09:06 -08:00
Android (Google) Code Review
3b8112ef96 Merge change I280c753a into eclair-mr2
* changes:
  Modify text validation behavior.
2009-11-12 11:39:42 -08:00
Jim Miller
4df2c5433b Fix 2209086: restore drawable states when drawables change.
This fixes a bug where the right tab hightlight wasn't being seen.
The prooblem was that we weren't preserving the drawables' states when
the application requested a new drawable. We now track the drawable state
so we can updated it when the resources change.
2009-11-12 11:23:29 -08:00
Daniel Sandler
d1a3fc38e9 am 609bbf18: Merge change I54089080 into eclair
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-mr2

* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
  Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:38:36 -08:00
Guang Zhu
3b8a1b3513 am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-mr2

* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
  Use a diff that ignores trailing whitespaces to get by some layout test failures.
2009-11-12 10:38:08 -08:00
Android (Google) Code Review
609bbf182e Merge change I54089080 into eclair
* changes:
  Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:34:32 -08:00
Andreas Huber
d0f3228daa resolved conflicts for merge of c66d53f9 to eclair-mr2 2009-11-12 10:32:26 -08:00
Evan Millar
280c753ae3 Modify text validation behavior.
-Only perform validation when the view is *losing* focus.
-Don't perform validation when the window focus changes. This causes odd
behavior like validation being peformed when menu is pressed, or long
press dialogs pop-up.
2009-11-12 10:31:07 -08:00
Guang Zhu
ea48cd6dd4 Use a diff that ignores trailing whitespaces to get by some layout test failures. 2009-11-12 10:18:14 -08:00
Dan Egnor
17d176d857 am ddf157ca: Merge change I5ae73af7 into eclair
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-mr2

* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
  Don't back up system wallpapers.
2009-11-12 09:58:17 -08:00
Android (Google) Code Review
c66d53f97b Merge change I880541a8 into eclair
* changes:
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 09:53:09 -08:00
Android (Google) Code Review
ddf157cae4 Merge change I5ae73af7 into eclair
* changes:
  Don't back up system wallpapers.
2009-11-12 09:52:10 -08:00