14090 Commits

Author SHA1 Message Date
Romain Guy
dac92e6fb6 am 3e584fc9: Merge change I5975651f into eclair
Merge commit '3e584fc944e3d694b4233450f386bd2a930420bf' into eclair-mr2

* commit '3e584fc944e3d694b4233450f386bd2a930420bf':
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 17:15:33 -08:00
Mike Lockwood
ad99c2876c am f1f26bbb: Merge change I7b8b6cfb into eclair
Merge commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11' into eclair-mr2

* commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11':
  Do not force screen on when undocking from the desk dock.
2009-11-11 17:15:23 -08:00
Fred Quintana
d73f7de40e am 4cb6fc7e: Merge change Icc48b1e7 into eclair
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-mr2

* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
  don't request a sync when temp providers are created
2009-11-11 17:14:56 -08:00
Grace Kloba
6d559f9d56 am bf5b632a: Use getViewHeightWithTitle() to honor the scrollbar setting when computing the maxScrollY for fling. This is honored in the regular scroll in computeVerticalScrollExtent().
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-mr2

* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
  Use getViewHeightWithTitle() to honor the scrollbar
2009-11-11 17:14:32 -08:00
Grace Kloba
9f4baf308d am d7439f4b: Use computeVerticalScrollRange() to find the bottom of the page as mContentHeight is not in the view system.
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-mr2

* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
  Use computeVerticalScrollRange() to find the bottom
2009-11-11 17:14:10 -08:00
Grace Kloba
09550fde48 am c9966891: Merge change Ibb245ea7 into eclair
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-mr2

* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
  Return an empty PluginList instead of null for the
2009-11-11 17:13:57 -08:00
Jim Miller
052908a5d9 am 2f92bd3e: Merge change Ia895aa7d into eclair
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-mr2

* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 17:13:17 -08:00
Wink Saville
f7394fcaed am 38210df3: Merge change I326c1f7e into eclair
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-mr2

* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 17:12:58 -08:00
Gilles Duboscq
a883bb057a am 9d9dda53: Merge change Ia629e0f8 into eclair
Merge commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697' into eclair-mr2

* commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697':
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
2009-11-11 17:12:42 -08:00
Dianne Hackborn
e0751066b0 am 250aa068: Merge change Idf7fafd3 into eclair
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-mr2

* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 17:12:28 -08:00
Daisuke Miyakawa
2a7b0b996f am b9c40a65: (-s ours) Merge change I5d30aa18 into eclair
Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-mr2

* commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c':
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-11 17:10:58 -08:00
Daisuke Miyakawa
8940d57682 am e464de6b: (-s ours) Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit 'e464de6b764348a102ae64417d22bbd1c80723dc' into eclair-mr2

* commit 'e464de6b764348a102ae64417d22bbd1c80723dc':
  Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
2009-11-11 17:10:36 -08:00
Fred Quintana
bb3921c9dd am 7efa6715: am e871be66: Merge change I735f4553 into eclair-mr2
Merge commit '7efa671569955aead877d10e7d6b1fa3129184a4'

* commit '7efa671569955aead877d10e7d6b1fa3129184a4':
  Make the RegisteredSErvices Cache not allow the registered service for a
2009-11-11 17:10:23 -08:00
Dave Sparks
41b8260914 am dd861689: Merge change I05fd0df0 into eclair
Merge commit 'dd861689924198ed22115f0e21be1b81e159a7cc' into eclair-mr2

* commit 'dd861689924198ed22115f0e21be1b81e159a7cc':
  Fix potential deadlock in stopPreview/stopRecord.
2009-11-11 17:10:03 -08:00
Daisuke Miyakawa
49fc4a9dd3 am fe17db4c: (-s ours) Merge change I4db11d50 into eclair
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-mr2

* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
2009-11-11 17:09:39 -08:00
Fred Quintana
7efa671569 am e871be66: Merge change I735f4553 into eclair-mr2
Merge commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4' into eclair-mr2-plus-aosp

* commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4':
  Make the RegisteredSErvices Cache not allow the registered service for a
2009-11-11 17:05:01 -08:00
Android (Google) Code Review
e871be666b Merge change I735f4553 into eclair-mr2
* changes:
  resolved conflicts for merge of ae0cf6dc to eclair-mr2
