21411 Commits

Author SHA1 Message Date
Eric Rowe
982f1521a6 Merge "Checkin initial bluetooth stress tests." into froyo 2010-08-05 14:49:22 -07:00
Eric Rowe
14db8d9978 Checkin initial bluetooth stress tests.
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
2010-08-05 14:45:44 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources;
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
2010-08-04 17:33:33 -07:00
Scott Main
5b86de94a1 fix doc bugs
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
2010-08-04 17:07:36 -07:00
Dan Egnor
8e4378b3ae COMMENT ONLY change to fix some formatting glitches and
(more importantly) clarify issues surrounding removed accounts.

Change-Id: I19e6c0e536e46b6d219c808bb86e88edd7e6f378
2010-08-02 18:22:09 -07:00
Scott Main
5aa4680eb0 update device dashboard
Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a
2010-08-02 17:38:37 -07:00
Wink Saville
c69f5be0ed Add PhoneSubInfo.getCompleteVoiceMailNumber.
PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
2010-08-02 11:07:51 -07:00
Scott Main
9cd797902e Merge "Doc change: Add nexus one to dev phones." into froyo 2010-08-02 09:16:30 -07:00
Dirk Dougherty
2ff1ba012c Doc change: Cleanup for licensing doc.
Change-Id: Iff046768d70adf0489f5241212061045cef2572f
2010-07-30 16:00:18 -07:00
Andreas Huber
7f9fe5fdfa Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 2010-07-30 08:05:56 -07:00
The Android Open Source Project
27eecb704a Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD 2010-07-29 17:45:56 -07:00
Jean-Baptiste Queru
83407b993f fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:41:35 -07:00
Gilles Debunne
3d8d9440d8 Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 2010-07-29 17:39:32 -07:00
Gilles Debunne
83884db9dc Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 2010-07-29 17:39:18 -07:00
Gilles Debunne
5d658d048e Fixed doc typos in HeterogeneousExpandableList.java.
Bad links.

Cherry-pick from master for a documentation update.
https://android-git.corp.google.com/g/#change,59176

