21388 Commits

Author SHA1 Message Date
Christopher Tate
02e18d4d4e Merge "Make the default backup configuration "disabled; local transport selected"" into froyo 2010-08-24 18:05:09 -07:00
Christopher Tate
09dedc998f Make the default backup configuration "disabled; local transport selected"
By default out of the box, an Android build will have the backup mechanism in
its "disabled" state and pointed to the LocalTransport test transport.  We
do not want retail devices built without the Google backend to have backup
enabled out of the box; it would cause them to gradually grind away the
cache partition for no good reason.  On those devices with this change,
developers would need to enable backup manually (possibly using the normal
Settings UI; more probably using the 'bmgr' shell tool), but would no longer
also have to manually configure the active transport name.

Device vendors producing Google-enabled products will simply use resource
overlays to configure the default state and transport name for their builds.
When building a product that points to the Google backup transport by default,
the "def_backup_enabled" boolean resource should still be set to 'false' --
the Google backup disclosure activity supplied by GSF will take care of
enabling the backup services if the user opts in to it.  (Basically, vendors
will never have to overlay the def_backup_enabled resource -- the default
value of 'false' is correct for any retail device regardless of whether it
can use the Google backup transport.)

In the SDK build, the default transport will remain the local one, but
the default enable state overridden and set to "true".  This is the ideal
situation for developers: all aspects of the backup mechanism immediately
operative with no manual configuration needed.

Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34
2010-08-24 17:52:45 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
2010-08-23 17:38:35 -07:00
Scott Main
5a98fef352 Merge "docs: add dev guide for getting user location" into froyo 2010-08-23 12:32:51 -07:00
Trevor Johns
ca9d51b150 Disabling AccessibilityService sample from build system.
This is necessary for an upcoming doc push. I'll revert this change after the
doc push is complete.

Change-Id: I32bbff7797cf5af1642da2b907b20847c1d17d21
2010-08-20 17:13:02 -07:00
Wink Saville
3158cf689f Change CDMAPhone.getDeviceId to return MEID or ESN.
This allows devices with only ESN's to work.

bug: 2938223
Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
2010-08-20 16:24:02 -07:00
Scott Main
fa4596ec80 docs: add dev guide for getting user location
Change-Id: I63558c0304a632ccfbb7a80411ab23ad2c82b5c9
2010-08-20 14:21:26 -07:00
Scott Main
11a72482a0 Merge "docs: add links from widget classes to tutorials" into froyo 2010-08-19 17:31:12 -07:00
Scott Main
41ec65355b docs: add links from widget classes to tutorials
Change-Id: I817e885524951853182b0458df4a32dea1614243
2010-08-19 17:07:13 -07:00
Doug Zongker
0fe27cf5bd make android_id random seed depend on time as well as ro.serialno
Change-Id: I0a48aacd8da30896d91fa05b7791335e6ed751e5
2010-08-19 13:38:26 -07:00
Kenny Root
4690627644 Amend previous ndc commit
Submitted wrong patchset. This includes the delta for the latest
patchset.

Change-Id: I63bb9a37dd9100550ae07a3a1c9fdd9fd71724e1
2010-08-18 07:53:30 -07:00
Kenny Root
a34c9ca30e Add more error checking for ndc
In NativeDaemonConnector.doCommand() calls, there was inconsistent error
checking. This change adds error checking for every call and makes it so
that any call to .doCommand() that gets an error code won't cause the
code to hang forever.

Change-Id: If714282b6642f278fb8137f652af1a012670253b
2010-08-17 23:29:46 -07:00
David 'Digit' Turner
24a03083ca PackageManagerService: always install native binaries from .apk
The previous implementation fails to work properly when the .apk
and installed versions of the binaries have the same size and date.

Change-Id: I063817a935da9ad459858d7eec8bb3d940607850
2010-08-17 23:21:56 -07:00
Roman Nurik
3b70e159a8 Merge "Adding a sample accessibility service -make" into froyo 2010-08-17 10:36:03 -07:00
Ficus Kirkpatrick
2abde6e0dd Add --max-res-version flag to aapt.
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from eclair.

Change-Id: I40ccf820c8a6e3074fccc987dd60a511dd8eb0de
2010-08-13 14:13:08 -07:00
Trevor Johns
4f3c5372a5 Merge "Fix subscribe links for Developer Forums doc." into froyo 2010-08-12 14:27:33 -07:00
Svetoslav Ganov
0581d4a197 Adding a sample accessibility service -make
Change-Id: I5bdd57e022b9907f7745046d8818801dbc3929a8
2010-08-10 21:39:56 -07:00
Trevor Johns
ca56ffe9e8 Fix subscribe links for Developer Forums doc.
The email-based subscribe links for the Android Developer forums do
not work for two groups (android-discuss, android-beginners) due to
recent changes in those groups. These links need to be changed to
HTML-based subscribe links instead.

For consistency, other links are being changed to use the HTML-based
subscription mechanism as well.

Internal Bug: 2908002

Change-Id: I601b959935584270d6107c4600b28ac5f51359e1
2010-08-10 11:41:56 -07:00
Eric Rowe
301c437b55 Remove @LargeTest annotations
Change-Id: Ib7e6f6e8b6437db5ca2ad2bcb89f079a0cbf7453
2010-08-09 15:35:48 -07:00
Dan Egnor
b37bca9e79 Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 2010-08-06 16:39:02 -07:00
Adam Powell
9093717985 Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 2010-08-05 18:33:31 -07:00
Fred Quintana
cdf16787fc Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 2010-08-05 17:36:27 -07:00
Fred Quintana
b4b7b4837b Changed SyncOperation.toKey() to not rely on the implementation of
Account.toString()

bug: 2898033
Change-Id: I6bfac976127190d2d667312df7aa9c7d57b21555
2010-08-05 17:26:58 -07:00
Adam Powell
a55191fe8f DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
2010-08-05 15:50:31 -07:00
Scott Main
005e2400b5 Merge "fix xml sample error" into froyo 2010-08-05 15:49:08 -07:00
Scott Main
307351a22d fix xml sample error
Change-Id: Ifd188a5866382a79c2c9de94c0682b707baffdcf
2010-08-05 15:44:26 -07:00
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