2009-11-11 17:00:23 -08:00
Mathias Agopian
90daccf3fd fix [2143798] Need to figure out how to do video on Passion w/ GPU
This builds on the EGLImage solution. We simply use copybit to convert from the
YUV frame into an EGLImage created for that purpose and proceed with the
regular EGLImage code.
We need to do this because "regular" GL doesn't support YUV textures.

We could improve upon this by detecting exacly what the GL supports and bypass
this extra step if not required, but we'll do this later if needed.
2009-11-11 16:44:43 -08:00
Wink Saville
ce9b59f0ba Add code to use Gservices provided values for throtting NITZ updates.
bug: 2251845
Change-Id: Ie122606fb852868bb76a9930bb5e6ba906273619
2009-11-11 16:33:50 -08:00
Fred Quintana
735f455386 resolved conflicts for merge of ae0cf6dc to eclair-mr2 2009-11-11 16:18:46 -08:00
Dan Egnor
d04589bc3c am 802f58da: am 6139bf60: Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
Merge commit '802f58da80debfc425039259e6dfd042db66ce0a'

* commit '802f58da80debfc425039259e6dfd042db66ce0a':
  Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
2009-11-11 15:56:16 -08:00
Lixin Yue
1ab6dc777d am 3ef009d3: am cf250733: am 971af003: Merge change I65208317 into eclair
Merge commit '3ef009d30bfa958bef3b823ec005f67f150b4db3'

* commit '3ef009d30bfa958bef3b823ec005f67f150b4db3':
  Update OBEX to fix missing several contact entries issue.
2009-11-11 15:56:03 -08:00
Dianne Hackborn
32e73d5305 am 6c82b7fe: am acbd9fda: am 48515f49: Merge change I0de7979b into eclair
Merge commit '6c82b7fe24d90ae7fc05bad8fd050aab0a2ebf39'

* commit '6c82b7fe24d90ae7fc05bad8fd050aab0a2ebf39':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-11 15:55:50 -08:00
Dan Egnor
802f58da80 am 6139bf60: Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
Merge commit '6139bf60e83753750fa1009de6da85033dad1820' into eclair-mr2-plus-aosp

* commit '6139bf60e83753750fa1009de6da85033dad1820':
  Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
2009-11-11 15:52:20 -08:00
Lixin Yue
3ef009d30b am cf250733: am 971af003: Merge change I65208317 into eclair
Merge commit 'cf25073348eda15ba5d6ceee1a65ac1386a627a1' into eclair-mr2-plus-aosp

* commit 'cf25073348eda15ba5d6ceee1a65ac1386a627a1':
  Update OBEX to fix missing several contact entries issue.
2009-11-11 15:52:08 -08:00
Dianne Hackborn
6c82b7fe24 am acbd9fda: am 48515f49: Merge change I0de7979b into eclair
Merge commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4' into eclair-mr2-plus-aosp

* commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-11 15:51:57 -08:00
Dan Egnor
6139bf60e8 Add AGGREGATION_INTERVAL_SECONDS (fixing the build) 2009-11-11 15:46:32 -08:00
Android (Google) Code Review
3e584fc944 Merge change I5975651f into eclair
* changes:
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 15:37:37 -08:00
Android (Google) Code Review
f1f26bbb2a Merge change I7b8b6cfb into eclair
* changes:
  Do not force screen on when undocking from the desk dock.
2009-11-11 15:36:18 -08:00
Romain Guy
baed727481 Don't feed the timezone to RenderScript time functions, let the library figure it out.
Bug #2211070.

Change-Id: I5975651fd12399fb8dfe283dfdfaa17569738c7b
2009-11-11 15:36:06 -08:00
Android (Google) Code Review
4cb6fc7ed2 Merge change Icc48b1e7 into eclair
* changes:
  don't request a sync when temp providers are created
