Eric Laurent
bfdece49cf
am 355743c7: am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
...
Merge commit '355743c70d9810fda3e59d718d055f9513fb05b7'
* commit '355743c70d9810fda3e59d718d055f9513fb05b7':
Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 10:53:01 -08:00
Jim Miller
52349182e1
am c41bc910: am 5be290d6: am 11fea858: Merge change I8061e6ac into eclair
...
Merge commit 'c41bc910bd6fe3daf56c32a5be858b71872093d3'
* commit 'c41bc910bd6fe3daf56c32a5be858b71872093d3':
Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-13 10:52:32 -08:00
Dianne Hackborn
ddbc0107b7
am 255ba31a: am 1ca191c2: am 1778776c: Fix issue #2258571 : Fix build versions
...
Merge commit '255ba31a75d864d9c7278c9aceb542652b80d586'
* commit '255ba31a75d864d9c7278c9aceb542652b80d586':
Fix issue #2258571 : Fix build versions
2009-11-13 10:51:54 -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
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
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
Wink Saville
b74ebcabe0
am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2
...
Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040'
* commit '126fee88d480939d46b8ddd1e3a03cdd193fa040':
Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 23:13:17 -08:00
Daisuke Miyakawa
5b65ef4c95
am 2a77d463: am 592988d3: Add unit tests for Japanization and fix several bugs.
...
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'
* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
Add unit tests for Japanization and fix several bugs.
2009-11-12 23:13:03 -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
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
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
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
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
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
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
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
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
Dan Egnor
67abf57846
am 00556831: am f18a01c7: Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
...
Merge commit '00556831f7503a922a5402c525b4387ebdd1a4bb'
* commit '00556831f7503a922a5402c525b4387ebdd1a4bb':
Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
2009-11-12 14:19:27 -08:00
Dan Egnor
00556831f7
am f18a01c7: Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
...
Merge commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f' into eclair-mr2-plus-aosp
* commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f':
Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
2009-11-12 14:15:02 -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
Jim Miller
10d6dd5ae1
am e6874f9d: am 0b66ea65: am 2477fd69: Merge change Ic31c11ad into eclair
...
Merge commit 'e6874f9df43037b28bb5a8b315849db10d5d1a1e'
* commit 'e6874f9df43037b28bb5a8b315849db10d5d1a1e':
Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:30:17 -08:00
Jim Miller
e6874f9df4
am 0b66ea65: am 2477fd69: Merge change Ic31c11ad into eclair
...
Merge commit '0b66ea65f7c43c7a39e91baf7a39945fc2ad6355' into eclair-mr2-plus-aosp
* commit '0b66ea65f7c43c7a39e91baf7a39945fc2ad6355':
Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:23:42 -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
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
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
Evan Millar
cf079c9109
am 09d33a54: am 3b8112ef: Merge change I280c753a into eclair-mr2
...
Merge commit '09d33a54a6b4244223f7d51f5c0764b6ad3f808f'
* commit '09d33a54a6b4244223f7d51f5c0764b6ad3f808f':
Modify text validation behavior.
2009-11-12 11:49:53 -08:00
Evan Millar
09d33a54a6
am 3b8112ef: Merge change I280c753a into eclair-mr2
...
Merge commit '3b8112ef964eaafb3befa38d8b8ff767ea0f3751' into eclair-mr2-plus-aosp
* commit '3b8112ef964eaafb3befa38d8b8ff767ea0f3751':
Modify text validation behavior.
2009-11-12 11:44:38 -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
4829ae00ac
am 09904d84: am d1a3fc38: am 609bbf18: Merge change I54089080 into eclair
...
Merge commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69'
* commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69':
Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:47:51 -08:00
Daniel Sandler
09904d84d1
am d1a3fc38: am 609bbf18: Merge change I54089080 into eclair
...
Merge commit 'd1a3fc38e99e0483402168529020e758ecd777ce' into eclair-mr2-plus-aosp
* commit 'd1a3fc38e99e0483402168529020e758ecd777ce':
Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:43:52 -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
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
Daniel Sandler
e3ea6e3d4c
Update keyguard and pattern-lock layouts for new UX designs.
...
To do this, we bring DigitalClock over from Clock into the
internal widgets. Its font, Clockopia, comes along for the
ride (find it in /system/fonts).
This change is required for relevant code changes in
frameworks/policy/phone.
Change-Id: I354534f1abd9cf9557c9d18566f1d55b6be5e8f1
2009-11-12 09:37:44 -08:00
Jaikumar Ganesh
eb802040e2
am 6d587ac3: am 48956ad3: am 3c58d279: Merge change I738ed802 into eclair
...
Merge commit '6d587ac372918783f54512bd00180bb44a49ab5b'
* commit '6d587ac372918783f54512bd00180bb44a49ab5b':
Fix BMW and Audi auto pairing lists.
2009-11-11 23:42:14 -08:00
Dianne Hackborn
5eacb0f6be
am 897223a1: am d669d488: am 34d723d8: Merge change I32371166 into eclair
...
Merge commit '897223a1040ce29edc9c2fd500071ab7f559e5fe'
* commit '897223a1040ce29edc9c2fd500071ab7f559e5fe':
Fix issue #2239203 : Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:41:57 -08:00
Jaikumar Ganesh
6d587ac372
am 48956ad3: am 3c58d279: Merge change I738ed802 into eclair
...
Merge commit '48956ad3fa4bfcd6d386c61872363c9e8990fa39' into eclair-mr2-plus-aosp
* commit '48956ad3fa4bfcd6d386c61872363c9e8990fa39':
Fix BMW and Audi auto pairing lists.
2009-11-11 23:36:33 -08:00
Dianne Hackborn
897223a104
am d669d488: am 34d723d8: Merge change I32371166 into eclair
...
Merge commit 'd669d48888fdefab4907f4de5b296fc366b59eaf' into eclair-mr2-plus-aosp
* commit 'd669d48888fdefab4907f4de5b296fc366b59eaf':
Fix issue #2239203 : Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:36:22 -08:00
Jaikumar Ganesh
48956ad3fa
am 3c58d279: Merge change I738ed802 into eclair
...
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-mr2
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
2009-11-11 23:31:31 -08:00
Android (Google) Code Review
3c58d279ab
Merge change I738ed802 into eclair
...
* changes:
Fix BMW and Audi auto pairing lists.
2009-11-11 23:27:03 -08:00
Dianne Hackborn
d669d48888
am 34d723d8: Merge change I32371166 into eclair
...
Merge commit '34d723d8fa75e8f97401311e03b3839246143018' into eclair-mr2
* commit '34d723d8fa75e8f97401311e03b3839246143018':
Fix issue #2239203 : Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:13:25 -08:00
Jaikumar Ganesh
738ed80262
Fix BMW and Audi auto pairing lists.
...
Bug no:2256558
Dr No:Eastham
2009-11-11 23:12:04 -08:00
Android (Google) Code Review
34d723d8fa
Merge change I32371166 into eclair
...
* changes:
Fix issue #2239203 : Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:10:06 -08:00
Jaikumar Ganesh
f37c95e9fc
am 3f9ef8d0: am 4e552b60: am 013b0e53: Merge change I143ea844 into eclair
...
Merge commit '3f9ef8d04457da725bed763bbaa4499e2825d7e8'
* commit '3f9ef8d04457da725bed763bbaa4499e2825d7e8':
Add BMW and Audi to Auto Pairing black list.
2009-11-11 22:59:34 -08:00
Jaikumar Ganesh
3f9ef8d044
am 4e552b60: am 013b0e53: Merge change I143ea844 into eclair
...
Merge commit '4e552b606cc9fc3e6cac210b3894974709531ec1' into eclair-mr2-plus-aosp
* commit '4e552b606cc9fc3e6cac210b3894974709531ec1':
Add BMW and Audi to Auto Pairing black list.
2009-11-11 22:54:37 -08:00
Dianne Hackborn
c9dbbe28f7
Fix issue #2239203 : Setting large background causes OOME and soft-reboot spiral
...
Try really really hard not to crash, for any reason.
Change-Id: I32371166229825f13fc8d12d5cf3a6531cdb345e
2009-11-11 22:50:37 -08:00
Jaikumar Ganesh
4e552b606c
am 013b0e53: Merge change I143ea844 into eclair
...
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-mr2
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
2009-11-11 22:49:45 -08:00