Change-Id: Ib69b05c09fc80434cb9cd79d61fae4035adc1970
2010-07-29 16:56:25 -07:00
Gilles Debunne
c09a6977ae Fixes regarding densities in "Providing Resources" documentation page.
The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Cherry-picked from master CL 59188.

Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
2010-07-29 16:54:03 -07:00
The Android Open Source Project
392edec116 Merge from open-source froyo
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
2010-07-29 15:38:49 -07:00
Dianne Hackborn
3855980b43 Fix a bug where we cleaned an apps external data when upgrading it. :(
Change-Id: I0eee1e7062d334c66d6daa3c43e11a292263aada
2010-07-29 15:24:15 -07:00
Andreas Huber
16263d9f8c Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 20 09:21:17 2010 -0700

    Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

    Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
    related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date:   Sun Jul 18 17:57:01 2010 -0700

    Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

    Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date:   Thu Jul 8 20:56:13 2010 -0700

    Enable the support for decoding audio with AAC+ and eAAC+ features

    bug - 282684

    Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
2010-07-29 09:45:06 -07:00
Andreas Huber
d04ed08a7c Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Change-Id: Ib71113a3bc5aa5fdc088ab4ac3627352499ad3fa
2010-07-29 09:25:10 -07:00
Scott Main
3bf5c4cd30 Merge "fix markup error bug:2871538" into froyo 2010-07-28 14:20:18 -07:00
Scott Main
8a52f3d683 fix markup error
bug:2871538

Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f
2010-07-28 14:15:26 -07:00
Dan Egnor
17876aa586 Minor changes to ContentProvider javadoc to improve consistency.
Change-Id: I710f618c94ffd5d6368ef04a39ac08f675bec11b
2010-07-28 12:28:04 -07:00
Brad Fitzpatrick
86c035f0d1 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 2010-07-27 16:44:53 -07:00
Dan Egnor
6fcc0f073d COMMENT ONLY change to clarify ContentProvider documentation.
Gets a little more specific about thread behavior, and makes
pointed comments about not doing too much work in onCreate().

Change-Id: I682f0eb7d7559babee901ed26642751a6ba0a1ea
2010-07-27 16:32:17 -07:00
Joe Onorato
8c65ee2d50 Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo 2010-07-27 09:05:05 -07:00
Dirk Dougherty
0ac8ac301d Doc change: Add docs for licensing service.
Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d
2010-07-26 11:07:24 -07:00
Joe Onorato
7999bff154 Add a method to let a properly permissioned app directly
manipulate the user activity timeout.  We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.

Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
2010-07-24 11:50:05 -04:00
Dirk Dougherty
d116e3ee82 Doc change: Add nexus one to dev phones.
Change-Id: I45d0207bff857db7355da6b7736d6a6a729a878a
2010-07-23 13:26:24 -07:00
Dan Egnor
e8605af513 Merge "Avoid leaking file descriptors when returning drop box events." into froyo 2010-07-21 13:53:23 -07:00
Dan Egnor
6e6d60d4c8 Avoid leaking file descriptors when returning drop box events.
We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise
it leaks when returning the value to the caller (the flag gets lost).  Change
the way DropBoxManager.Entry gets serialized so that it uses a bit of its own
flags value to track whether the data is a byte[] or a ParcelFileDescriptor.

Modify the dropbox unit test to add extensive checking of Entry serialization
and deserialization under various circumstances, and to include a regression
test to ensure that FD leaking doesn't happen.

Bug: 2847738
Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193
2010-07-21 12:52:21 -07:00
Tom Taylor
dbac180d83 Fix a merge problem with html mms
Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888

Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
2010-07-21 10:49:48 -07:00
Dan Egnor
2f0dc6d9f5 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Scott Main
2316d62608 docs: add information about using color resources as drawables
Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
2010-07-20 10:28:09 -07:00
Dan Egnor
b3e4ef3702 COMMENT ONLY change to add some warnings about ParcelFileDescriptor
behavior with Parcel.writeValue().

Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6
Bug: 2847738
2010-07-20 10:24:38 -07:00
Dan Egnor
9bc4039a58 Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo 2010-07-19 18:14:50 -07:00
Scott Main
85e7ae9bbb Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 2010-07-19 14:42:13 -07:00
Hung Dang
28fe43be5c Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 2010-07-16 15:13:12 -07:00
Scott Main
7e48908463 docs: add troubleshooting to eclipse guide about restarting adb
Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce
2010-07-16 15:04:22 -07:00
Scott Main
2a8dd4e46f Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
Scott Main
5e892d8183 docs: editorial revisions to Search guide
Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
2010-07-16 14:33:14 -07:00
Yu Shan Emily Lau
ba1348e3c2 Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Change-Id: I42527612764252d1c47bd29a2b88d5e3019cfdf9
2010-07-16 12:00:30 -07:00
Scott Main
d59f1dea17 Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 2010-07-15 18:14:16 -07:00
Scott Main
80fa5c866e docs: dashboard update
Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c
2010-07-15 17:56:59 -07:00
Katie McCormick
28da8e5e4a Merge "Doc change: Update AVD create instructions." into froyo 2010-07-15 17:25:10 -07:00
Katie McCormick
c46efe6696 Doc change: Update AVD create instructions.
Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d
2010-07-15 16:20:41 -07:00
Scott Main
38137d7a27 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
Andrew Stadler
468c82e4be Merge "Skip hostname verification when using insecure factory" into froyo 2010-07-14 22:26:56 -07:00
Dan Egnor
bfcbeffc54 COMMENT-ONLY change to clarify Camera documentation.
Change-Id: I6b75cfdfc34d1c16d93c02a32649022ce5505b11
2010-07-13 16:43:56 -07:00
Dianne Hackborn
1bcb665825 Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 2010-07-12 19:03:26 -07:00