2009-11-11 15:15:55 -08:00
Mike Lockwood
1d06992536 Do not force screen on when undocking from the desk dock.
The fact that the phone is losing power will do this anyway,
and this fixes (or works around) bug b/2250075
(Desk dock clock app sometimes doesn't exit when removing a sleeping droid from the dock)

Change-Id: I7b8b6cfb44ca16d2d9eb67589cb9d9a108a8de82
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-11 18:14:47 -05:00
Fred Quintana
cc48b1e77d don't request a sync when temp providers are created 2009-11-11 15:05:10 -08:00
Grace Kloba
bf5b632abb Use getViewHeightWithTitle() to honor the scrollbar
setting when computing the maxScrollY for fling.
This is honored in the regular scroll in 
computeVerticalScrollExtent().

Fix http://b/issue?id=2251694
2009-11-11 14:43:16 -08:00
Grace Kloba
d7439f4bdb Use computeVerticalScrollRange() to find the bottom
of the page as mContentHeight is not in the view system.

Fix http://b/issue?id=2251909
2009-11-11 14:38:55 -08:00
Android (Google) Code Review
c996689109 Merge change Ibb245ea7 into eclair
* changes:
  Return an empty PluginList instead of null for the deprecated getPluginList() api.
2009-11-11 14:34:05 -08:00
Scott Main
dbc7e27ef1 docs: document the 'showSearchIconAsBadge" flag and
"icon" attribute as deprecated.
bug 2105329
2009-11-11 14:31:17 -08:00
Android (Google) Code Review
2f92bd3ecb Merge change Ia895aa7d into eclair
* changes:
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 14:02:00 -08:00
Android (Google) Code Review
38210df337 Merge change I326c1f7e into eclair
* changes:
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 12:46:22 -08:00
Oscar Montemayor
1874aa487c Encrypted File Systems project. Implementation of opt-out flag in AndroidManifest XML file.
This flag is necessary for applications to specifythat their daa is never to be encrypted when the encrypted file system feature is
commplete and enabled.
Encrypted File Systems project.
Adding android:neverEncrypt flag to AndroidManifest.XML to allow packages to opt-out from EFS features.

Encrypted File Systems Project.
Fixing white spaces and end-line issues.

Encrypted File SYstems Project: opt-out flag.
Removed AndroidManifest.xml changes, as will make that change in a separate integration.
2009-11-11 12:20:17 -08:00
Eric Laurent
059b4be2a5 Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
This change goes with a kernel driver change that reduces the audio buffer size from 4800 bytes (~27ms) to 3072 bytes (~17ms).
- The AudioFlinger modifcations in change 0bca68cfff161abbc992fec82dc7c88079dd1a36 have been removed: the short sleep period was counter productive when the AudioTrack is using the call back thread as it causes to many preemptions.
- AudioFlinger mixer thread now detects long standby exit time and in this case anticipates start by writing 0s as soon as a track is enabled even if not ready for mixing.
- AudioTrack::start() is modified to start call back thread before starting the IAudioTrack so that thread startup time is masked by IAudioTrack start and mixer thread wakeup time.
2009-11-11 12:13:27 -08:00
Wink Saville
aeff5fd8eb Throttle nitz updates as the are too numerous on cdma.
bug: 2251845
Change-Id: I326c1f7e28d19b678ea748e36f8286dd1378cecf
2009-11-11 11:55:38 -08:00
Android (Google) Code Review
9d9dda53f8 Merge change Ia629e0f8 into eclair
* changes:
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 : all the parts should have the same encoding.
2009-11-11 11:53:06 -08:00
Jim Miller
24ccf3c590 Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Tested:
	- unlock and mute/unmute

Not working:
    - highlighting on right tab.
2009-11-11 11:37:54 -08:00
Gilles Duboscq
1fa7fae139 Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
all the parts should have the same encoding.

Fixes b/2040561
2009-11-11 10:56:27 -08:00
Android (Google) Code Review
250aa068ea Merge change Idf7fafd3 into eclair
* changes:
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 10:54:58 -08:00
Lixin Yue
cf25073348 am 971af003: Merge change I65208317 into eclair
Merge commit '971af0030568ba25a83788506a3f29bc9f1cd10d' into eclair-mr2

* commit '971af0030568ba25a83788506a3f29bc9f1cd10d':
  Update OBEX to fix missing several contact entries issue.
2009-11-11 09:58:51 -08:00
Dianne Hackborn
acbd9fdaf0 am 48515f49: Merge change I0de7979b into eclair
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-mr2

* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-11 09:58:38 -08:00
Android (Google) Code Review
b9c40a65c7 Merge change I5d30aa18 into eclair
* changes:
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-10 23:03:57 -08:00
Daisuke Miyakawa
e464de6b76 Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
This change is based on the change I319bf9ee, but different in that there's no test, since
test framework for vCard code is just in MR2, not in MR1.

Internal issue number: 2246410

Dr.NO: Hiroshi
2009-11-11 15:42:55 +09:00